Merge branch 'master' of git@github.com:gallery/gallery3

9 files changed, 186 insertions, 241 deletions

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index abb48fc3..949aea84 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -99,16 +99,8 @@ class access_Core {
       return true;
     }
 
-    if ($item->owner_id == $user->id  &&
-        in_array($perm_name, array("view_full", "edit", "add"))) {
-      return true;
-    }
-
-    if ($perm_name == "view") {
-      $resource = $item->owner_id == $user->id ? $item->parent() : $item;
-    } else {
-      $resource = model_cache::get("access_cache", $item->id, "item_id");
-    }
+    $resource = $perm_name == "view" ?
+      $item : model_cache::get("access_cache", $item->id, "item_id");
     foreach ($user->groups as $group) {
       if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
@@ -174,8 +166,8 @@ class access_Core {
     // For view permissions, if any parent is self::DENY, then those parents lock this one.
     // Return
     $lock = ORM::factory("item")
-      ->where("`left` <= $item->left")
-      ->where("`right` >= $item->right")
+      ->where("`left_ptr` <= $item->left_ptr")
+      ->where("`right_ptr` >= $item->right_ptr")
       ->where("items.id <> $item->id")
       ->join("access_intents", "items.id", "access_intents.item_id")
       ->where("access_intents.view_$group->id", self::DENY)
@@ -498,11 +490,11 @@ class access_Core {
     // item, then its safe to propagate from here.
     if ($access->$field !== self::DENY) {
       $tmp_item = ORM::factory("item")
-        ->where("left <", $item->left)
-        ->where("right >", $item->right)
+        ->where("left_ptr <", $item->left_ptr)
+        ->where("right_ptr >", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
         ->where("access_intents.$field", self::DENY)
-        ->orderby("left", "DESC")
+        ->orderby("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded) {
@@ -515,13 +507,13 @@ class access_Core {
     // them according the rule above.  So mark every permission below this level as UNKNOWN so
     // that we can tell which permissions have been changed, and which ones need to be updated.
     $db->update("items", array($field => self::UNKNOWN),
-                array("left >=" => $item->left, "right <=" => $item->right));
+                array("left_ptr >=" => $item->left_ptr, "right_ptr <=" => $item->right_ptr));
 
     $query = ORM::factory("access_intent")
-      ->select(array("access_intents.$field", "items.left", "items.right", "items.id"))
+      ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr", "items.id"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left >=", $item->left)
-      ->where("right <=", $item->right)
+      ->where("left_ptr >=", $item->left_ptr)
+      ->where("right_ptr <=", $item->right_ptr)
       ->where("type", "album")
       ->where("access_intents.$field IS NOT", self::INHERIT)
       ->orderby("level", "DESC")
@@ -530,11 +522,11 @@ class access_Core {
       if ($row->$field == self::ALLOW) {
         // Propagate ALLOW for any row that is still UNKNOWN.
         $db->update("items", array($field => $row->$field),
-          array($field => self::UNKNOWN, "left >=" => $row->left, "right <=" => $row->right));
+          array($field => self::UNKNOWN, "left_ptr >=" => $row->left_ptr, "right_ptr <=" => $row->right_ptr));
       } else if ($row->$field == self::DENY) {
         // DENY overwrites everything below it
         $db->update("items", array($field => $row->$field),
-                    array("left >=" => $row->left, "right <=" => $row->right));
+                    array("left_ptr >=" => $row->left_ptr, "right_ptr <=" => $row->right_ptr));
       }
     }
 
@@ -542,7 +534,7 @@ class access_Core {
     // DENY parent in the hierarchy to propagate from.  So we'll still have a UNKNOWN values in
     // the hierarchy, and all of those are safe to change to ALLOW.
     $db->update("items", array($field => self::ALLOW),
-                array($field => self::UNKNOWN, "left >=" => $item->left, "right <=" => $item->right));
+                array($field => self::UNKNOWN, "left_ptr >=" => $item->left_ptr, "right_ptr <=" => $item->right_ptr));
   }
 
   /**
@@ -570,10 +562,10 @@ class access_Core {
     if ($access->$field === self::INHERIT) {
       $tmp_item = ORM::factory("item")
         ->join("access_intents", "items.id", "access_intents.item_id")
-        ->where("left <", $item->left)
-        ->where("right >", $item->right)
+        ->where("left_ptr <", $item->left_ptr)
+        ->where("right_ptr >", $item->right_ptr)
         ->where("$field IS NOT", self::UNKNOWN)
-        ->orderby("left", "DESC")
+        ->orderby("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded) {
@@ -584,10 +576,10 @@ class access_Core {
     // With non-view permissions, each level can override any permissions that came above it
     // so start at the top and work downwards, overlaying permissions as we go.
     $query = ORM::factory("access_intent")
-      ->select(array("access_intents.$field", "items.left", "items.right"))
+      ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left >=", $item->left)
-      ->where("right <=", $item->right)
+      ->where("left_ptr >=", $item->left_ptr)
+      ->where("right_ptr <=", $item->right_ptr)
       ->where("$field IS NOT", self::INHERIT)
       ->orderby("level", "ASC")
       ->find_all();
@@ -597,8 +589,8 @@ class access_Core {
         "UPDATE {access_caches} SET `$field` = $value " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM {items} " .
-        "  WHERE `left` >= $row->left " .
-        "  AND `right` <= $row->right)");
+        "  WHERE `left_ptr` >= $row->left_ptr " .
+        "  AND `right_ptr` <= $row->right_ptr)");
     }
   }
 
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index f146bfb3..8a7c9951 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -90,15 +90,15 @@ class album_Core {
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Create"));
     $form->add_rules_from(ORM::factory("item"));
+    $form->script("")
+      ->url(url::abs_file("modules/gallery/js/albums_form_add.js"));
     return $form;
   }
 
   static function get_edit_form($parent) {
-    $view = new View("item_edit.html");
-    $view->script = array();
-    $view->form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
-    $view->form->hidden("_method")->value("put");
-    $group = $view->form->group("edit_item")->label(t("Edit Album"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $form->hidden("_method")->value("put");
+    $group = $form->group("edit_item")->label(t("Edit Album"));
 
     $group->input("title")->label(t("Title"))->value($parent->title);
     $group->textarea("description")->label(t("Description"))->value($parent->description);
@@ -130,11 +130,11 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("item_edit_form", $parent, $view);
+    module::event("item_edit_form", $parent, $form);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
-    $view->form->add_rules_from(ORM::factory("item"));
-    return $view;
+    $form->add_rules_from(ORM::factory("item"));
+    return $form;
   }
 }
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 2fa7ad1c..476e9cbe 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -78,4 +78,122 @@ class gallery_Core {
   static function time($timestamp) {
     return date(module::get_var("gallery", "time_format", "H:i:s"), $timestamp);
   }
+
+  static function site_menu($menu, $theme) {
+    if ($theme->page_type != "login") {
+      $menu->append(Menu::factory("link")
+                    ->id("home")
+                    ->label(t("Home"))
+                    ->url(url::site("albums/1")));
+
+      $item = $theme->item();
+
+      $can_edit = $item && access::can("edit", $item);
+      $can_add = $item && access::can("add", $item);
+
+      if ($can_add) {
+        $menu->append(Menu::factory("dialog")
+                      ->id("add_photos_item")
+                      ->label(t("Add photos"))
+                      ->url(url::site("simple_uploader/app/$item->id")));
+      }
+
+      $menu->append($options_menu = Menu::factory("submenu")
+                    ->id("options_menu")
+                    ->label(t("Options")));
+      if ($item && ($can_edit || $can_add)) {
+        if ($can_edit) {
+          $options_menu
+            ->append(Menu::factory("dialog")
+                     ->id("edit_item")
+                     ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
+                     ->url(url::site("form/edit/{$item->type}s/$item->id")));
+        }
+
+        // @todo Move album options menu to the album quick edit pane
+        if ($item->is_album()) {
+          if ($can_add) {
+            $options_menu
+              ->append(Menu::factory("dialog")
+                       ->id("add_album")
+                       ->label(t("Add an album"))
+                       ->url(url::site("form/add/albums/$item->id?type=album")));
+          }
+
+          if ($can_edit) {
+            $options_menu
+              ->append(Menu::factory("dialog")
+                       ->id("edit_permissions")
+                       ->label(t("Edit permissions"))
+                       ->url(url::site("permissions/browse/$item->id")));
+          }
+        }
+      }
+
+      if (user::active()->admin) {
+        $menu->append($admin_menu = Menu::factory("submenu")
+                      ->id("admin_menu")
+                      ->label(t("Admin")));
+        gallery::admin_menu($admin_menu, $theme);
+        module::event("admin_menu", $admin_menu, $theme);
+      }
+
+      module::event("site_menu", $menu, $theme);
+    }
+  }
+
+  static function admin_menu($menu, $theme) {
+    $menu
+      ->append(Menu::factory("link")
+               ->id("dashboard")
+               ->label(t("Dashboard"))
+               ->url(url::site("admin")))
+      ->append(Menu::factory("submenu")
+               ->id("settings_menu")
+               ->label(t("Settings"))
+               ->append(Menu::factory("link")
+                        ->id("graphics_toolkits")
+                        ->label(t("Graphics"))
+                        ->url(url::site("admin/graphics")))
+               ->append(Menu::factory("link")
+                        ->id("languages")
+                        ->label(t("Languages"))
+                        ->url(url::site("admin/languages")))
+               ->append(Menu::factory("link")
+                        ->id("l10n_mode")
+                        ->label(Session::instance()->get("l10n_mode", false)
+                                ? t("Stop translating") : t("Start translating"))
+                        ->url(url::site("l10n_client/toggle_l10n_mode?csrf=" .
+                                        access::csrf_token())))
+               ->append(Menu::factory("link")
+                        ->id("advanced")
+                        ->label(t("Advanced"))
+                        ->url(url::site("admin/advanced_settings"))))
+      ->append(Menu::factory("link")
+               ->id("modules")
+               ->label(t("Modules"))
+               ->url(url::site("admin/modules")))
+      ->append(Menu::factory("submenu")
+               ->id("content_menu")
+               ->label(t("Content")))
+      ->append(Menu::factory("submenu")
+               ->id("appearance_menu")
+               ->label(t("Appearance"))
+               ->append(Menu::factory("link")
+                        ->id("themes")
+                        ->label(t("Theme Choice"))
+                        ->url(url::site("admin/themes")))
+               ->append(Menu::factory("link")
+                        ->id("theme_options")
+                        ->label(t("Theme Options"))
+                        ->url(url::site("admin/theme_options"))))
+      ->append(Menu::factory("submenu")
+               ->id("statistics_menu")
+               ->label(t("Statistics")))
+      ->append(Menu::factory("link")
+               ->id("maintenance")
+               ->label(t("Maintenance"))
+               ->url(url::site("admin/maintenance")));
+    return $menu;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 1cd96372..64f2a9ff 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -47,4 +47,10 @@ class gallery_event_Core {
       module::clear_var("gallery", "choose_default_tookit");
     }
   }
+
+  static function item_index_data($item, $data) {
+    $data[] = $item->description;
+    $data[] = $item->name;
+    $data[] = $item->title;
+  }
 }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index db13307f..d12dad70 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -72,7 +72,7 @@ class gallery_installer {
                  `created` int(9) default NULL,
                  `description` varchar(2048) default NULL,
                  `height` int(9) default NULL,
-                 `left` int(9) NOT NULL,
+                 `left_ptr` int(9) NOT NULL,
                  `level` int(9) NOT NULL,
                  `mime_type` varchar(64) default NULL,
                  `name` varchar(255) default NULL,
@@ -83,7 +83,7 @@ class gallery_installer {
                  `resize_dirty` boolean default 1,
                  `resize_height` int(9) default NULL,
                  `resize_width` int(9) default NULL,
-                 `right` int(9) NOT NULL,
+                 `right_ptr` int(9) NOT NULL,
                  `sort_column` varchar(64) default NULL,
                  `sort_order` char(4) default 'ASC',
                  `thumb_dirty` boolean default 1,
@@ -98,7 +98,8 @@ class gallery_installer {
                  PRIMARY KEY (`id`),
                  KEY `parent_id` (`parent_id`),
                  KEY `type` (`type`),
-                 KEY `random` (`rand_key`))
+                 KEY `random` (`rand_key`),
+                 KEY `weight` (`weight` DESC))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {logs} (
@@ -204,8 +205,8 @@ class gallery_installer {
     $root->type = "album";
     $root->title = "Gallery";
     $root->description = "";
-    $root->left = 1;
-    $root->right = 2;
+    $root->left_ptr = 1;
+    $root->right_ptr = 2;
     $root->parent_id = 0;
     $root->level = 1;
     $root->thumb_dirty = 1;
@@ -258,7 +259,7 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 7);
+    module::set_version("gallery", 10);
   }
 
   static function upgrade($version) {
@@ -323,7 +324,19 @@ class gallery_installer {
       }
       module::set_version("gallery", $version = 8);
     }
-  }
+
+    if ($version == 8) {
+      $db->query("ALTER TABLE {items} CHANGE COLUMN `left`  `left_ptr`  INT(9) NOT NULL;");
+      $db->query("ALTER TABLE {items} CHANGE COLUMN `right` `right_ptr` INT(9) NOT NULL;");
+      module::set_version("gallery", $version = 9);
+    }
+
+    if ($version == 9) {
+      $db->query("ALTER TABLE {items} ADD KEY `weight` (`weight` DESC);");
+
+      module::set_version("gallery", $version = 10);
+    }
+}
 
   static function uninstall() {
     $db = Database::instance();
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
deleted file mode 100644
index 040b19e1..00000000
--- a/modules/gallery/helpers/gallery_menu.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class gallery_menu_Core {
-  static function site($menu, $theme) {
-    $menu->append(Menu::factory("link")
-                  ->id("home")
-                  ->label(t("Home"))
-                  ->url(url::site("albums/1")));
-
-    $item = $theme->item();
-
-    $can_edit = $item && access::can("edit", $item);
-    $can_add = $item && access::can("add", $item);
-
-    if ($can_add) {
-      $menu->append(Menu::factory("dialog")
-                    ->id("add_photos_item")
-                    ->label(t("Add photos"))
-                    ->url(url::site("simple_uploader/app/$item->id")));
-    }
-
-    $menu->append($options_menu = Menu::factory("submenu")
-                  ->id("options_menu")
-                  ->label(t("Options")));
-    if ($item && ($can_edit || $can_add)) {
-      if ($can_edit) {
-        $options_menu
-          ->append(Menu::factory("dialog")
-                   ->id("edit_item")
-                   ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
-                   ->url(url::site("form/edit/{$item->type}s/$item->id")));
-      }
-
-      // @todo Move album options menu to the album quick edit pane
-      if ($item->is_album()) {
-        if ($can_add) {
-          $options_menu
-            ->append(Menu::factory("dialog")
-                     ->id("add_album")
-                     ->label(t("Add an album"))
-                     ->url(url::site("form/add/albums/$item->id?type=album")));
-        }
-
-        if ($can_edit) {
-          $options_menu
-            ->append(Menu::factory("dialog")
-                     ->id("edit_permissions")
-                     ->label(t("Edit permissions"))
-                     ->url(url::site("permissions/browse/$item->id")));
-        }
-      }
-    }
-
-    if (user::active()->admin) {
-      $menu->append($admin_menu = Menu::factory("submenu")
-                    ->id("admin_menu")
-                    ->label(t("Admin")));
-      self::admin($admin_menu, $theme);
-      foreach (module::active() as $module) {
-        if ($module->name == "gallery") {
-          continue;
-        }
-        $class = "{$module->name}_menu";
-        if (method_exists($class, "admin")) {
-          call_user_func_array(array($class, "admin"), array(&$admin_menu, $theme));
-        }
-      }
-    }
-  }
-
-  static function album($menu, $theme) {
-  }
-
-  static function tag($menu, $theme) {
-  }
-
-  static function thumb($menu, $theme, $item) {
-    $menu->append(Menu::factory("submenu")
-                  ->id("options_menu")
-                  ->label(t("Options"))
-                  ->css_class("gThumbMenu"));
-  }
-
-  static function photo($menu, $theme) {
-    if (access::can("view_full", $theme->item())) {
-      $menu->append(Menu::factory("link")
-                    ->id("fullsize")
-                    ->label(t("View full size"))
-                    ->url($theme->item()->file_url())
-                    ->css_class("gFullSizeLink"));
-    }
-  }
-
-  static function admin($menu, $theme) {
-    $menu
-      ->append(Menu::factory("link")
-               ->id("dashboard")
-               ->label(t("Dashboard"))
-               ->url(url::site("admin")))
-      ->append(Menu::factory("submenu")
-               ->id("settings_menu")
-               ->label(t("Settings"))
-               ->append(Menu::factory("link")
-                        ->id("graphics_toolkits")
-                        ->label(t("Graphics"))
-                        ->url(url::site("admin/graphics")))
-               ->append(Menu::factory("link")
-                        ->id("languages")
-                        ->label(t("Languages"))
-                        ->url(url::site("admin/languages")))
-               ->append(Menu::factory("link")
-                        ->id("l10n_mode")
-                        ->label(Session::instance()->get("l10n_mode", false)
-                                ? t("Stop translating") : t("Start translating"))
-                        ->url(url::site("l10n_client/toggle_l10n_mode?csrf=" .
-                                        access::csrf_token())))
-               ->append(Menu::factory("link")
-                        ->id("advanced")
-                        ->label(t("Advanced"))
-                        ->url(url::site("admin/advanced_settings"))))
-      ->append(Menu::factory("link")
-               ->id("modules")
-               ->label(t("Modules"))
-               ->url(url::site("admin/modules")))
-      ->append(Menu::factory("submenu")
-               ->id("content_menu")
-               ->label(t("Content")))
-      ->append(Menu::factory("submenu")
-               ->id("appearance_menu")
-               ->label(t("Appearance"))
-               ->append(Menu::factory("link")
-                        ->id("themes")
-                        ->label(t("Theme Choice"))
-                        ->url(url::site("admin/themes")))
-               ->append(Menu::factory("link")
-                        ->id("theme_options")
-                        ->label(t("Theme Options"))
-                        ->url(url::site("admin/theme_options"))))
-      ->append(Menu::factory("submenu")
-               ->id("statistics_menu")
-               ->label(t("Statistics")))
-      ->append(Menu::factory("link")
-               ->id("maintenance")
-               ->label(t("Maintenance"))
-               ->url(url::site("admin/maintenance")));
-  }
-}
diff --git a/modules/gallery/helpers/gallery_search.php b/modules/gallery/helpers/gallery_search.php
deleted file mode 100644
index 2a4029d3..00000000
--- a/modules/gallery/helpers/gallery_search.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class gallery_search_Core {
-  static function item_index_data($item) {
-    return join(" ", array($item->description, $item->name, $item->title));
-  }
-}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 998eb289..d3751b80 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -127,4 +127,10 @@ class gallery_theme_Core {
   static function admin_credits() {
     return gallery_theme::credits();
   }
+
+  static function body_attributes() {
+    if (locales::is_rtl()) {
+      return 'class="rtl"';
+    }
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 299195e9..5cf37de1 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -135,11 +135,9 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $view = new View("item_edit.html");
-    $view->script = array();
-    $view->form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
-    $view->form->hidden("_method")->value("put");
-    $group = $view->form->group("edit_item")->label(t("Edit Photo"));
+    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $form->hidden("_method")->value("put");
+    $group = $form->group("edit_item")->label(t("Edit Photo"));
     $group->input("title")->label(t("Title"))->value($photo->title);
     $group->textarea("description")->label(t("Description"))->value($photo->description);
     $group->input("filename")->label(t("Filename"))->value($photo->name)
@@ -149,11 +147,11 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
-    module::event("item_edit_form", $photo, $view);
+    module::event("item_edit_form", $photo, $form);
 
     $group->submit("")->value(t("Modify"));
-    $view->form->add_rules_from(ORM::factory("item"));
-    return $view;
+    $form->add_rules_from(ORM::factory("item"));
+    return $form;
   }
 
   /**