From 23bb6eb7e35637c8a2124216dbb6d3246ad3d702 Mon Sep 17 00:00:00 2001
From: Romain LE DISEZ <romain.git@ledisez.net>
Date: Sat, 25 Jul 2009 19:06:54 +0200
Subject: Rename columns that use reserved SQL words : items.left and
 items.right

---
 modules/gallery/tests/Database_Test.php          |  8 ++++----
 modules/gallery/tests/Gallery_Installer_Test.php | 10 +++++-----
 modules/gallery/tests/ORM_MPTT_Test.php          | 14 +++++++-------
 modules/gallery/tests/Photo_Helper_Test.php      |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index bd3d2f53..d83212ad 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -103,15 +103,15 @@ class Database_Test extends Unit_Test_Case {
     $sql = "UPDATE {test_tables} SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM {items} " .
-        "  WHERE `left` >= 1 " .
-        "  AND `right` <= 6)";
+        "  WHERE `left_ptr` >= 1 " .
+        "  AND `right_ptr` <= 6)";
     $sql = $db->add_table_prefixes($sql);
 
     $expected = "UPDATE g3test_test_tables SET `name` = '{test string}' " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM g3test_items " .
-        "  WHERE `left` >= 1 " .
-        "  AND `right` <= 6)";
+        "  WHERE `left_ptr` >= 1 " .
+        "  AND `right_ptr` <= 6)";
 
     $this->assert_same($expected, $sql);
   }
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 27157d6e..36ced2bb 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -34,13 +34,13 @@ class Gallery_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_creates_root_item_test() {
-    $max_right = ORM::factory("item")
-      ->select("MAX(`right`) AS `right`")
-      ->find()->right;
+    $max_right_ptr = ORM::factory("item")
+      ->select("MAX(`right_ptr`) AS `right_ptr`")
+      ->find()->right_ptr;
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
-    $this->assert_equal(1, $root->left);
-    $this->assert_equal($max_right, $root->right);
+    $this->assert_equal(1, $root->left_ptr);
+    $this->assert_equal($max_right_ptr, $root->right_ptr);
     $this->assert_equal(null, $root->parent_id);
     $this->assert_equal(1, $root->level);
   }
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 200c8a74..943810c3 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -33,8 +33,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album->sort_order = "ASC";
     $album->add_to_parent($root);
 
-    $this->assert_equal($album->parent()->right - 2, $album->left);
-    $this->assert_equal($album->parent()->right - 1, $album->right);
+    $this->assert_equal($album->parent()->right_ptr - 2, $album->left_ptr);
+    $this->assert_equal($album->parent()->right_ptr - 1, $album->right_ptr);
     $this->assert_equal($album->parent()->level + 1, $album->level);
     $this->assert_equal($album->parent()->id, $album->parent_id);
   }
@@ -48,10 +48,10 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1_1_2 = self::create_item_and_add_to_parent($album1_1);
 
     $album1->reload();
-    $this->assert_equal(9, $album1->right - $album1->left);
+    $this->assert_equal(9, $album1->right_ptr - $album1->left_ptr);
 
     $album1_1->reload();
-    $this->assert_equal(5, $album1_1->right - $album1_1->left);
+    $this->assert_equal(5, $album1_1->right_ptr - $album1_1->left_ptr);
   }
 
   public function delete_hierarchy_test() {
@@ -66,7 +66,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1->reload();
 
     // Now album1 contains only album1_2
-    $this->assert_equal(3, $album1->right - $album1->left);
+    $this->assert_equal(3, $album1->right_ptr - $album1->left_ptr);
   }
 
   public function move_to_test() {
@@ -85,8 +85,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $album1_1->reload();
     $album1_2->reload();
 
-    $this->assert_equal(3, $album1_1->right - $album1_1->left);
-    $this->assert_equal(3, $album1_2->right - $album1_2->left);
+    $this->assert_equal(3, $album1_1->right_ptr - $album1_1->left_ptr);
+    $this->assert_equal(3, $album1_2->right_ptr - $album1_2->left_ptr);
 
     $this->assert_equal(
       array($album1_1_2->id => "move_to_test_1_1_2"),
diff --git a/modules/gallery/tests/Photo_Helper_Test.php b/modules/gallery/tests/Photo_Helper_Test.php
index cc1f20da..c0641ef4 100644
--- a/modules/gallery/tests/Photo_Helper_Test.php
+++ b/modules/gallery/tests/Photo_Helper_Test.php
@@ -43,8 +43,8 @@ class Photo_Helper_Test extends Unit_Test_Case {
     $this->assert_equal($image_info[0], $photo->width);
     $this->assert_equal($image_info[1], $photo->height);
 
-    $this->assert_equal($photo->parent()->right - 2, $photo->left);
-    $this->assert_equal($photo->parent()->right - 1, $photo->right);
+    $this->assert_equal($photo->parent()->right_ptr - 2, $photo->left_ptr);
+    $this->assert_equal($photo->parent()->right_ptr - 1, $photo->right_ptr);
   }
 
   public function create_conflicting_photo_test() {
-- 
cgit v1.2.3


From 5fd82a2edea41209a6936f89c56bbd53083ed182 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 27 Jul 2009 11:13:20 -0700
Subject: Back out the fix for ticket #452 Revert "Changed access::user_can to
 force the owner of an item to have"

This reverts commit 0b97cfd6f098be08be5f3cf1dbca1cce580ae330.
---
 modules/gallery/helpers/access.php           | 17 ++---------
 modules/gallery/tests/Access_Helper_Test.php | 42 ----------------------------
 2 files changed, 3 insertions(+), 56 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 79394d35..8c6f5d54 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -95,24 +95,13 @@ class access_Core {
       return false;
     }
 
-    if ($user->admin) {
+    if ($user->admin && $item->owner_id == $user->id) {
       return true;
     }
 
-    print "Before owner id check\n";
-    if ($item->owner_id == $user->id  &&
-        in_array($perm_name, array("view_full", "edit", "add"))) {
-      return true;
-    }
-
-    if ($perm_name == "view") {
-      $resource = $item->owner_id == $user->id ? $item->parent() : $item;
-    } else {
-      $resource = model_cache::get("access_cache", $item->id, "item_id");
-    }
-    print Kohana::debug($resource->as_array()) . "\n";
+    $resource = $perm_name == "view" ?
+      $item : model_cache::get("access_cache", $item->id, "item_id");
     foreach ($user->groups as $group) {
-      print "$group->name\n";
       if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
       }
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 737ed8a6..59cec453 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -101,48 +101,6 @@ class Access_Helper_Test extends Unit_Test_Case {
     $this->assert_false(access::user_can($user, "view", $item), "Should be unable to view");
   }
 
-  public function owner_can_view_album_test() {
-    $user = user::create("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
-      $user->remove($group);
-    }
-    $user->save();
-
-    $root = ORM::factory("item", 1);
-    $item = album::create($root,  rand(), "test album", $user->id);
-
-    $this->assert_true(access::user_can($user, "view", $item), "Should be able to view");
-  }
-
-  public function owner_can_view_photo_test() {
-    $user = user::create("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
-      $user->remove($group);
-    }
-    $user->save();
-
-    $root = ORM::factory("item", 1);
-    $album = album::create($root,  rand(), "test album", $user->id);
-    $item = photo::create($album, MODPATH . "gallery/images/gallery.png", "", "", null, $user->id);
-
-    $this->assert_true(access::user_can($user, "view", $item), "Should be able to view");
-  }
-
-  public function owner_cant_view_photo_test() {
-    $user = user::create("access_test", "Access Test", "");
-    foreach ($user->groups as $group) {
-      $user->remove($group);
-    }
-    $user->save();
-
-    $root = ORM::factory("item", 1);
-    $album = album::create($root,  rand(), "test album");
-    access::deny(group::everybody(), "view", $album);
-    $item = photo::create($album, MODPATH . "gallery/images/gallery.png", "", "", null, $user->id);
-
-    $this->assert_false(access::user_can($user, "view", $item), "Should not be able to view");
-  }
-
   public function adding_and_removing_items_adds_ands_removes_rows_test() {
     $root = ORM::factory("item", 1);
     $item = album::create($root,  rand(), "test album");
-- 
cgit v1.2.3


From b3fe70e654c1519f8f1d54a80f99d0af7a8f2e49 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 27 Jul 2009 11:34:27 -0700
Subject: Updated.

---
 modules/gallery/tests/xss_data.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 2940a8df..45f7c7ec 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -163,9 +163,9 @@ modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY $task->id
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY $csrf
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY $task->name
 modules/gallery/views/admin_maintenance_show_log.html.php    15        $task->get_log()
-modules/gallery/views/admin_maintenance_task.html.php        5   DIRTY $task->id
-modules/gallery/views/admin_maintenance_task.html.php        5   DIRTY $csrf
-modules/gallery/views/admin_maintenance_task.html.php        26  DIRTY $task->name
+modules/gallery/views/admin_maintenance_task.html.php        23  DIRTY $task->id
+modules/gallery/views/admin_maintenance_task.html.php        23  DIRTY $csrf
+modules/gallery/views/admin_maintenance_task.html.php        47  DIRTY $task->name
 modules/gallery/views/admin_modules.html.php                 19  DIRTY $i
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $data
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $module_name
@@ -567,11 +567,11 @@ themes/default/views/dynamic.html.php                        29  DIRTY $theme->p
 themes/default/views/footer.html.php                         2   DIRTY $theme->footer()
 themes/default/views/footer.html.php                         4   DIRTY $footer_text
 themes/default/views/footer.html.php                         9   DIRTY $theme->credits()
-themes/default/views/header.html.php                         2   DIRTY $theme->header_top()
-themes/default/views/header.html.php                         4   DIRTY $header_text
-themes/default/views/header.html.php                         7   DIRTY $theme->url("images/logo.png")
+themes/default/views/header.html.php                         3   DIRTY $theme->header_top()
+themes/default/views/header.html.php                         5   DIRTY $header_text
+themes/default/views/header.html.php                         8   DIRTY $theme->url("images/logo.png")
 themes/default/views/header.html.php                         12  DIRTY $theme->site_menu()
-themes/default/views/header.html.php                         15  DIRTY $theme->header_bottom()
+themes/default/views/header.html.php                         14  DIRTY $theme->header_bottom()
 themes/default/views/header.html.php                         21  DIRTY $parent->id
 themes/default/views/header.html.php                         21  DIRTY $item->id
 themes/default/views/header.html.php                         22        $parent->title
-- 
cgit v1.2.3


From 2f969c80eb2e228f2c5729c6f4660c99555f9c9f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 28 Jul 2009 11:59:58 +0800
Subject: Create A Forge Script element. Form_Script allows the specification
 of either a url to a script file or in line text which will be included in a
 script block.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/libraries/Form_Script.php | 66 +++++++++++++++++++++++++++++++
 modules/gallery/tests/DrawForm_Test.php   | 39 ++++++++++++++++++
 modules/gallery/tests/xss_data.txt        |  4 +-
 modules/gallery/views/form.html.php       |  2 +
 4 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 modules/gallery/libraries/Form_Script.php

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/libraries/Form_Script.php b/modules/gallery/libraries/Form_Script.php
new file mode 100644
index 00000000..e841408d
--- /dev/null
+++ b/modules/gallery/libraries/Form_Script.php
@@ -0,0 +1,66 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Form_Script_Core extends Forge {
+  protected $data = array(
+    "name" => false,
+    "type"  => "script",
+    "url" => "",
+    "text" => "");
+
+  public function __construct($name) {
+    // Set dummy data so we don"t get errors
+    $this->attr["action"] = "";
+    $this->attr["method"] = "post";
+    $this->data["name"] = $name;
+  }
+
+  public function __get($key) {
+    return isset($this->data[$key]) ? $this->data[$key] : null;
+  }
+
+  /**
+   * Sets url attribute
+   */
+  public function url($url) {
+    $this->data["url"] = $url;
+
+    return $this;
+  }
+
+  public function text($script_text) {
+    $this->data["text"] = $script_text;
+
+    return $this;
+  }
+
+  public function render() {
+    $script = array();
+    if (!empty($this->data["url"])) {
+      $script[] = html::script($this->data["url"]);
+    }
+
+    if (!empty($this->data["text"])) {
+      $script[] = "<script type=\"text/javascript\">\n{$this->data['text']}\n</script>\n";
+    }
+
+    return implode("\n", $script);
+  }
+
+} // End Form Script
\ No newline at end of file
diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 2c5aaba4..dde54257 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -80,5 +80,44 @@ class DrawForm_Test extends Unit_Test_Case {
     $this->assert_same($expected, $rendered);
   }
 
+  function form_script_test() {
+    $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm"));
+    $group = $form->group("test_group")->label(t("Test Group"));
+    $group->input("title")->label(t("Title"));
+    $group->textarea("description")->label(t("Text Area"));
+    $form->script("")
+      ->url(url::file("test.js"))
+      ->text("alert('Test Javascript');");
+    $group->submit("")->value(t("Submit"));
+    $rendered = $form->__toString();
+
+    $expected = "<form action=\"http://./index.php/test/controller\" method=\"post\" " .
+                      "id=\"gTestGroupForm\">\n" .
+                "<input type=\"hidden\" name=\"csrf\" value=\"" . access::csrf_token() . "\"  />\n" .
+                "  <fieldset>\n" .
+                "    <legend>Test Group</legend>\n" .
+                "    <ul>\n" .
+                "      <li>\n" .
+                "        <label for=\"title\" >Title</label>\n" .
+                "        <input type=\"text\" id=\"title\" name=\"title\" value=\"\" " .
+                            "class=\"textbox\"  />\n" .
+                "      </li>\n" .
+                "      <li>\n" .
+                "        <label for=\"description\" >Text Area</label>\n" .
+                "        <textarea id=\"description\" name=\"description\" " .
+                              "class=\"textarea\" ></textarea>\n" .
+                "      </li>\n" .
+                "      <li>\n" .
+                "        <input type=\"submit\" value=\"Submit\" class=\"submit\"  />\n" .
+                "      </li>\n" .
+                "    </ul>\n" .
+                "  </fieldset>\n" .
+                "<script type=\"text/javascript\" src=\"http://./test.js\"></script>\n\n" .
+                "<script type=\"text/javascript\">\n" .
+                "alert('Test Javascript');\n" .
+                "</script>\n" .
+                "</form>\n";
+    $this->assert_same($expected, $rendered);
+  }
 }
 
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 45f7c7ec..cc9261e5 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -444,8 +444,8 @@ modules/tag/views/admin_tags.html.php                        50  DIRTY $tag->id
 modules/tag/views/admin_tags.html.php                        50        $tag->name
 modules/tag/views/admin_tags.html.php                        51  DIRTY $tag->count
 modules/tag/views/admin_tags.html.php                        52  DIRTY $tag->id
-modules/tag/views/tag_block.html.php                         13  DIRTY $cloud
-modules/tag/views/tag_block.html.php                         15  DIRTY $form
+modules/tag/views/tag_block.html.php                         15  DIRTY $cloud
+modules/tag/views/tag_block.html.php                         17  DIRTY $form
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $tag->count
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $max_count
 modules/tag/views/tag_cloud.html.php                         5   DIRTY $tag->count
diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php
index ec2a56a9..730d77cb 100644
--- a/modules/gallery/views/form.html.php
+++ b/modules/gallery/views/form.html.php
@@ -40,6 +40,8 @@ if (!function_exists("DrawForm")) {
           print "$prefix  {$hidden->render()}\n";
         }
         print "$prefix</fieldset>\n";
+      } else if ($input->type == 'script') {
+        print $input->render();
       } else {
         if ($input->error_messages()) {
           print "$prefix<li class=\"gError\">\n";
-- 
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/tests')

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 031a19724ae361825f18d3e29d3fdf1fa9f9b303 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 30 Jul 2009 09:55:09 -0700
Subject: Update golden file

---
 modules/gallery/tests/xss_data.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 82b039d7..0e118ce7 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -163,9 +163,9 @@ modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY $task->id
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY $csrf
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY $task->name
 modules/gallery/views/admin_maintenance_show_log.html.php    15        $task->get_log()
-modules/gallery/views/admin_maintenance_task.html.php        23  DIRTY $task->id
-modules/gallery/views/admin_maintenance_task.html.php        23  DIRTY $csrf
-modules/gallery/views/admin_maintenance_task.html.php        47  DIRTY $task->name
+modules/gallery/views/admin_maintenance_task.html.php        30  DIRTY $task->id
+modules/gallery/views/admin_maintenance_task.html.php        30  DIRTY $csrf
+modules/gallery/views/admin_maintenance_task.html.php        54  DIRTY $task->name
 modules/gallery/views/admin_modules.html.php                 19  DIRTY $i
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $data
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $module_name
-- 
cgit v1.2.3


From 19d89f94f9939bbd879d6c8ead4e802f592ec808 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 30 Jul 2009 09:57:24 -0700
Subject: Remove debug statements

---
 modules/gallery/tests/Item_Model_Test.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'modules/gallery/tests')

diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index a21cdc13..c2773097 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -142,17 +142,11 @@ class Item_Model_Test extends Unit_Test_Case {
   }
 
   public function save_original_values_test() {
-    print "START\n";
     $item = $this->create_random_item();
     $item->title = "ORIGINAL_VALUE";
     $item->save();
-
-    print "CHANGE\n";
     $item->title = "NEW_VALUE";
 
-    //printf("<pre>%s</pre>",print_r($item,1));flush();
-
-    print "COMPARE\n";
     $this->assert_same("ORIGINAL_VALUE", $item->original("title"));
     $this->assert_same("NEW_VALUE", $item->title);
   }
-- 
cgit v1.2.3