From c60d7f431dab7b294790b7636257699668a0f91f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 2 Jul 2009 04:37:03 -0700
Subject: ORM::Factory -> ORM::factory

---
 modules/gallery/helpers/photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index a4bc853b..e8a4f357 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -81,7 +81,7 @@ class photo_Core {
     $photo->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
-    while (ORM::Factory("item")
+    while (ORM::factory("item")
            ->where("parent_id", $parent->id)
            ->where("name", $photo->name)
            ->find()->id) {
-- 
cgit v1.2.3


From 0f766b149d0cee7af664f2321fddc6f04cda70ac Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 16 Jul 2009 12:29:16 -0700
Subject: Second non-trivial change to the event code.  We now publish model
 related events from within the model handling code.  The only exception to
 this currently is item_created which is challenging because we have to save
 the item using ORM_MPTT::add_to_parent() before the object itself is fully
 set up.  When we get that down to one call to save() we can publish that
 event from within the model also.

---
 modules/comment/controllers/admin_comments.php |  4 ----
 modules/comment/controllers/comments.php       |  1 -
 modules/comment/helpers/comment.php            |  5 -----
 modules/comment/models/comment.php             | 17 ++++++++++++++++-
 modules/exif/helpers/exif_event.php            |  4 +++-
 modules/gallery/controllers/albums.php         |  3 ---
 modules/gallery/controllers/movies.php         |  3 ---
 modules/gallery/controllers/photos.php         |  3 ---
 modules/gallery/helpers/album.php              |  2 ++
 modules/gallery/helpers/movie.php              |  2 ++
 modules/gallery/helpers/photo.php              |  2 ++
 modules/gallery/models/item.php                |  7 ++++++-
 modules/organize/controllers/organize.php      |  4 ----
 modules/user/helpers/group.php                 |  1 -
 modules/user/helpers/user.php                  |  1 -
 modules/user/models/group.php                  | 13 +++++++++++++
 modules/user/models/user.php                   | 13 +++++++++++++
 17 files changed, 57 insertions(+), 28 deletions(-)

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index ea76b188..a164f79f 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -113,10 +113,6 @@ class Admin_Comments_Controller extends Admin_Controller {
     if ($comment->loaded) {
       $comment->state = $state;
       $comment->save();
-      module::event("comment_updated", $comment);
-      if ($comment->original("state") == "published" || $comment->state == "published") {
-        module::event("item_related_update", $comment->item());
-      }
     }
   }
 
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 02c38491..9fb4796e 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -152,7 +152,6 @@ class Comments_Controller extends REST_Controller {
       $comment->url = $form->edit_comment->url->value;
       $comment->text = $form->edit_comment->text->value;
       $comment->save();
-      module::event("comment_updated", $comment);
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 08cba096..3d743325 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -61,11 +61,6 @@ class comment_Core {
     $comment->server_remote_port = substr($input->server("REMOTE_PORT"), 0, 16);
     $comment->save();
 
-    module::event("comment_created", $comment);
-    if ($comment->state == "published") {
-      module::event("item_related_update", $comment->item());
-    }
-
     return $comment;
   }
 
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index 22c465df..551fb245 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -61,8 +61,23 @@ class Comment_Model extends ORM {
       $this->updated = time();
       if (!$this->loaded && empty($this->created)) {
         $this->created = $this->updated;
+        $created = true;
       }
     }
-    return parent::save();
+    parent::save();
+
+    if (isset($created)) {
+      module::event("comment_created", $this);
+    } else {
+      module::event("comment_updated", $this);
+    }
+
+    // We only notify on the related items if we're making a visible change, which means moving in
+    // or out of a published state
+    if ($this->original("state") == "published" || $this->state == "published") {
+      module::event("item_related_update", $this->item());
+    }
+
+    return $this;
   }
 }
diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index 24243f4d..826ec959 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -19,7 +19,9 @@
  */
 class exif_event_Core {
   static function item_created($item) {
-    exif::extract($item);
+    if (!$item->is_album()) {
+      exif::extract($item);
+    }
   }
 
   static function item_deleted($item) {
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index c378e3ce..9980b676 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -182,7 +182,6 @@ class Albums_Controller extends Items_Controller {
     }
 
     if ($valid) {
-      $orig = clone $album;
       $album->title = $form->edit_album->title->value;
       $album->description = $form->edit_album->description->value;
       $album->sort_column = $form->edit_album->sort_order->column->value;
@@ -192,8 +191,6 @@ class Albums_Controller extends Items_Controller {
       }
       $album->save();
 
-      module::event("item_updated", $album);
-
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
         t("Saved album %album_title", array("album_title" => p::clean($album->title))));
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index fc511082..d954ad8d 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -85,14 +85,11 @@ class Movies_Controller extends Items_Controller {
     }
 
     if ($valid) {
-      $orig = clone $photo;
       $photo->title = $form->edit_photo->title->value;
       $photo->description = $form->edit_photo->description->value;
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
-      module::event("item_updated", $photo);
-
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 77627009..9ce6ed23 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -78,14 +78,11 @@ class Photos_Controller extends Items_Controller {
     }
 
     if ($valid) {
-      $orig = clone $photo;
       $photo->title = $form->edit_photo->title->value;
       $photo->description = $form->edit_photo->description->value;
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
-      module::event("item_updated", $photo);
-
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 1197f243..f1a6c060 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -71,6 +71,8 @@ class album_Core {
     mkdir(dirname($album->thumb_path()));
     mkdir(dirname($album->resize_path()));
 
+    // @todo: publish this from inside Item_Model::save() when we refactor to the point where
+    // there's only one save() happening here.
     module::event("item_created", $album);
 
     return $album;
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index d62ead76..4f4169d5 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -102,6 +102,8 @@ class movie_Core {
 
     copy($filename, $movie->file_path());
 
+    // @todo: publish this from inside Item_Model::save() when we refactor to the point where
+    // there's only one save() happening here.
     module::event("item_created", $movie);
 
     // Build our thumbnail
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index e8a4f357..ce964c14 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -105,6 +105,8 @@ class photo_Core {
 
     copy($filename, $photo->file_path());
 
+    // @todo: publish this from inside Item_Model::save() when we refactor to the point where
+    // there's only one save() happening here.
     module::event("item_created", $photo);
 
     // Build our thumbnail/resizes
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 80f19d26..94e2fcf7 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -350,9 +350,14 @@ class Item_Model extends ORM_MPTT {
         $this->created = $this->updated;
         $r = ORM::factory("item")->select("MAX(weight) as max_weight")->find();
         $this->weight = $r->max_weight + 1;
+        $created = 1;
       }
     }
-    return parent::save();
+    parent::save();
+    if (!isset($created)) {
+      module::event("item_updated", $this);
+    }
+    return $this;
   }
 
   /**
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 54e04071..27852904 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -279,8 +279,6 @@ class Organize_Controller extends Controller {
       $item->rename($form->dirname->value);
       $item->save();
 
-      module::event("item_updated", $item);
-
       if ($item->is_album()) {
         log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
         $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
@@ -322,8 +320,6 @@ class Organize_Controller extends Controller {
       $item->sort_order = $form->direction->value;
       $item->save();
 
-      module::event("item_updated", $item);
-
       log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
       $message = t("Saved album %album_title", array("album_title" => p::purify($item->title)));
       print json_encode(array("form" => $form->__toString(), "message" => $message));
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 1dace840..04e6efd6 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -39,7 +39,6 @@ class group_Core {
     $group->name = $name;
     $group->save();
 
-    module::event("group_created", $group);
     return $group;
   }
 
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index a59588f8..4105d745 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -202,7 +202,6 @@ class user_Core {
     $user->add(group::registered_users());
 
     $user->save();
-    module::event("user_created", $user);
     return $user;
   }
 
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index e0724e30..bb3fb58b 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -32,4 +32,17 @@ class Group_Model extends ORM {
     parent::delete($id);
     module::event("group_deleted", $old);
   }
+
+  public function save() {
+    if (!$this->loaded) {
+        $created = 1;
+    }
+    parent::save();
+    if (isset($created)) {
+      module::event("group_created", $this);
+    } else {
+      module::event("group_updated", $this);
+    }
+    return $this;
+  }
 }
\ No newline at end of file
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index e3260270..0234f186 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -59,4 +59,17 @@ class User_Model extends ORM {
     return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
                    md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
   }
+
+  public function save() {
+    if (!$this->loaded) {
+        $created = 1;
+    }
+    parent::save();
+    if (isset($created)) {
+      module::event("user_created", $this);
+    } else {
+      module::event("user_updated", $this);
+    }
+    return $this;
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 709d6c5faf7ece54046c0e2bc431a559a6b9d735 Mon Sep 17 00:00:00 2001
From: hiwilson <wilsonpscheung@gmail.com>
Date: Sun, 19 Jul 2009 17:02:20 +0800
Subject: (1)Add tag edit field in album/photo edit form. (2)provide edit
 functionality. (3)support multi-word tagging.

---
 modules/gallery/controllers/albums.php |  2 +
 modules/gallery/controllers/movies.php |  2 +
 modules/gallery/controllers/photos.php |  2 +
 modules/gallery/helpers/album.php      |  3 ++
 modules/gallery/helpers/photo.php      |  2 +
 modules/tag/helpers/tag.php            | 67 ++++++++++++++++++++++++++++++++++
 modules/tag/helpers/tag_event.php      | 18 +++++++++
 7 files changed, 96 insertions(+)

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9980b676..0e1c27e5 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -191,6 +191,8 @@ class Albums_Controller extends Items_Controller {
       }
       $album->save();
 
+      module::event("album_edit_form_completed", $album, $form);
+
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
         t("Saved album %album_title", array("album_title" => p::clean($album->title))));
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index d954ad8d..110ea620 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -90,6 +90,8 @@ class Movies_Controller extends Items_Controller {
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
+      module::event("photo_edit_form_completed", $photo, $form);
+
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9ce6ed23..5d37636d 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -83,6 +83,8 @@ class Photos_Controller extends Items_Controller {
       $photo->rename($form->edit_photo->filename->value);
       $photo->save();
 
+      module::event("photo_edit_form_completed", $photo, $form);
+
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
         t("Saved photo %photo_title", array("photo_title" => p::clean($photo->title))));
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index f1a6c060..63182c36 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -126,6 +126,9 @@ class album_Core {
       ->options(array("ASC" => t("Ascending"),
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
+
+    module::event("album_edit_form", $parent, $form);
+
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index ce964c14..bf38e1ee 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -147,6 +147,8 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
+    module::event("photo_edit_form", $photo, $form);
+
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
     return $form;
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index ab5ee303..ba8a438e 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -50,6 +50,59 @@ class tag_Core {
     return $tag;
   }
 
+  /**
+   * Modify the tags associate with an item.
+   *
+   * @param Item_Model $item an item
+   * @param string     $new_tags_string a string of new tags name seperated by ;
+   * @return null
+   * @throws Exception("@todo {$tag_name} WAS_NOT_ADDED_TO {$item->id}")
+   * @throws Exception("@todo {$tag_name} WAS_NOT_DELETED_TO {$item->id}")
+   */
+  static function update($item, $new_tags_string) {
+    $old_tags = self::get_tags($item);
+
+    $new_tags = preg_split("/[,;]/", $new_tags_string);
+    foreach ($new_tags as $i => $new_tag) {
+      $new_tags[$i] = trim($new_tag);
+    }
+
+    $add_tags = array_diff($new_tags, $old_tags);
+    foreach ($add_tags as $tag_name) {
+      if (empty($tag_name)) continue;
+      $tag = ORM::factory("tag")->where("name", $tag_name)->find();
+      if (!$tag->loaded) {
+        $tag->name = $tag_name;
+        $tag->count = 0;
+        $tag->save();
+      }
+      if (!$tag->has($item)) {
+        if (!$tag->add($item, $tag)) {
+          throw new Exception("@todo {$tag->name} WAS_NOT_ADDED_TO {$item->id}");
+        }
+        $tag->count++;
+        $tag->save();
+      }
+    }
+    
+    $del_tags = array_diff($old_tags, $new_tags);
+    foreach ($del_tags as $tag_name) {
+      $tag = ORM::factory("tag")->where("name", $tag_name)->find();
+      if ($tag->has($item)) {
+        if (!$tag->remove($item, $tag)) {
+          throw new Exception("@todo {$tag->name} WAS_NOT_DELETED_TO {$item->id}");
+        }
+        $tag->save();
+        $tag->count--;
+        if ($tag->count <= 0) {
+          $tag->delete();
+        } else {
+          $tag->save();
+        }
+      }
+    }
+  }
+
   /**
    * Return the N most popular tags.
    *
@@ -127,4 +180,18 @@ class tag_Core {
     $group->submit("")->value(t("Delete Tag"));
     return $form;
   }
+  
+  static function get_tags($item) {
+    $records = ORM::factory("item")
+                    ->select("tags.name as tag_name")
+                    ->join("items_tags", "items.id", "items_tags.item_id", "left")
+                    ->join("tags", "items_tags.tag_id", "tags.id", "left")
+                    ->where("items.id", $item->id)
+                    ->find_all();
+    $tags = array(); 
+    foreach ($records as $record) {
+      $tags[] = $record->tag_name;
+    }
+    return $tags; 
+  }
 }
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 0164f556..0b9504b3 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -67,4 +67,22 @@ class tag_event_Core {
                "SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
     $db->delete("items_tags", array("item_id" => "$item->id"));
   }
+  
+  static function album_edit_form($album, $form) {
+    $tag_value = implode('; ', tag::get_tags($album));
+    $form->edit_album->input("tags")->label(t("Tags ( seperate by , or ; )"))->value($tag_value);
+  }
+  
+  static function album_edit_form_completed($album, $form) {
+    tag::update($album, $form->edit_album->tags->value);
+  }
+  
+  static function photo_edit_form($photo, $form) {
+    $tag_value = implode('; ', tag::get_tags($photo));
+    $form->edit_photo->input("tags")->label(t("Tags ( seperate by , or ; )"))->value($tag_value);
+  }
+  
+  static function photo_edit_form_completed($photo, $form) {
+    tag::update($photo, $form->edit_photo->tags->value);
+  }
 }
-- 
cgit v1.2.3


From 60d605888094f34b4f5185adcdfd01c0338eb8cc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 20 Jul 2009 08:51:12 -0700
Subject: Make some API changes simplify the tag editing code.  We now have a
 good pattern for allowing modules to add their own hooks to item forms!

1) Album, photo and movie forms now all use edit_item as the group and
   we publish item_edit_form and item_edit_form_completed events which
   makes it much easier in the module to handle all events.  They can
   still differentiate based on $item->type if they want to.

2) Added tag::clear_all() and tag::compact() functions which takes the
   place of hiwilson's tag::update() function and is now used in
   tag_event::item_delete().  This provides a simple API that allows
   us to have a lot less event handling code.  It's less efficient
   than what hiwilson was doing before in that it will delete and
   re-add tags, but if that ever turns out to be a performance issue
   we can do something about it then.
---
 modules/gallery/controllers/albums.php | 17 ++++---
 modules/gallery/controllers/movies.php | 13 +++---
 modules/gallery/controllers/photos.php | 15 +++---
 modules/gallery/helpers/album.php      |  4 +-
 modules/gallery/helpers/photo.php      |  4 +-
 modules/tag/helpers/tag.php            | 85 ++++++++--------------------------
 modules/tag/helpers/tag_event.php      | 38 +++++++--------
 7 files changed, 60 insertions(+), 116 deletions(-)

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 0e1c27e5..56b74cb1 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -174,24 +174,23 @@ class Albums_Controller extends Items_Controller {
           ->from("items")
           ->where("parent_id", $album->parent_id)
           ->where("id <>", $album->id)
-          ->where("name", $form->edit_album->dirname->value)
+          ->where("name", $form->edit_item->dirname->value)
           ->count_records()) {
-        $form->edit_album->dirname->add_error("conflict", 1);
+        $form->edit_item->dirname->add_error("conflict", 1);
         $valid = false;
       }
     }
 
     if ($valid) {
-      $album->title = $form->edit_album->title->value;
-      $album->description = $form->edit_album->description->value;
-      $album->sort_column = $form->edit_album->sort_order->column->value;
-      $album->sort_order = $form->edit_album->sort_order->direction->value;
+      $album->title = $form->edit_item->title->value;
+      $album->description = $form->edit_item->description->value;
+      $album->sort_column = $form->edit_item->sort_order->column->value;
+      $album->sort_order = $form->edit_item->sort_order->direction->value;
       if ($album->id != 1) {
-        $album->rename($form->edit_album->dirname->value);
+        $album->rename($form->edit_item->dirname->value);
       }
       $album->save();
-
-      module::event("album_edit_form_completed", $album, $form);
+      module::event("item_edit_form_completed", $album, $form);
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 110ea620..c8227d74 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -77,20 +77,19 @@ class Movies_Controller extends Items_Controller {
           ->from("items")
           ->where("parent_id", $photo->parent_id)
           ->where("id <>", $photo->id)
-          ->where("name", $form->edit_photo->filename->value)
+          ->where("name", $form->edit_item->filename->value)
           ->count_records()) {
-        $form->edit_photo->filename->add_error("conflict", 1);
+        $form->edit_item->filename->add_error("conflict", 1);
         $valid = false;
       }
     }
 
     if ($valid) {
-      $photo->title = $form->edit_photo->title->value;
-      $photo->description = $form->edit_photo->description->value;
-      $photo->rename($form->edit_photo->filename->value);
+      $photo->title = $form->edit_item->title->value;
+      $photo->description = $form->edit_item->description->value;
+      $photo->rename($form->edit_item->filename->value);
       $photo->save();
-
-      module::event("photo_edit_form_completed", $photo, $form);
+      module::event("item_edit_form_completed", $photo, $form);
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 5d37636d..8ee24da8 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -63,27 +63,26 @@ class Photos_Controller extends Items_Controller {
 
     $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
-      if ($form->edit_photo->filename->value != $photo->name) {
+      if ($form->edit_item->filename->value != $photo->name) {
         // Make sure that there's not a conflict
         if (Database::instance()
             ->from("items")
             ->where("parent_id", $photo->parent_id)
             ->where("id <>", $photo->id)
-            ->where("name", $form->edit_photo->filename->value)
+            ->where("name", $form->edit_item->filename->value)
             ->count_records()) {
-          $form->edit_photo->filename->add_error("conflict", 1);
+          $form->edit_item->filename->add_error("conflict", 1);
           $valid = false;
         }
       }
     }
 
     if ($valid) {
-      $photo->title = $form->edit_photo->title->value;
-      $photo->description = $form->edit_photo->description->value;
-      $photo->rename($form->edit_photo->filename->value);
+      $photo->title = $form->edit_item->title->value;
+      $photo->description = $form->edit_item->description->value;
+      $photo->rename($form->edit_item->filename->value);
       $photo->save();
-
-      module::event("photo_edit_form_completed", $photo, $form);
+      module::event("item_edit_form_completed", $photo, $form);
 
       log::success("content", "Updated photo", "<a href=\"photos/$photo->id\">view</a>");
       message::success(
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 63182c36..5f10bd02 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -96,7 +96,7 @@ class album_Core {
   static function get_edit_form($parent) {
     $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
     $form->hidden("_method")->value("put");
-    $group = $form->group("edit_album")->label(t("Edit Album"));
+    $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);
@@ -127,7 +127,7 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("album_edit_form", $parent, $form);
+    module::event("item_edit_form", $parent, $form);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index bf38e1ee..5cf37de1 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -137,7 +137,7 @@ class photo_Core {
   static function get_edit_form($photo) {
     $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
     $form->hidden("_method")->value("put");
-    $group = $form->group("edit_photo")->label(t("Edit Photo"));
+    $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)
@@ -147,7 +147,7 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
-    module::event("photo_edit_form", $photo, $form);
+    module::event("item_edit_form", $photo, $form);
 
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index ba8a438e..1fb2e940 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -50,59 +50,6 @@ class tag_Core {
     return $tag;
   }
 
-  /**
-   * Modify the tags associate with an item.
-   *
-   * @param Item_Model $item an item
-   * @param string     $new_tags_string a string of new tags name seperated by ;
-   * @return null
-   * @throws Exception("@todo {$tag_name} WAS_NOT_ADDED_TO {$item->id}")
-   * @throws Exception("@todo {$tag_name} WAS_NOT_DELETED_TO {$item->id}")
-   */
-  static function update($item, $new_tags_string) {
-    $old_tags = self::get_tags($item);
-
-    $new_tags = preg_split("/[,;]/", $new_tags_string);
-    foreach ($new_tags as $i => $new_tag) {
-      $new_tags[$i] = trim($new_tag);
-    }
-
-    $add_tags = array_diff($new_tags, $old_tags);
-    foreach ($add_tags as $tag_name) {
-      if (empty($tag_name)) continue;
-      $tag = ORM::factory("tag")->where("name", $tag_name)->find();
-      if (!$tag->loaded) {
-        $tag->name = $tag_name;
-        $tag->count = 0;
-        $tag->save();
-      }
-      if (!$tag->has($item)) {
-        if (!$tag->add($item, $tag)) {
-          throw new Exception("@todo {$tag->name} WAS_NOT_ADDED_TO {$item->id}");
-        }
-        $tag->count++;
-        $tag->save();
-      }
-    }
-    
-    $del_tags = array_diff($old_tags, $new_tags);
-    foreach ($del_tags as $tag_name) {
-      $tag = ORM::factory("tag")->where("name", $tag_name)->find();
-      if ($tag->has($item)) {
-        if (!$tag->remove($item, $tag)) {
-          throw new Exception("@todo {$tag->name} WAS_NOT_DELETED_TO {$item->id}");
-        }
-        $tag->save();
-        $tag->count--;
-        if ($tag->count <= 0) {
-          $tag->delete();
-        } else {
-          $tag->save();
-        }
-      }
-    }
-  }
-
   /**
    * Return the N most popular tags.
    *
@@ -180,18 +127,24 @@ class tag_Core {
     $group->submit("")->value(t("Delete Tag"));
     return $form;
   }
-  
-  static function get_tags($item) {
-    $records = ORM::factory("item")
-                    ->select("tags.name as tag_name")
-                    ->join("items_tags", "items.id", "items_tags.item_id", "left")
-                    ->join("tags", "items_tags.tag_id", "tags.id", "left")
-                    ->where("items.id", $item->id)
-                    ->find_all();
-    $tags = array(); 
-    foreach ($records as $record) {
-      $tags[] = $record->tag_name;
-    }
-    return $tags; 
+
+  /**
+   * Delete all tags associated with an item
+   */
+  static function clear_all($item) {
+    $db = Database::instance();
+    $db->query("UPDATE {tags} SET `count` = `count` - 1 WHERE `count` > 0 " .
+               "AND `id` IN (SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
+    $db->delete("items_tags", array("item_id" => "$item->id"));
+  }
+
+  /**
+   * Get rid of any tags that have no associated items.
+   */
+  static function compact() {
+    // @todo There's a potential race condition here which we can solve by adding a lock around
+    // this and all the cases where we create/update tags.  I'm loathe to do that since it's an
+    // extremely rare case.
+    Database::instance() ->delete("tags", array("count" => 0));
   }
 }
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 0b9504b3..d13d1340 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -60,29 +60,23 @@ class tag_event_Core {
   }
 
   static function item_deleted($item) {
-    $db = Database::instance();
-    $db->query("UPDATE {tags} SET `count` = `count` - 1 WHERE `count` > 0 " .
-               "AND `id` IN (SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
-    $db->query("DELETE FROM {tags} WHERE `count` = 0 AND `id` IN (" .
-               "SELECT `tag_id` from {items_tags} WHERE `item_id` = $item->id)");
-    $db->delete("items_tags", array("item_id" => "$item->id"));
+    tag::clear_all($item);
+    tag::compact();
   }
-  
-  static function album_edit_form($album, $form) {
-    $tag_value = implode('; ', tag::get_tags($album));
-    $form->edit_album->input("tags")->label(t("Tags ( seperate by , or ; )"))->value($tag_value);
-  }
-  
-  static function album_edit_form_completed($album, $form) {
-    tag::update($album, $form->edit_album->tags->value);
-  }
-  
-  static function photo_edit_form($photo, $form) {
-    $tag_value = implode('; ', tag::get_tags($photo));
-    $form->edit_photo->input("tags")->label(t("Tags ( seperate by , or ; )"))->value($tag_value);
+
+  static function item_edit_form($item, $form) {
+    $tag_value = implode("; ", tag::item_tags($item));
+    $form->edit_item->input("tags")->label(t("Tags (separate by , or ;)"))
+      ->value($tag_value);
   }
-  
-  static function photo_edit_form_completed($photo, $form) {
-    tag::update($photo, $form->edit_photo->tags->value);
+
+  static function item_edit_form_completed($item, $form) {
+    tag::clear_all($item);
+    foreach (preg_split("/[,;]/", $form->edit_item->tags->value) as $tag_name) {
+      if ($tag_name) {
+        tag::add($item, $tag_name);
+      }
+    }
+    tag::compact();
   }
 }
-- 
cgit v1.2.3


From 078c77a62b623322956457bfd7bfbdaf56203b00 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 24 Jul 2009 14:18:15 -0700
Subject: Add tag autocomplete to the album and photo edit pop up dialogs. This
 required putting a wrapper view around the forms and passing this view as the
 parameter to the item_edit_form event.  The view contains a $script variable
 that the modules can add script to be included in the form html when rendered
 as part of the ajax response.

---
 modules/gallery/controllers/albums.php   |  5 +++--
 modules/gallery/controllers/movies.php   |  5 +++--
 modules/gallery/controllers/photos.php   |  5 +++--
 modules/gallery/helpers/album.php        | 14 ++++++++------
 modules/gallery/helpers/photo.php        | 14 ++++++++------
 modules/gallery/tests/xss_data.txt       |  2 ++
 modules/gallery/views/item_edit.html.php |  9 +++++++++
 modules/tag/helpers/tag_event.php        | 10 ++++++++--
 modules/tag/js/tag.js                    |  2 +-
 9 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 modules/gallery/views/item_edit.html.php

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 56b74cb1..4fefd3a1 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -166,7 +166,8 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    $form = album::get_edit_form($album);
+    $view = album::get_edit_form($album);
+    $form = $view->form;
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if ($album->id != 1 &&
@@ -202,7 +203,7 @@ class Albums_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString()));
+              "form" => $view->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c8227d74..1391c4b4 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -70,7 +70,8 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $form = photo::get_edit_form($photo);
+    $view = photo::get_edit_form($photo);
+    $form = $view->form;
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if (Database::instance()
@@ -101,7 +102,7 @@ class Movies_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString()));
+              "form" => $view->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 8ee24da8..9d9b25a1 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -61,7 +61,8 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $form = photo::get_edit_form($photo);
+    $view = photo::get_edit_form($photo);
+    $form = $view->form;
     if ($valid = $form->validate()) {
       if ($form->edit_item->filename->value != $photo->name) {
         // Make sure that there's not a conflict
@@ -94,7 +95,7 @@ class Photos_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $form->__toString()));
+              "form" => $view->__toString()));
     }
   }
 
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 5f10bd02..0263e0e1 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -94,9 +94,11 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
-    $form->hidden("_method")->value("put");
-    $group = $form->group("edit_item")->label(t("Edit Album"));
+    $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"));
 
     $group->input("title")->label(t("Title"))->value($parent->title);
     $group->textarea("description")->label(t("Description"))->value($parent->description);
@@ -127,11 +129,11 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("item_edit_form", $parent, $form);
+    module::event("item_edit_form", $parent, $view);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 }
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 5cf37de1..299195e9 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -135,9 +135,11 @@ class photo_Core {
   }
 
   static function get_edit_form($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"));
+    $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"));
     $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)
@@ -147,11 +149,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, $form);
+    module::event("item_edit_form", $photo, $view);
 
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 981bf31e..2940a8df 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -207,6 +207,8 @@ modules/gallery/views/admin_themes_preview.html.php          4   DIRTY $info->na
 modules/gallery/views/admin_themes_preview.html.php          7   DIRTY $url
 modules/gallery/views/after_install.html.php                 11        $user->name
 modules/gallery/views/after_install.html.php                 15  DIRTY $user->id
+modules/gallery/views/item_edit.html.php                     4   DIRTY $script
+modules/gallery/views/item_edit.html.php                     8   DIRTY $form
 modules/gallery/views/kohana_error_page.php                  102 DIRTY $message
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $file
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $line
diff --git a/modules/gallery/views/item_edit.html.php b/modules/gallery/views/item_edit.html.php
new file mode 100644
index 00000000..9aa2fb64
--- /dev/null
+++ b/modules/gallery/views/item_edit.html.php
@@ -0,0 +1,9 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if (!empty($script)): ?>
+<script>
+  <?= implode("\n", $script) ?>
+</script>
+<? endif ?>
+<div id="gEditFormContainer">
+  <?= $form ?>
+</div>
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index e1ab1b73..58034900 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -64,9 +64,15 @@ class tag_event_Core {
     tag::compact();
   }
 
-  static function item_edit_form($item, $form) {
+  static function item_edit_form($item, $view) {
+    $url = url::site("tags/autocomplete");
+    $view->script[] = "$('#gEditFormContainer form').ready(function() {
+                         $('#gEditFormContainer form input[id=tags]').autocomplete(
+                           '$url', {max: 30, formatResult: formatTagAutoCompleteResult}
+                         );
+                      });";
     $tag_value = implode("; ", tag::item_tags($item));
-    $form->edit_item->input("tags")->label(t("Tags (separate by , or ;)"))
+    $view->form->edit_item->input("tags")->label(t("Tags (separate by , or ;)"))
       ->value($tag_value);
   }
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 282da1ea..bbf44166 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -68,7 +68,7 @@ function editInPlace(element) {
 }
 
 function formatTagAutoCompleteResult(row) {
-  var text = $("#gAddTagForm input:text").val();
+  var text = $(".ac_loading").val();
   if (/[\s,;]/.test(text)) {
     for (var i= text.length - 1; i >= 0; i--) {
       var chr = text.charAt(i);
-- 
cgit v1.2.3


From a7f4d7aced009007d36e48685648e9bc3382f8cb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 28 Jul 2009 20:40:28 +0800
Subject: Revert commit 078c77a62b623322956457bfd7bfbdaf56203b00 and change the
 tag_event:item_edit_form to use the new Form_Script library to inject script
 into a form.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php   |  5 ++---
 modules/gallery/controllers/movies.php   |  5 ++---
 modules/gallery/controllers/photos.php   |  5 ++---
 modules/gallery/helpers/album.php        | 14 ++++++--------
 modules/gallery/helpers/photo.php        | 14 ++++++--------
 modules/gallery/tests/xss_data.txt       |  2 --
 modules/gallery/views/item_edit.html.php |  9 ---------
 modules/tag/helpers/tag_event.php        | 18 +++++++-----------
 modules/tag/js/tag.js                    |  1 +
 9 files changed, 26 insertions(+), 47 deletions(-)
 delete mode 100644 modules/gallery/views/item_edit.html.php

(limited to 'modules/gallery/helpers/photo.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 4fefd3a1..56b74cb1 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -166,8 +166,7 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    $view = album::get_edit_form($album);
-    $form = $view->form;
+    $form = album::get_edit_form($album);
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if ($album->id != 1 &&
@@ -203,7 +202,7 @@ class Albums_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 1391c4b4..c8227d74 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -70,8 +70,7 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $view = photo::get_edit_form($photo);
-    $form = $view->form;
+    $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if (Database::instance()
@@ -102,7 +101,7 @@ class Movies_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9d9b25a1..8ee24da8 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -61,8 +61,7 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $view = photo::get_edit_form($photo);
-    $form = $view->form;
+    $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
       if ($form->edit_item->filename->value != $photo->name) {
         // Make sure that there's not a conflict
@@ -95,7 +94,7 @@ class Photos_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index f146bfb3..6065f580 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -94,11 +94,9 @@ class album_Core {
   }
 
   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 +128,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/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;
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index cc9261e5..82b039d7 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -207,8 +207,6 @@ modules/gallery/views/admin_themes_preview.html.php          4   DIRTY $info->na
 modules/gallery/views/admin_themes_preview.html.php          7   DIRTY $url
 modules/gallery/views/after_install.html.php                 11        $user->name
 modules/gallery/views/after_install.html.php                 15  DIRTY $user->id
-modules/gallery/views/item_edit.html.php                     4   DIRTY $script
-modules/gallery/views/item_edit.html.php                     8   DIRTY $form
 modules/gallery/views/kohana_error_page.php                  102 DIRTY $message
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $file
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $line
diff --git a/modules/gallery/views/item_edit.html.php b/modules/gallery/views/item_edit.html.php
deleted file mode 100644
index 9aa2fb64..00000000
--- a/modules/gallery/views/item_edit.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? if (!empty($script)): ?>
-<script>
-  <?= implode("\n", $script) ?>
-</script>
-<? endif ?>
-<div id="gEditFormContainer">
-  <?= $form ?>
-</div>
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 0cb49ffa..0fe8a393 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -64,19 +64,15 @@ class tag_event_Core {
     tag::compact();
   }
 
-  static function item_edit_form($item, $view) {
+  static function item_edit_form($item, $form) {
     $url = url::site("tags/autocomplete");
-    $view->script[] = "$('#gEditFormContainer form').ready(function() {
-                         $('#gEditFormContainer form input[id=tags]').autocomplete(
-                           '$url',
-                           {max: 30,
-                            multiple: true,
-                            multipleSeparator: ',',
-                            cacheLength: 1}
-                         );
-                      });";
+    $form->script("")
+      ->text("$('form input[id=tags]').ready(function() {
+                $('form input[id=tags]').autocomplete(
+                  '$url', {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1});
+              });");
     $tag_value = implode(", ", tag::item_tags($item));
-    $view->form->edit_item->input("tags")->label(t("Tags (comma separated)"))
+    $form->edit_item->input("tags")->label(t("Tags (comma separated)"))
       ->value($tag_value);
   }
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index a5aaa3f8..765c2a35 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -66,3 +66,4 @@ function editInPlace(element) {
   };
   ajaxify_editInPlaceForm();
 }
+
-- 
cgit v1.2.3