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/gallery/helpers/photo.php | 2 ++
 1 file changed, 2 insertions(+)

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

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
-- 
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


From a28dd09c4eac11ce406525ffd871df7605d5175f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 17:04:48 -0700
Subject: Properly deal with invalid images.  This fixes ticket #611 which
 shows a BMP masquerading as a .jpg causing us to be unable to rebuild resizes
 and thumbnails.  Now if that happens, we discard the file, log it and move
 on.

---
 modules/gallery/controllers/simple_uploader.php |  2 +-
 modules/gallery/helpers/photo.php               |  8 +++++--
 modules/gallery/views/simple_uploader.html.php  |  2 +-
 modules/server_add/controllers/server_add.php   | 30 +++++++++++++++----------
 4 files changed, 26 insertions(+), 16 deletions(-)

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

diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index e7c0bd6f..156d18ac 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -71,7 +71,7 @@ class Simple_Uploader_Controller extends Controller {
           unlink($temp_filename);
         }
         header("HTTP/1.1 500 Internal Server Error");
-        print "ERROR:" . $e->getMessage();
+        print "ERROR: " . $e->getMessage();
         return;
       }
       unlink($temp_filename);
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 5cf37de1..96a66d29 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -109,8 +109,12 @@ class photo_Core {
     // there's only one save() happening here.
     module::event("item_created", $photo);
 
-    // Build our thumbnail/resizes
-    graphics::generate($photo);
+    // Build our thumbnail/resizes.  If we fail to build thumbnail/resize we assume that the image
+    // is bad in some way and discard it.
+    if (!graphics::generate($photo)) {
+      $photo->delete();
+      throw new Exception("@todo BAD_IMAGE_FILE");
+    }
 
     // If the parent has no cover item, make this it.
     if (access::can("edit", $parent) && $parent->album_cover_item_id == null)  {
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 38ac518c..29a0dfe8 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -218,7 +218,7 @@
     var fp = new File_Progress(file);
     switch (error_code) {
     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-      fp.set_status("error", "<?= t("Upload error: ") ?>" + message);
+      fp.set_status("error", "<?= t("Upload error: bad image file") ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
       fp.set_status("error", "<?= t("Upload failed") ?>");
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index bfb96506..26b3bd08 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -220,19 +220,25 @@ class Server_Add_Controller extends Admin_Controller {
           $album = album::create($parent, $name, $title, null, $owner_id);
           $entry->item_id = $album->id;
         } else {
-          $extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-          if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
-            $photo = photo::create($parent, $entry->file, $name, $title, null, $owner_id);
-            $entry->item_id = $photo->id;
-          } else if (in_array($extension, array("flv", "mp4"))) {
-            $movie = movie::create($parent, $entry->file, $name, $title, null, $owner_id);
-            $entry->item_id = $movie->id;
-          } else {
-            // This should never happen, because we don't add stuff to the list that we can't
-            // process.  But just in, case.. set this to a non-null value so that we skip this
-            // entry.
+          try {
+            $extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
+            if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
+              $photo = photo::create($parent, $entry->file, $name, $title, null, $owner_id);
+              $entry->item_id = $photo->id;
+            } else if (in_array($extension, array("flv", "mp4"))) {
+              $movie = movie::create($parent, $entry->file, $name, $title, null, $owner_id);
+              $entry->item_id = $movie->id;
+            } else {
+              // This should never happen, because we don't add stuff to the list that we can't
+              // process.  But just in, case.. set this to a non-null value so that we skip this
+              // entry.
+              $entry->item_id = 0;
+              $task->log("Skipping unknown file type: $entry->file");
+            }
+          } catch (Exception $e) {
+            // This can happen if a photo file is invalid, like a BMP masquerading as a .jpg
             $entry->item_id = 0;
-            $task->log("Skipping unknown file type: $entry->file");
+            $task->log("Skipping invalid file: $entry->file");
           }
         }
 
-- 
cgit v1.2.3


From 9237ab9bc1e7b3286ceecd5bf6b03cdbfcfa98a5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 2 Sep 2009 15:29:00 -0700
Subject: Change graphics::generate() API so that it doesn't return a boolean,
 instead it throws an exception if there's a problem.  The normal case for
 graphics::generate is that it's going to succeed.  It'll only fail if
 something un-handleable went wrong, so just use the resulting exception.

---
 modules/gallery/helpers/gallery_task.php | 11 ++++++-----
 modules/gallery/helpers/graphics.php     | 10 ++++------
 modules/gallery/helpers/photo.php        |  6 ++++--
 3 files changed, 14 insertions(+), 13 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index c9557324..1b56ab97 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -60,14 +60,15 @@ class gallery_task_Core {
 
         $item = ORM::factory("item", $row->id);
         if ($item->loaded) {
-          $success = graphics::generate($item);
-          if (!$success) {
+          try {
+            graphics::generate($item);
             $ignored[$item->id] = 1;
-            $errors[] = t("Unable to rebuild images for '%title'",
-                          array("title" => html::purify($item->title)));
-          } else {
             $errors[] = t("Successfully rebuilt images for '%title'",
                           array("title" => html::purify($item->title)));
+          } catch (Exception $e) {
+            $errors[] = t("Unable to rebuild images for '%title'",
+                          array("title" => html::purify($item->title)));
+            $errors[] = $e->__toString();
           }
         }
 
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 66182a68..78812794 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -102,12 +102,12 @@ class graphics_Core {
   /**
    * Rebuild the thumb and resize for the given item.
    * @param Item_Model $item
-   * @return true on successful generation
    */
   static function generate($item) {
     if ($item->is_album()) {
       if (!$cover = $item->album_cover()) {
-        return false;
+        // This album has no cover; there's nothing to generate.
+        return;
       }
       $input_file = $cover->file_path();
       $input_item = $cover;
@@ -127,7 +127,7 @@ class graphics_Core {
       $item->thumb_dirty = 0;
       $item->resize_dirty = 0;
       $item->save();
-      return true;
+      return;
     }
 
     try {
@@ -176,10 +176,8 @@ class graphics_Core {
       // @todo we should handle this better.
       Kohana::log("error", "Caught exception rebuilding image: {$item->title}\n" .
                   $e->getMessage() . "\n" . $e->getTraceAsString());
-      return false;
+      throw $e;
     }
-
-    return true;
   }
 
   /**
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 96a66d29..40b645a2 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -111,9 +111,11 @@ class photo_Core {
 
     // Build our thumbnail/resizes.  If we fail to build thumbnail/resize we assume that the image
     // is bad in some way and discard it.
-    if (!graphics::generate($photo)) {
+    try {
+      graphics::generate($photo);
+    } catch (Exception $e) {
       $photo->delete();
-      throw new Exception("@todo BAD_IMAGE_FILE");
+      throw $e;
     }
 
     // If the parent has no cover item, make this it.
-- 
cgit v1.2.3


From 3f997562dee7fa45fec58604dd894d9c523a1113 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 7 Sep 2009 15:41:03 -0700
Subject: Add support for a per-item "slug" which will be the user-visible url
 component for that given item.  Album hierarchies are represented by nested
 slugs.  By default, we convert the filename to a slug when you create an
 album, photo or movie.

---
 modules/gallery/helpers/album.php             |  17 +++++-
 modules/gallery/helpers/gallery_installer.php |  17 +++++-
 modules/gallery/helpers/item.php              |   8 +++
 modules/gallery/helpers/movie.php             |  17 ++++--
 modules/gallery/helpers/photo.php             |  19 +++++--
 modules/gallery/models/item.php               |  72 ++++++++++++++++++--------
 modules/gallery/module.info                   |   2 +-
 modules/gallery/tests/Movie_Helper_Test.php   |  14 ++++-
 modules/gallery/tests/Photo_Helper_Test.php   |  14 ++++-
 modules/gallery/tests/test.flv                | Bin 0 -> 88722 bytes
 10 files changed, 142 insertions(+), 38 deletions(-)
 create mode 100644 modules/gallery/tests/test.flv

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

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index d46f21ac..78c5062f 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -30,9 +30,10 @@ class album_Core {
    * @param string  $name the name of this new album (it will become the directory name on disk)
    * @param integer $title the title of the new album
    * @param string  $description (optional) the longer description of this album
+   * @param string  $slug (optional) the url component for this photo
    * @return Item_Model
    */
-  static function create($parent, $name, $title, $description=null, $owner_id=null) {
+  static function create($parent, $name, $title, $description=null, $owner_id=null, $slug=null) {
     if (!$parent->loaded || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
@@ -47,6 +48,10 @@ class album_Core {
       throw new Exception("@todo NAME_CANNOT_END_IN_PERIOD");
     }
 
+    if (empty($slug)) {
+      $slug = item::convert_filename_to_slug($name);
+    }
+
     $album = ORM::factory("item");
     $album->type = "album";
     $album->title = $title;
@@ -55,15 +60,23 @@ class album_Core {
     $album->owner_id = $owner_id;
     $album->thumb_dirty = 1;
     $album->resize_dirty = 1;
+    $album->slug = $slug;
     $album->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
     $album->sort_column = "created";
     $album->sort_order = "ASC";
 
+    // Randomize the name or slug if there's a conflict
+    // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
            ->where("parent_id", $parent->id)
+           ->open_paren()
            ->where("name", $album->name)
+           ->orwhere("slug", $album->slug)
+           ->close_paren()
            ->find()->id) {
-      $album->name = "{$name}-" . rand();
+      $rand = rand();
+      $album->name = "{$name}-$rand";
+      $album->slug = "{$slug}-$rand";
     }
 
     $album = $album->add_to_parent($parent);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 40830bc0..91654afe 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -80,10 +80,12 @@ class gallery_installer {
                  `parent_id` int(9) NOT NULL,
                  `rand_key` float default NULL,
                  `relative_path_cache` varchar(255) default NULL,
+                 `relative_url_cache` varchar(255) default NULL,
                  `resize_dirty` boolean default 1,
                  `resize_height` int(9) default NULL,
                  `resize_width` int(9) default NULL,
                  `right_ptr` int(9) NOT NULL,
+                 `slug` varchar(255) default NULL,
                  `sort_column` varchar(64) default NULL,
                  `sort_order` char(4) default 'ASC',
                  `thumb_dirty` boolean default 1,
@@ -260,7 +262,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", 11);
+    module::set_version("gallery", 12);
   }
 
   static function upgrade($version) {
@@ -343,7 +345,18 @@ class gallery_installer {
 
       module::set_version("gallery", $version = 11);
     }
-}
+
+    if ($version == 11) {
+      $db->query("ALTER TABLE {items} ADD COLUMN `relative_url_cache` varchar(255) DEFAULT NULL");
+      $db->query("ALTER TABLE {items} ADD COLUMN `slug` varchar(255) DEFAULT NULL");
+
+      // This is imperfect since some of the slugs may contain invalid characters, but it'll do
+      // for now because we don't want a lengthy operation here.
+      $db->query("UPDATE {items} SET `slug` = `name`");
+      $db->query("UPDATE {items} SET `relative_url_cache` = `relative_path_cache`");
+      module::set_version("gallery", $version = 12);
+    }
+  }
 
   static function uninstall() {
     $db = Database::instance();
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 8839861f..bf948731 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -120,6 +120,14 @@ class item_Core {
     return $title;
   }
 
+  /**
+   * Convert a filename into something we can use as a url component.
+   * @param string $filename
+   */
+  static function convert_filename_to_slug($filename) {
+    return preg_replace("/[^A-Za-z0-9-_]+/", "-", pathinfo($filename, PATHINFO_FILENAME));
+  }
+
   /**
    * Display delete confirmation message and form
    * @param object $item
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index ec975cb0..59bf5c19 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -31,10 +31,11 @@ class movie_Core {
    * @param string  $name the filename to use for this photo in the album
    * @param integer $title the title of the new photo
    * @param string  $description (optional) the longer description of this photo
+   * @param string  $slug (optional) the url component for this photo
    * @return Item_Model
    */
   static function create($parent, $filename, $name, $title,
-                         $description=null, $owner_id=null) {
+                         $description=null, $owner_id=null, $slug=null) {
     if (!$parent->loaded || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
@@ -67,6 +68,10 @@ class movie_Core {
       $name .= "." . $pi["extension"];
     }
 
+    if (empty($slug)) {
+      $slug = item::convert_filename_to_slug($name);
+    }
+
     $movie = ORM::factory("item");
     $movie->type = "movie";
     $movie->title = $title;
@@ -79,15 +84,21 @@ class movie_Core {
     $movie->thumb_dirty = 1;
     $movie->resize_dirty = 1;
     $movie->sort_column = "weight";
+    $movie->slug = $slug;
     $movie->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
+    // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
            ->where("parent_id", $parent->id)
+           ->open_paren()
            ->where("name", $movie->name)
+           ->orwhere("slug", $movie->slug)
+           ->close_paren()
            ->find()->id) {
-      // @todo Improve this.  Random numbers are not user friendly
-      $movie->name = rand() . "." . $pi["extension"];
+      $rand = rand();
+      $movie->name = "{$name}.$rand.{$pi['extension']}";
+      $movie->slug = "{$slug}-$rand";
     }
 
     // This saves the photo
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 40b645a2..c713fff9 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -31,10 +31,11 @@ class photo_Core {
    * @param string  $name the filename to use for this photo in the album
    * @param integer $title the title of the new photo
    * @param string  $description (optional) the longer description of this photo
+   * @param string  $slug (optional) the url component for this photo
    * @return Item_Model
    */
   static function create($parent, $filename, $name, $title,
-                         $description=null, $owner_id=null) {
+                         $description=null, $owner_id=null, $slug=null) {
     if (!$parent->loaded || !$parent->is_album()) {
       throw new Exception("@todo INVALID_PARENT");
     }
@@ -66,6 +67,10 @@ class photo_Core {
       $name .= "." . $pi["extension"];
     }
 
+    if (empty($slug)) {
+      $slug = item::convert_filename_to_slug($name);
+    }
+
     $photo = ORM::factory("item");
     $photo->type = "photo";
     $photo->title = $title;
@@ -78,15 +83,21 @@ class photo_Core {
     $photo->thumb_dirty = 1;
     $photo->resize_dirty = 1;
     $photo->sort_column = "weight";
+    $photo->slug = $slug;
     $photo->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
-    // Randomize the name if there's a conflict
+    // Randomize the name or slug if there's a conflict
+    // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
            ->where("parent_id", $parent->id)
+           ->open_paren()
            ->where("name", $photo->name)
+           ->orwhere("slug", $photo->slug)
+           ->close_paren()
            ->find()->id) {
-      // @todo Improve this.  Random numbers are not user friendly
-      $photo->name = rand() . "." . $pi["extension"];
+      $rand = rand();
+      $photo->name = "{$name}.$rand.{$pi['extension']}";
+      $photo->slug = "{$slug}-$rand";
     }
 
     // This saves the photo
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 8905a627..b679ebf1 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -117,7 +117,8 @@ class Item_Model extends ORM_MPTT {
       @rename(dirname($original_thumb_path), dirname($this->thumb_path()));
       Database::instance()
         ->update("items",
-                 array("relative_path_cache" => null),
+                 array("relative_path_cache" => null,
+                       "relative_url_cache" => null),
                  array("left_ptr >" => $this->left_ptr, "right_ptr <" => $this->right_ptr));
     } else {
       @rename($original_resize_path, $this->resize_path());
@@ -153,7 +154,8 @@ class Item_Model extends ORM_MPTT {
     if ($this->is_album()) {
       Database::instance()
         ->update("items",
-                 array("relative_path_cache" => null),
+                 array("relative_path_cache" => null,
+                       "relative_url_cache" => null),
                  array("left_ptr >" => $this->left_ptr, "right_ptr <" => $this->right_ptr));
     }
 
@@ -188,8 +190,8 @@ class Item_Model extends ORM_MPTT {
    * photo: http://example.com/gallery3/var/albums/album1/photo.jpg
    */
   public function file_url($full_uri=false) {
-    $relative_path = "var/albums/" . $this->relative_path();
-    return $full_uri ? url::abs_file($relative_path) : url::file($relative_path);
+    $relative_url = "var/albums/" . $this->relative_url();
+    return $full_uri ? url::abs_file($relative_url) : url::file($relative_url);
   }
 
   /**
@@ -221,8 +223,8 @@ class Item_Model extends ORM_MPTT {
    */
   public function thumb_url($full_uri=false) {
     $cache_buster = "?m=" . $this->updated;
-    $relative_path = "var/thumbs/" . $this->relative_path();
-    $base = ($full_uri ? url::abs_file($relative_path) : url::file($relative_path));
+    $relative_url = "var/thumbs/" . $this->relative_url();
+    $base = ($full_uri ? url::abs_file($relative_url) : url::file($relative_url));
     if ($this->is_photo()) {
       return $base . $cache_buster;
     } else if ($this->is_album()) {
@@ -248,11 +250,33 @@ class Item_Model extends ORM_MPTT {
    * photo: http://example.com/gallery3/var/albums/album1/photo.resize.jpg
    */
   public function resize_url($full_uri=false) {
-    $relative_path = "var/resizes/" . $this->relative_path();
-    return ($full_uri ? url::abs_file($relative_path) : url::file($relative_path)) .
+    $relative_url = "var/resizes/" . $this->relative_url();
+    return ($full_uri ? url::abs_file($relative_url) : url::file($relative_url)) .
       ($this->is_album() ? "/.album.jpg" : "");
   }
 
+  /**
+   * Rebuild the relative_path_cache and relative_url_cache.
+   */
+  private function _build_relative_caches() {
+    $names = array();
+    $slugs = array();
+    foreach (Database::instance()
+             ->select(array("name", "slug"))
+             ->from("items")
+             ->where("left_ptr <=", $this->left_ptr)
+             ->where("right_ptr >=", $this->right_ptr)
+             ->where("id <>", 1)
+             ->orderby("left_ptr", "ASC")
+             ->get() as $row) {
+      $names[] = $row->name;
+      $slugs[] = $row->slug;
+    }
+    $this->relative_path_cache = implode($names, "/");
+    $this->relative_url_cache = implode($slugs, "/");
+    $this->save();
+  }
+
   /**
    * Return the relative path to this item's file.
    * @return string
@@ -263,23 +287,26 @@ class Item_Model extends ORM_MPTT {
     }
 
     if (!isset($this->relative_path_cache)) {
-      $paths = array();
-      foreach (Database::instance()
-               ->select("name")
-               ->from("items")
-               ->where("left_ptr <=", $this->left_ptr)
-               ->where("right_ptr >=", $this->right_ptr)
-               ->where("id <>", 1)
-               ->orderby("left_ptr", "ASC")
-               ->get() as $row) {
-        $paths[] = $row->name;
-      }
-      $this->relative_path_cache = implode($paths, "/");
-      $this->save();
+      $this->_build_relative_caches();
     }
     return $this->relative_path_cache;
   }
 
+  /**
+   * Return the relative url to this item's file.
+   * @return string
+   */
+  public function relative_url() {
+    if (!$this->loaded) {
+      return;
+    }
+
+    if (!isset($this->relative_url_cache)) {
+      $this->_build_relative_caches();
+    }
+    return $this->relative_url_cache;
+  }
+
   /**
    * @see ORM::__get()
    */
@@ -302,7 +329,8 @@ class Item_Model extends ORM_MPTT {
    */
   public function __set($column, $value) {
     if ($column == "name") {
-      // Clear the relative path as it is no longer valid.
+      // Clear the relative path as it is no longer valid.  The relative url cache does not need
+      // to be flushed because it's not tightly bound to the actual name of the file.
       $this->relative_path_cache = null;
     }
     parent::__set($column, $value);
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 6b9dd1ba..70bd91e2 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 11
+version = 12
diff --git a/modules/gallery/tests/Movie_Helper_Test.php b/modules/gallery/tests/Movie_Helper_Test.php
index 627651bb..23544934 100644
--- a/modules/gallery/tests/Movie_Helper_Test.php
+++ b/modules/gallery/tests/Movie_Helper_Test.php
@@ -22,7 +22,7 @@ class Movie_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $movie = movie::create($root, MODPATH . "gallery/tests/test.jpg", "$rand/.jpg", $rand, $rand);
+      $movie = movie::create($root, MODPATH . "gallery/tests/test.flv", "$rand/.flv", $rand, $rand);
     } catch (Exception $e) {
       // pass
       return;
@@ -35,7 +35,7 @@ class Movie_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     try {
-      $movie = movie::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg.", $rand, $rand);
+      $movie = movie::create($root, MODPATH . "gallery/tests/test.flv", "$rand.flv.", $rand, $rand);
     } catch (Exception $e) {
       $this->assert_equal("@todo NAME_CANNOT_END_IN_PERIOD", $e->getMessage());
       return;
@@ -43,4 +43,14 @@ class Movie_Helper_Test extends Unit_Test_Case {
 
     $this->assert_true(false, "Shouldn't create a movie with trailing . in the name");
   }
+
+  public function create_movie_creates_reasonable_slug_test() {
+    $rand = rand();
+    $root = ORM::factory("item", 1);
+    $album = album::create($root, $rand, $rand, $rand);
+    $movie = movie::create(
+      $album, MODPATH . "gallery/tests/test.flv", "This (is) my file%name.flv", $rand, $rand);
+
+    $this->assert_equal("This-is-my-file-name", $movie->slug);
+  }
 }
diff --git a/modules/gallery/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index c0641ef4..a261693f 100644
--- a/modules/gallery/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
@@ -69,7 +69,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
-    $this->assert_equal("http://./var/thumbs/{$rand}.jpg?m={$photo->updated}", $photo->thumb_url());
+    $this->assert_equal("http://./var/thumbs/{$rand}?m={$photo->updated}", $photo->thumb_url());
   }
 
   public function resize_url_test() {
@@ -78,7 +78,17 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $album = album::create($root, $rand, $rand, $rand);
     $photo = photo::create($album, MODPATH . "gallery/tests/test.jpg", "$rand.jpg", $rand, $rand);
 
-    $this->assert_equal("http://./var/resizes/{$rand}/{$rand}.jpg", $photo->resize_url());
+    $this->assert_equal("http://./var/resizes/{$rand}/{$rand}", $photo->resize_url());
+  }
+
+  public function create_photo_creates_reasonable_slug_test() {
+    $rand = rand();
+    $root = ORM::factory("item", 1);
+    $album = album::create($root, $rand, $rand, $rand);
+    $photo = photo::create(
+      $album, MODPATH . "gallery/tests/test.jpg", "This (is) my file%name.jpg", $rand, $rand);
+
+    $this->assert_equal("This-is-my-file-name", $photo->slug);
   }
 
   public function create_photo_shouldnt_allow_names_with_slash_test() {
diff --git a/modules/gallery/tests/test.flv b/modules/gallery/tests/test.flv
new file mode 100644
index 00000000..799d137e
Binary files /dev/null and b/modules/gallery/tests/test.flv differ
-- 
cgit v1.2.3


From 795675e2b5eeee30d90e2efdda28c3df10677af3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 7 Sep 2009 16:19:41 -0700
Subject: Add the slug to album, photo, and movie forms.

---
 modules/gallery/helpers/album.php | 2 ++
 modules/gallery/helpers/photo.php | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 78c5062f..d995b6ad 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -100,6 +100,7 @@ class album_Core {
     $group->input("name")->label(t("Directory Name"))
       ->callback("item::validate_no_slashes")
       ->error_messages("no_slashes", t("The directory name can't contain the \"/\" character"));
+    $group->input("slug")->label(t("Internet Address"));
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Create"));
     $form->add_rules_from(ORM::factory("item"));
@@ -122,6 +123,7 @@ class album_Core {
         ->error_messages("no_slashes", t("The directory name can't contain a \"/\""))
         ->callback("item::validate_no_trailing_period")
         ->error_messages("no_trailing_period", t("The directory name can't end in \".\""));
+      $group->input("slug")->label(t("Internet Address"))->value($parent->slug);
     }
 
     $sort_order = $group->group("sort_order", array("id" => "gAlbumSortOrder"))
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index c713fff9..12515330 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -140,10 +140,11 @@ class photo_Core {
   static function get_add_form($parent) {
     $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm"));
     $group = $form->group("add_photo")->label(
-      t("Add Photo to %album_title", array("album_title" =>$parent->title)));
+      t("Add Photo to %album_title", array("album_title" => $parent->title)));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Description"));
     $group->input("name")->label(t("Filename"));
+    $group->input("slug")->label(t("Internet Address"))->value($photo->slug);
     $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv,mp4]");
     $group->hidden("type")->value("photo");
     $group->submit("")->value(t("Upload"));
@@ -163,6 +164,7 @@ class photo_Core {
       ->error_messages("no_slashes", t("The photo name can't contain a \"/\""))
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
+    $group->input("slug")->label(t("Internet Address"))->value($photo->slug);
 
     module::event("item_edit_form", $photo, $form);
 
-- 
cgit v1.2.3


From f28353f4e1c573a33dc1c3375585ab040f8be2fc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 7 Sep 2009 21:01:51 -0700
Subject: Add the 'Internet Address' field to all items, along with proper
 validation for the fields.

---
 modules/gallery/controllers/albums.php | 20 ++++++++++++++++----
 modules/gallery/controllers/movies.php | 20 ++++++++++++++++----
 modules/gallery/controllers/photos.php | 31 +++++++++++++++++++++----------
 modules/gallery/helpers/album.php      | 17 ++++++++++++++---
 modules/gallery/helpers/photo.php      | 16 +++++++++++++---
 5 files changed, 80 insertions(+), 24 deletions(-)

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

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 5f62f798..732a1789 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -168,15 +168,27 @@ class Albums_Controller extends Items_Controller {
 
     $form = album::get_edit_form($album);
     if ($valid = $form->validate()) {
-      // Make sure that there's not a conflict
       if ($album->id != 1 &&
-          Database::instance()
+          $form->edit_item->dirname->value != $album->name ||
+          $form->edit_item->slug->value != $album->slug) {
+        // Make sure that there's not a conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
           ->from("items")
           ->where("parent_id", $album->parent_id)
           ->where("id <>", $album->id)
+          ->open_paren()
           ->where("name", $form->edit_item->dirname->value)
-          ->count_records()) {
-        $form->edit_item->dirname->add_error("conflict", 1);
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->dirname->value) {
+          $form->edit_item->dirname->add_error("name_conflict", 1);
+        }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
         $valid = false;
       }
     }
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c40cde9e..2ba6bb5b 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -72,14 +72,26 @@ class Movies_Controller extends Items_Controller {
 
     $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
-      // Make sure that there's not a conflict
-      if (Database::instance()
+      if ($form->edit_item->filename->value != $photo->name ||
+          $form->edit_item->slug->value != $photo->slug) {
+        // Make sure that there's not a name or slug conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
           ->from("items")
           ->where("parent_id", $photo->parent_id)
           ->where("id <>", $photo->id)
+          ->open_paren()
           ->where("name", $form->edit_item->filename->value)
-          ->count_records()) {
-        $form->edit_item->filename->add_error("conflict", 1);
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->filename->value) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
+        }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
         $valid = false;
       }
     }
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index dd6d3ab5..159501c0 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -62,18 +62,29 @@ class Photos_Controller extends Items_Controller {
     access::required("edit", $photo);
 
     $form = photo::get_edit_form($photo);
+    $valid = $form->validate();
     if ($valid = $form->validate()) {
-      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_item->filename->value)
-            ->count_records()) {
-          $form->edit_item->filename->add_error("conflict", 1);
-          $valid = false;
+      if ($form->edit_item->filename->value != $photo->name ||
+          $form->edit_item->slug->value != $photo->slug) {
+        // Make sure that there's not a name or slug conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
+          ->from("items")
+          ->where("parent_id", $photo->parent_id)
+          ->where("id <>", $photo->id)
+          ->open_paren()
+          ->where("name", $form->edit_item->filename->value)
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->filename->value) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
         }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
+        $valid = false;
       }
     }
 
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index d995b6ad..bae480b7 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -97,10 +97,14 @@ class album_Core {
       ->label(t("Add an album to %album_title", array("album_title" => $parent->title)));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Description"));
-    $group->input("name")->label(t("Directory Name"))
+    $group->input("name")->label(t("Directory name"))
       ->callback("item::validate_no_slashes")
       ->error_messages("no_slashes", t("The directory name can't contain the \"/\" character"));
-    $group->input("slug")->label(t("Internet Address"));
+    $group->input("slug")->label(t("Internet Address"))
+      ->callback("item::validate_url_safe")
+      ->error_messages(
+        "not_url_safe",
+        t("The internet address should contain only letters, numbers, hyphens and underscores"));
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Create"));
     $form->add_rules_from(ORM::factory("item"));
@@ -119,11 +123,18 @@ class album_Core {
     if ($parent->id != 1) {
       $group->input("dirname")->label(t("Directory Name"))->value($parent->name)
         ->rules("required")
+        ->error_messages("name_conflict", t("There is already a photo or album with this name"))
         ->callback("item::validate_no_slashes")
         ->error_messages("no_slashes", t("The directory name can't contain a \"/\""))
         ->callback("item::validate_no_trailing_period")
         ->error_messages("no_trailing_period", t("The directory name can't end in \".\""));
-      $group->input("slug")->label(t("Internet Address"))->value($parent->slug);
+      $group->input("slug")->label(t("Internet Address"))->value($parent->slug)
+        ->error_messages(
+          "slug_conflict", t("There is already a photo or album with this internet address"))
+        ->callback("item::validate_url_safe")
+        ->error_messages(
+          "not_url_safe",
+          t("The internet address should contain only letters, numbers, hyphens and underscores"));
     }
 
     $sort_order = $group->group("sort_order", array("id" => "gAlbumSortOrder"))
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 12515330..a56c7e3c 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -144,7 +144,11 @@ class photo_Core {
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Description"));
     $group->input("name")->label(t("Filename"));
-    $group->input("slug")->label(t("Internet Address"))->value($photo->slug);
+    $group->input("slug")->label(t("Internet Address"))->value($photo->slug)
+      ->callback("item::validate_url_safe")
+      ->error_messages(
+        "not_url_safe",
+        t("The internet address should contain only letters, numbers, hyphens and underscores"));
     $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv,mp4]");
     $group->hidden("type")->value("photo");
     $group->submit("")->value(t("Upload"));
@@ -159,12 +163,18 @@ class photo_Core {
     $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)
-      ->error_messages("conflict", t("There is already a file with this name"))
+      ->error_messages("name_conflict", t("There is already a photo or album with this name"))
       ->callback("item::validate_no_slashes")
       ->error_messages("no_slashes", t("The photo name can't contain a \"/\""))
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
-    $group->input("slug")->label(t("Internet Address"))->value($photo->slug);
+    $group->input("slug")->label(t("Internet Address"))->value($photo->slug)
+      ->callback("item::validate_url_safe")
+      ->error_messages(
+        "slug_conflict", t("There is already a photo or album with this internet address"))
+      ->error_messages(
+        "not_url_safe",
+        t("The internet address should contain only letters, numbers, hyphens and underscores"));
 
     module::event("item_edit_form", $photo, $form);
 
-- 
cgit v1.2.3


From af4411a44750b373916b841e01dac8ab434be68c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 10 Sep 2009 21:55:36 -0700
Subject: Put the buttons for album/photo dialogs in their own group in the
 form so that they appear at the end, after any other groups that other
 modules add.  Thanks Glooper!

---
 modules/gallery/helpers/album.php | 1 +
 modules/gallery/helpers/photo.php | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index bae480b7..dfb1e66d 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -152,6 +152,7 @@ class album_Core {
 
     module::event("item_edit_form", $parent, $form);
 
+    $group = $form->group("buttons")->label("");
     $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 a56c7e3c..3d9fbe69 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -178,6 +178,7 @@ class photo_Core {
 
     module::event("item_edit_form", $photo, $form);
 
+    $group = $form->group("buttons")->label("");
     $group->submit("")->value(t("Modify"));
     $form->add_rules_from(ORM::factory("item"));
     return $form;
-- 
cgit v1.2.3