From 2e420522ece22942a9b3b6ee413ca0e1dfa76148 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Nov 2009 13:22:24 -0800
Subject: Preliminary work to cut over to Kohana 2.4 - Kohana::log() ->
 Kohana_Log::add() - Kohana::config_XXX -> Kohana_Config::instance()->XXX -
 Implement View::set_global in MY_View - Updated Cache_Database_Driver to
 latest APIs - ORM::$loaded -> ORM::loaded() - Updated item::viewable() to use
 K2.4 parenthesization

---
 modules/gallery/helpers/item.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 8f96c3d9..109fa6f8 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -156,13 +156,7 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        // Separate the first restriction from the rest to make it easier for us to formulate
-        // our where clause below
-        if (empty($view_restrictions)) {
-          $view_restrictions[0] = "items.view_$id";
-        } else {
-          $view_restrictions[1]["items.view_$id"] = access::ALLOW;
-        }
+        $view_restrictions[] = "items.view_$id";
       }
     }
     switch (count($view_restrictions)) {
@@ -170,14 +164,14 @@ class item_Core {
       break;
 
     case 1:
-      $model->where($view_restrictions[0], access::ALLOW);
+      $model->where($view_restrictions[0], "=", access::ALLOW);
       break;
 
     default:
-      $model->open_paren();
-      $model->where($view_restrictions[0], access::ALLOW);
-      $model->orwhere($view_restrictions[1]);
-      $model->close_paren();
+      $model
+        ->and_open()
+        ->or_where($view_restrictions, "=", access::ALLOW)
+        ->close();
       break;
     }
 
-- 
cgit v1.2.3


From 0121bfd5850bdc59bf0cd656c61c953421a85890 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Nov 2009 19:26:52 -0800
Subject: ORM::orderby -> ORM::order_by

---
 modules/comment/controllers/admin_comments.php     |  2 +-
 modules/comment/helpers/comment_block.php          |  2 +-
 modules/comment/helpers/comment_rss.php            |  2 +-
 modules/comment/helpers/comment_theme.php          |  2 +-
 .../controllers/admin_advanced_settings.php        |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  4 +--
 modules/gallery/helpers/access.php                 | 10 +++----
 modules/gallery/helpers/gallery_block.php          |  4 +--
 modules/gallery/helpers/gallery_rss.php            |  4 +--
 modules/gallery/helpers/graphics.php               |  2 +-
 modules/gallery/helpers/item.php                   |  2 +-
 modules/gallery/helpers/module.php                 |  2 +-
 modules/gallery/models/item.php                    | 32 +++++++++++-----------
 modules/server_add/controllers/server_add.php      |  2 +-
 modules/tag/controllers/admin_tags.php             |  2 +-
 modules/tag/controllers/tags.php                   |  2 +-
 modules/user/controllers/admin_users.php           |  4 +--
 17 files changed, 40 insertions(+), 40 deletions(-)

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

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 1a9f0e6a..039956d7 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -48,7 +48,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     $view->content->menu = $this->_menu($view->content->counts);
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
-      ->orderby("created", "DESC")
+      ->order_by("created", "DESC")
       ->where("state", $state)
       ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
       ->find_all();
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index 7cd5d429..ab86b90a 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -30,7 +30,7 @@ class comment_block_Core {
       $block->title = t("Recent comments");
       $block->content = new View("admin_block_recent_comments.html");
       $block->content->comments =
-        ORM::factory("comment")->orderby("created", "DESC")->limit(5)->find_all();
+        ORM::factory("comment")->order_by("created", "DESC")->limit(5)->find_all();
       break;
     }
 
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 3692a30d..d0bb7859 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -36,7 +36,7 @@ class comment_rss_Core {
     $comments = ORM::factory("comment")
       ->viewable()
       ->where("state", "published")
-      ->orderby("created", "DESC");
+      ->order_by("created", "DESC");
 
     if ($feed_id == "item") {
       $comments->where("item_id", $id);
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index af0e1ca4..2f12192b 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -39,7 +39,7 @@ class comment_theme_Core {
     $view->comments = ORM::factory("comment")
       ->where("item_id", $theme->item()->id)
       ->where("state", "published")
-      ->orderby("created", "ASC")
+      ->order_by("created", "ASC")
       ->find_all();
 
     $block->content = $view;
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183..c9de7e57 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,7 @@ class Admin_Advanced_Settings_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
-      ->orderby("module_name", "name")
+      ->order_by("module_name", "name")
       ->find_all();
     print $view;
   }
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index fe5059e7..3b896553 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view->content = new View("admin_maintenance.html");
     $view->content->task_definitions = task::get_definitions();
     $view->content->running_tasks = ORM::factory("task")
-      ->where("done", 0)->orderby("updated", "DESC")->find_all();
+      ->where("done", 0)->order_by("updated", "DESC")->find_all();
     $view->content->finished_tasks = ORM::factory("task")
-      ->where("done", 1)->orderby("updated", "DESC")->find_all();
+      ->where("done", 1)->order_by("updated", "DESC")->find_all();
     print $view;
   }
 
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 9d27181a..d0200a73 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -171,7 +171,7 @@ class access_Core {
       ->where("items.id <> $item->id")
       ->join("access_intents", "items.id", "access_intents.item_id")
       ->where("access_intents.view_$group->id", self::DENY)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->limit(1)
       ->find();
 
@@ -494,7 +494,7 @@ class access_Core {
         ->where("right_ptr >", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
         ->where("access_intents.$field", self::DENY)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -516,7 +516,7 @@ class access_Core {
       ->where("right_ptr <=", $item->right_ptr)
       ->where("type", "album")
       ->where("access_intents.$field IS NOT", self::INHERIT)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
       if ($row->$field == self::ALLOW) {
@@ -565,7 +565,7 @@ class access_Core {
         ->where("left_ptr <", $item->left_ptr)
         ->where("right_ptr >", $item->right_ptr)
         ->where("$field IS NOT", self::UNKNOWN)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -581,7 +581,7 @@ class access_Core {
       ->where("left_ptr >=", $item->left_ptr)
       ->where("right_ptr <=", $item->right_ptr)
       ->where("$field IS NOT", self::INHERIT)
-      ->orderby("level", "ASC")
+      ->order_by("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
       $value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b5c32ad2..d09f1c80 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -46,7 +46,7 @@ class gallery_block_Core {
       $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
-        ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
+        ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
@@ -54,7 +54,7 @@ class gallery_block_Core {
       $block->title = t("Log entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
-        ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
+        ->order_by(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
       break;
 
     case "stats":
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 155edfb5..e195be8d 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -30,13 +30,13 @@ class gallery_rss_Core {
       $feed->children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC")
+        ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC");
+        ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
       $feed->title = t("Recent updates");
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a78cadd0..aef09003 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -183,7 +183,7 @@ class graphics_Core {
       foreach (ORM::factory("graphics_rule")
                ->where("target", $target)
                ->where("active", true)
-               ->orderby("priority", "asc")
+               ->order_by("priority", "asc")
                ->find_all() as $rule) {
         $rules[] = (object)$rule->as_array();
       }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 109fa6f8..7496d368 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -142,7 +142,7 @@ class item_Core {
     // @todo: figure out a better way to bootstrap the weight.
     $result = Database::instance()
       ->select("weight")->from("items")
-      ->orderby("weight", "desc")->limit(1)
+      ->order_by("weight", "desc")->limit(1)
       ->get()->current();
     return ($result ? $result->weight : 0) + 1;
   }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e54a4352..b7e13b9a 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -364,7 +364,7 @@ class module_Core {
         foreach (Database::instance()
                  ->select("module_name", "name", "value")
                  ->from("vars")
-                 ->orderby("module_name", "name")
+                 ->order_by("module_name", "name")
                  ->get() as $row) {
           if ($row->module_name == "gallery" && $row->name == "_cache") {
             // This could happen if there's a race condition
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index bd1f9af5..1efac37f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -291,7 +291,7 @@ class Item_Model extends ORM_MPTT {
              ->where("left_ptr <=", $this->left_ptr)
              ->where("right_ptr >=", $this->right_ptr)
              ->where("id <>", 1)
-             ->orderby("left_ptr", "ASC")
+             ->order_by("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
       $names[] = rawurlencode($row->name);
@@ -460,7 +460,7 @@ class Item_Model extends ORM_MPTT {
                ->where("parent_id", $this->id)
                ->where($sort_column, $child->$sort_column)
                ->where($where)
-               ->orderby(array("id" => "ASC"))
+               ->order_by(array("id" => "ASC"))
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -475,10 +475,10 @@ class Item_Model extends ORM_MPTT {
       //
       // Reproduce the children() functionality here using Database directly to avoid loading the
       // whole ORM for each row.
-      $orderby = array($this->sort_column => $this->sort_order);
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
 
       $position = 0;
@@ -486,7 +486,7 @@ class Item_Model extends ORM_MPTT {
                ->from("items")
                ->where("parent_id", $this->id)
                ->where($where)
-               ->orderby($orderby)
+               ->order_by($order_by)
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -592,18 +592,18 @@ class Item_Model extends ORM_MPTT {
    * @param   integer  SQL limit
    * @param   integer  SQL offset
    * @param   array    additional where clauses
-   * @param   array    orderby
+   * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::children($limit, $offset, $where, $orderby);
+    return parent::children($limit, $offset, $where, $order_by);
   }
 
   /**
@@ -617,14 +617,14 @@ class Item_Model extends ORM_MPTT {
    * @param   array    additional where clauses
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function descendants($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::descendants($limit, $offset, $where, $orderby);
+    return parent::descendants($limit, $offset, $where, $order_by);
   }
 }
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 25961129..053a1891 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -199,7 +199,7 @@ class Server_Add_Controller extends Admin_Controller {
       $entries = ORM::factory("server_add_file")
         ->where("task_id", $task->id)
         ->where("item_id", null)
-        ->orderby("id", "ASC")
+        ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
       if ($entries->count() == 0) {
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 93b51814..aff44803 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -29,7 +29,7 @@ class Admin_Tags_Controller extends Admin_Controller {
     if ($filter) {
       $query->like("name", $filter);
     }
-    $view->content->tags = $query->orderby("name", "ASC")->find_all();
+    $view->content->tags = $query->order_by("name", "ASC")->find_all();
     print $view;
   }
 
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 9f9e45d9..dfa3a9b3 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -84,7 +84,7 @@ class Tags_Controller extends Controller {
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
       ->like("name", "{$tag_part}%", false)
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->limit($limit)
       ->find_all();
     foreach ($tag_list as $tag) {
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 619e6e18..ee65efd2 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,10 +22,10 @@ class Admin_Users_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
     $view->content->users = ORM::factory("user")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     $view->content->groups = ORM::factory("group")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     print $view;
   }
-- 
cgit v1.2.3


From 96b00d6cfe437e376d5547a10aa8d1cf7def8c13 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 21:14:54 -0800
Subject: Convert some more Database::instance() calls to db::build() form.

---
 modules/comment/helpers/comment_event.php     |  5 +-
 modules/gallery/helpers/item.php              |  4 +-
 modules/gallery/libraries/ORM_MPTT.php        | 90 +++++++++++++++++----------
 modules/gallery/models/item.php               |  6 +-
 modules/notification/helpers/notification.php |  4 +-
 modules/tag/helpers/tag.php                   |  4 +-
 6 files changed, 69 insertions(+), 44 deletions(-)

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

diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index cf5d0a60..c90f7663 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -62,12 +62,11 @@ class comment_event_Core {
   }
 
   static function item_index_data($item, $data) {
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("text")
              ->from("comments")
              ->where("item_id", "=", $item->id)
-             ->get()
-             ->as_array() as $row) {
+             ->execute() as $row) {
       $data[] = $row->text;
     }
   }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 7496d368..c3126435 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -140,10 +140,10 @@ class item_Core {
     // Guard against an empty result when we create the first item.  It's unfortunate that we
     // have to check this every time.
     // @todo: figure out a better way to bootstrap the weight.
-    $result = Database::instance()
+    $result = db::build()
       ->select("weight")->from("items")
       ->order_by("weight", "desc")->limit(1)
-      ->get()->current();
+      ->execute()->current();
     return ($result ? $result->weight : 0) + 1;
   }
 
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index a67f05be..0ec0a848 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -51,10 +51,16 @@ class ORM_MPTT_Core extends ORM {
 
     try {
       // Make a hole in the parent for this new item
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` + 2 WHERE `left_ptr` >= {$parent->right_ptr}");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` + 2 WHERE `right_ptr` >= {$parent->right_ptr}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + 2"))
+        ->where("left_ptr", ">=", $parent->right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` + 2"))
+        ->where("right_ptr", ">=", $parent->right_ptr)
+        ->execute();
       $parent->right_ptr += 2;
 
       // Insert this item into the hole
@@ -92,10 +98,16 @@ class ORM_MPTT_Core extends ORM {
 
     $this->lock();
     try {
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` - 2 WHERE `left_ptr` > {$this->right_ptr}");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` - 2 WHERE `right_ptr` > {$this->right_ptr}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` - 2"))
+        ->where("left_ptr", ">", $this->right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` - 2"))
+        ->where("right_ptr", ">", $this->right_ptr)
+        ->execute();
     } catch (Exception $e) {
       $this->unlock();
       throw $e;
@@ -239,23 +251,32 @@ class ORM_MPTT_Core extends ORM {
     try {
       if ($level_delta) {
         // Update the levels for the to-be-moved items
-        $this->db->query(
-          "UPDATE {{$this->table_name}} SET `level` = `level` + $level_delta" .
-          " WHERE `left_ptr` >= $original_left_ptr AND `right_ptr` <= $original_right_ptr");
+        $this->db_builder
+          ->update($this->table_name)
+          ->set("level", new Database_Expression("`level` + $level_delta"))
+          ->where("left_ptr", ">=", $original_left_ptr)
+          ->where("right_ptr", "<=", $original_right_ptr)
+          ->execute();
       }
 
       // Make a hole in the target for the move
-      $target->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` + $size_of_hole" .
-        " WHERE `left_ptr` >= $target_right_ptr");
-      $target->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` + $size_of_hole" .
-        " WHERE `right_ptr` >= $target_right_ptr");
+      $target->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + $size_of_hole"))
+        ->where("left_ptr", ">=", $target_right_ptr)
+        ->execute();
+      $target->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` + $size_of_hole"))
+        ->where("right_ptr", ">=", $target_right_ptr)
+        ->execute();
 
       // Change the parent.
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `parent_id` = {$target->id}" .
-        " WHERE `id` = {$this->id}");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("parent_id", $target->id)
+        ->where("id", "=", $this->id)
+        ->execute();
 
       // If the source is to the right of the target then we just adjusted its left_ptr and right_ptr above.
       $left_ptr = $original_left_ptr;
@@ -266,20 +287,25 @@ class ORM_MPTT_Core extends ORM {
       }
 
       $new_offset = $target->right_ptr - $left_ptr;
-      $this->db->query(
-        "UPDATE {{$this->table_name}}" .
-        "   SET `left_ptr` = `left_ptr` + $new_offset," .
-        "       `right_ptr` = `right_ptr` + $new_offset" .
-      " WHERE `left_ptr` >= $left_ptr" .
-        "   AND `right_ptr` <= $right_ptr");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` + $new_offset"))
+        ->set("right_ptr", new Database_Expression("`right_ptr` + $new_offset"))
+        ->where("left_ptr", ">=", $left_ptr)
+        ->where("right_ptr", "<=", $right_ptr)
+        ->execute();
 
       // Close the hole in the source's parent after the move
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `left_ptr` = `left_ptr` - $size_of_hole" .
-        " WHERE `left_ptr` > $right_ptr");
-      $this->db->query(
-        "UPDATE {{$this->table_name}} SET `right_ptr` = `right_ptr` - $size_of_hole" .
-        " WHERE `right_ptr` > $right_ptr");
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("left_ptr", new Database_Expression("`left_ptr` - $size_of_hole"))
+        ->where("left_ptr", ">", $right_ptr)
+        ->execute();
+      $this->db_builder
+        ->update($this->table_name)
+        ->set("right_ptr", new Database_Expression("`right_ptr` - $size_of_hole"))
+        ->where("right_ptr", ">", $right_ptr)
+        ->execute();
     } catch (Exception $e) {
       $this->unlock();
       throw $e;
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 16c57dbc..8a42cc1e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -285,14 +285,14 @@ class Item_Model extends ORM_MPTT {
   private function _build_relative_caches() {
     $names = array();
     $slugs = array();
-    foreach (Database::instance()
+    foreach (db::build()
              ->select(array("name", "slug"))
              ->from("items")
              ->where("left_ptr", "<=", $this->left_ptr)
              ->where("right_ptr", ">=", $this->right_ptr)
              ->where("id", "<>", 1)
              ->order_by("left_ptr", "ASC")
-             ->get() as $row) {
+             ->execute() as $row) {
       // Don't encode the names segment
       $names[] = rawurlencode($row->name);
       $slugs[] = rawurlencode($row->slug);
@@ -489,7 +489,7 @@ class Item_Model extends ORM_MPTT {
                ->where("parent_id", "=", $this->id)
                ->merge_where($where)
                ->order_by($order_by)
-               ->get() as $row) {
+               ->execute() as $row) {
         $position++;
         if ($row->id == $child->id) {
           break;
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 7e935614..31a56c1f 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -170,10 +170,10 @@ class notification {
   }
 
   static function send_pending_notifications() {
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("DISTINCT email")
              ->from("pending_notifications")
-             ->get() as $row) {
+             ->execute() as $row) {
       $email = $row->email;
       $result = ORM::factory("pending_notification")
         ->where("email", "=", $email)
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index c4c4ba15..3e8a0d20 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -89,12 +89,12 @@ class tag_Core {
    */
   static function item_tags($item) {
     $tags = array();
-    foreach (Database::instance()
+    foreach (db::build()
              ->select("name")
              ->from("tags")
              ->join("items_tags", "tags.id", "items_tags.tag_id", "left")
              ->where("items_tags.item_id", "=", $item->id)
-             ->get() as $row) {
+             ->execute() as $row) {
       $tags[] = $row->name;
     }
     return $tags;
-- 
cgit v1.2.3


From b9dadb77c3c75c6ba6ead293757df440976b3917 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Dec 2009 21:21:35 -0800
Subject: Get rid of unused _method param in the item edit form. Fix viewable()
 to properly OR view restrictions together.

---
 modules/gallery/helpers/item.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index c3126435..300a6942 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -127,7 +127,6 @@ class item_Core {
     $page_type = Input::instance()->get("page_type");
     $form = new Forge(
       "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete"));
-    $form->hidden("_method")->value("put");
     $group = $form->group("confirm_delete")->label(t("Confirm Deletion"));
     $group->submit("")->value(t("Delete"));
     return $form;
@@ -156,7 +155,7 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        $view_restrictions[] = "items.view_$id";
+        $view_restrictions["items.view_$id"] = access::ALLOW;
       }
     }
     switch (count($view_restrictions)) {
@@ -168,10 +167,7 @@ class item_Core {
       break;
 
     default:
-      $model
-        ->and_open()
-        ->or_where($view_restrictions, "=", access::ALLOW)
-        ->close();
+      $model->and_open()->or_where($view_restrictions)->close();
       break;
     }
 
-- 
cgit v1.2.3


From fb899c313c9cdf4d6b0529c53d2b647999ad94db Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Dec 2009 21:28:40 -0800
Subject: Further simplifications to viewable().  Stop trying to optimize for
 the case where we just have one restriction, it's unnecessary.

---
 modules/gallery/helpers/item.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 300a6942..b7be23cd 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -158,17 +158,9 @@ class item_Core {
         $view_restrictions["items.view_$id"] = access::ALLOW;
       }
     }
-    switch (count($view_restrictions)) {
-    case 0:
-      break;
 
-    case 1:
-      $model->where($view_restrictions[0], "=", access::ALLOW);
-      break;
-
-    default:
+    if (count($view_restrictions)) {
       $model->and_open()->or_where($view_restrictions)->close();
-      break;
     }
 
     return $model;
-- 
cgit v1.2.3


From c3a0f419c6f53fa93b47fa76f5afdc3696d64720 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 9 Dec 2009 09:50:57 -0800
Subject: Refactor the code to check for name or slug conflicts and to update
 code out of {Albums|Photos|Movies)_Controller and into the item helper so we
 can reuse it from the rest put handler.

---
 modules/gallery/controllers/albums.php | 42 +++++++++++++------------------
 modules/gallery/controllers/movies.php | 38 ++++++++++++----------------
 modules/gallery/controllers/photos.php | 38 ++++++++++++----------------
 modules/gallery/helpers/item.php       | 45 ++++++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 71 deletions(-)

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

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 3c1a0adf..feaea76d 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -131,40 +131,32 @@ class Albums_Controller extends Items_Controller {
           $form->edit_item->dirname->value != $album->name ||
           $form->edit_item->slug->value != $album->slug) {
         // Make sure that there's not a conflict
-        if ($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)
-            ->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;
+        $errors = item::check_for_conflicts(
+          $album, $form->edit_item->dirname->value, $form->edit_item->slug->value);
+
+        if (!empty($errors["name_conflict"])) {
+          $form->edit_item->dirname->add_error("name_conflict", 1);
+        }
+        if (!empty($errors["slug_conflict"])) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
         }
+        $valid = empty($errors);
       }
     }
 
     if ($valid) {
       $watching_album = $album->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
 
-      $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;
+      $new_values = array("title" => $form->edit_item->title->value,
+                          "description" => $form->edit_item->description->value,
+                          "sort_column" => $form->edit_item->sort_order->column->value,
+                          "sort_order" => $form->edit_item->sort_order->direction->value,
+                          "slug" => $form->edit_item->slug->value);
       if ($album->id != 1) {
-        $album->rename($form->edit_item->dirname->value);
+        $new_values["name"] = $form->edit_item->dirname->value;
       }
-      $album->slug = $form->edit_item->slug->value;
-      $album->save();
+      item::update($album, $new_values);
+
       module::event("item_edit_form_completed", $album, $form);
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 575b2b60..4e0916b3 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -76,34 +76,26 @@ class Movies_Controller extends Items_Controller {
       if ($form->edit_item->filename->value != $movie->name ||
           $form->edit_item->slug->value != $movie->slug) {
         // Make sure that there's not a name or slug conflict
-        if ($row = Database::instance()
-            ->select(array("name", "slug"))
-            ->from("items")
-            ->where("parent_id", $movie->parent_id)
-            ->where("id <>", $movie->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;
+        $errors = item::check_for_conflicts(
+          $movie, $form->edit_item->filename->value, $form->edit_item->slug->value);
+
+        if (!empty($errors["name_conflict"])) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
+        }
+        if (!empty($errors["slug_conflict"])) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
         }
+        $valid = empty($errors);
       }
     }
 
     if ($valid) {
-      $movie->title = $form->edit_item->title->value;
-      $movie->description = $form->edit_item->description->value;
-      $movie->slug = $form->edit_item->slug->value;
-      $movie->rename($form->edit_item->filename->value);
-      $movie->save();
+      $new_values = array("title" => $form->edit_item->title->value,
+                          "description" => $form->edit_item->description->value,
+                          "name" => $form->edit_item->filename->value,
+                          "slug" => $form->edit_item->slug->value);
+      item::update($movie, $new_values);
+
       module::event("item_edit_form_completed", $movie, $form);
 
       log::success("content", "Updated movie", "<a href=\"{$movie->url()}\">view</a>");
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index ba4cfb83..f2c0f5dd 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -76,36 +76,28 @@ class Photos_Controller extends Items_Controller {
       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
-        if ($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;
+        $errors = item::check_for_conflicts(
+          $photo, $form->edit_item->filename->value, $form->edit_item->slug->value);
+
+        if (!empty($errors["name_conflict"])) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
+        }
+        if (!empty($errors["slug_conflict"])) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
         }
+        $valid = empty($errors);
       }
     }
 
     if ($valid) {
       $watching_album = $photo->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
 
-      $photo->title = $form->edit_item->title->value;
-      $photo->description = $form->edit_item->description->value;
-      $photo->slug = $form->edit_item->slug->value;
-      $photo->rename($form->edit_item->filename->value);
-      $photo->save();
+      $new_values = array("title" => $form->edit_item->title->value,
+                          "description" => $form->edit_item->description->value,
+                          "name" => $form->edit_item->filename->value,
+                          "slug" => $form->edit_item->slug->value);
+      item::update($photo, $new_values);
+
       module::event("item_edit_form_completed", $photo, $form);
 
       log::success("content", "Updated photo", "<a href=\"{$photo->url()}\">view</a>");
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index f8e6534e..6348c256 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -96,6 +96,51 @@ class item_Core {
     }
   }
 
+
+  static function update($item, $fields) {
+    $dirty = false;
+    if ($item->id != 1 && !empty($fields["name"]) && $fields["name"] != $item->name) {
+      $item->rename($fields["name"]);
+      unset($fields["name"]);
+      $dirty = true;
+    }
+    foreach ($fields as $field => $value) {
+      if ($value !== $item->$field) {
+        $item->$field = $value;
+        $dirty = true;
+      }
+    }
+
+    if ($dirty) {
+      $item->save();
+    }
+  }
+
+  static function check_for_conflicts($item, $new_name, $new_slug) {
+    $errors = array();
+
+    if ($row = Database::instance()
+        ->select(array("name", "slug"))
+        ->from("items")
+        ->where("parent_id", $item->parent_id)
+        ->where("id <>", $item->id)
+        ->open_paren()
+        ->where("name", $new_name)
+        ->orwhere("slug", $new_slug)
+        ->close_paren()
+        ->get()
+        ->current()) {
+      if ($row->name == $new_name) {
+        $errors["name_conflict"] = 1;
+      }
+      if ($row->slug == $new_slug) {
+        $errors["slug_conflict"] = 1;
+      }
+    }
+
+    return $errors;
+  }
+
   /**
    * Sanitize a filename into something presentable as an item title
    * @param string $filename
-- 
cgit v1.2.3


From 0650109d4bb5442cd77fcda61745dab67a632836 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 22 Dec 2009 13:50:52 -0800
Subject: Add merge_or_where() to MY_Datatabase_Builder and use that instead of
 or_where() for compatibility and convenience.  Caught by failing unit tests.

---
 modules/gallery/helpers/item.php                          |  4 ++--
 modules/kohana23_compat/libraries/MY_Database_Builder.php | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index b7be23cd..f6181f8a 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -155,12 +155,12 @@ class item_Core {
     $view_restrictions = array();
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
-        $view_restrictions["items.view_$id"] = access::ALLOW;
+        $view_restrictions[] = array("items.view_$id", "=", access::ALLOW);
       }
     }
 
     if (count($view_restrictions)) {
-      $model->and_open()->or_where($view_restrictions)->close();
+      $model->and_open()->merge_or_where($view_restrictions)->close();
     }
 
     return $model;
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 54a10860..c82b6ac4 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -29,6 +29,17 @@ class Database_Builder extends Database_Builder_Core {
     return $this;
   }
 
+  /**
+   * Merge in a series of where clause tuples and call or_where() on each one.
+   * @chainable
+   */
+  public function merge_or_where($tuples) {
+    foreach ($tuples as $tuple) {
+      $this->or_where($tuple[0], $tuple[1], $tuple[2]);
+    }
+    return $this;
+  }
+
   public function compile() {
     return parent::compile();
   }
-- 
cgit v1.2.3


From 07e83718a0cd1bcef1f0a0546ffcb7cb6a1735ae Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 26 Dec 2009 11:26:44 -0800
Subject: Forgot to commit local changes to item helper for K2.4

---
 modules/gallery/helpers/item.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index e8119027..c620ba95 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -119,16 +119,16 @@ class item_Core {
   static function check_for_conflicts($item, $new_name, $new_slug) {
     $errors = array();
 
-    if ($row = Database::instance()
+    if ($row = db::build()
         ->select(array("name", "slug"))
         ->from("items")
         ->where("parent_id", $item->parent_id)
         ->where("id <>", $item->id)
-        ->open_paren()
+        ->and_open()
         ->where("name", $new_name)
         ->orwhere("slug", $new_slug)
-        ->close_paren()
-        ->get()
+        ->close()
+        ->execute()
         ->current()) {
       if ($row->name == $new_name) {
         $errors["name_conflict"] = 1;
-- 
cgit v1.2.3


From bccb6fc02146fb07cd1b472a90092e78e2259e91 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 27 Dec 2009 08:32:12 -0800
Subject: Clean up validation the check for duplicate names or slugs, finish
 converting the rest API to Kohana 2.4

---
 modules/gallery/helpers/gallery_rest.php           | 93 ++++++++++++++--------
 modules/gallery/helpers/item.php                   |  8 +-
 modules/gallery/tests/Gallery_Rest_Helper_Test.php |  8 +-
 modules/image_block/helpers/image_block_rest.php   | 12 +--
 modules/rest/controllers/rest.php                  | 27 ++++---
 modules/rest/helpers/rest.php                      |  2 +-
 modules/rest/tests/Rest_Controller_Test.php        |  2 +-
 modules/tag/helpers/tag_rest.php                   | 62 ++++++++-------
 modules/tag/models/tag.php                         |  4 +-
 modules/tag/tests/Tag_Rest_Helper_Test.php         |  4 +-
 10 files changed, 129 insertions(+), 93 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 227a6f02..1d790d8c 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -22,11 +22,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -62,11 +62,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -75,12 +75,13 @@ class gallery_rest_Core {
     }
 
     // Validate the request data
-    $new_values = gallery_rest::_validate($request, $item);
+    $new_values = gallery_rest::_validate($request, $item->parent_id, $item->id);
     $errors = $new_values->errors();
     if (empty($errors)) {
       item::update($item, $new_values->as_array());
 
-      log::success("content", "Updated $item->type", "<a href=\"{$item->type}s/$item->id\">view</a>");
+      log::success("content", "Updated $item->type",
+                   "<a href=\"{$item->type}s/$item->id\">view</a>");
 
       return rest::success();
     } else {
@@ -94,15 +95,15 @@ class gallery_rest_Core {
     }
     $path = implode("/", $request->arguments);
 
-    $components = explode("/", $path);
+    $components = $request->arguments;
     $name = urldecode(array_pop($components));
 
     $parent = ORM::factory("item")
-      ->where("relative_url_cache", implode("/", $components))
+      ->where("relative_url_cache", "=", implode("/", $components))
       ->viewable()
       ->find();
 
-    if (!$parent->loaded) {
+    if (!$parent->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -111,7 +112,7 @@ class gallery_rest_Core {
     }
 
     // Validate the request data
-    $new_values = gallery_rest::_validate($request);
+    $new_values = gallery_rest::_validate($request, $parent->id);
     $errors = $new_values->errors();
     if (!empty($errors)) {
       return rest::validation_error($errors);
@@ -121,10 +122,10 @@ class gallery_rest_Core {
       $new_item = album::create(
         $parent,
         $name,
-        empty($request->title) ? $name : $request->title,
-        empty($request->description) ? null : $request->description,
+        empty($new_values["title"]) ? $name : $new_values["title"],
+        empty($new_values["description"]) ? null : $new_values["description"],
         identity::active_user()->id,
-        empty($request->slug) ? $name : $request->slug);
+        empty($new_values["slug"]) ? $name : $new_values["slug"]);
       $log_message = t("Added an album");
     } else {
       $temp_filename = upload::save("image");
@@ -153,11 +154,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::success();
     }
 
@@ -193,7 +194,7 @@ class gallery_rest_Core {
                           "path" => $child->relative_url(),
                           "thumb_url" => $child->thumb_url(true),
                           "thumb_dimensions" => array("width" => $child->thumb_width,
-                                                     "height" => $child->thumb_height),
+                                                      "height" => $child->thumb_height),
                           "has_thumb" => $child->has_thumb(),
                           "title" => $child->title);
     }
@@ -201,38 +202,40 @@ class gallery_rest_Core {
     return $children;
   }
 
-  private static function _validate($request, $item=null) {
+  private static function _validate($request, $parent_id, $item_id=0) {
     $new_values = array();
-    $fields = array("title", "description", "name", "slug", "image");
-    if (empty($item)) {
-      $item = ORM::factory("item");
-      $item->id = 0;
-    }
-    if ($item->id == 1) {
+    $fields = array("name" => "length[0,255]",
+                    "title" => "required|length[0,255]",
+                    "description" => "length[0,65535]",
+                    "slug" => "required|length[0,255]");
+    if ($item_id == 1) {
       unset($request["name"]);
       unset($request["slug"]);
     }
-    foreach ($fields as $field) {
+    foreach (array_keys($fields) as $field) {
       if (isset($request->$field)) {
         $new_values[$field] = $request->$field;
       } else if (isset($item->$field)) {
         $new_values[$field] = $item->$field;
       }
     }
-
-    $new_values = new Validation($new_values);
-    foreach ($item->rules as $field => $rules) {
-      foreach (explode("|", $rules) as $rule) {
-        $new_values->add_rules($field, $rule);
-      }
+    if (!empty($request->image)) {
+      $new_values["image"] = $request->image;
     }
+
+    $new_values = Validation::factory($new_values)
+      ->add_rules("name", "length[0,255]")
+      ->add_rules("title", "length[0,255]")
+      ->add_rules("description", "length[0,65535]")
+      ->add_rules("slug", "length[0,255]");
     if (isset($new_values["image"])) {
       $new_values->add_rules(
         "image", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
     }
 
-    if ($new_values->validate() && $item->id != 1) {
-      $errors = item::check_for_conflicts($item, $new_values["name"], $new_values["slug"]);
+    if ($new_values->validate() && $item_id != 1) {
+      $errors = gallery_rest::_check_for_conflicts($parent_id, $item_id,
+                                                   $new_values["name"], $new_values["slug"]);
       if (!empty($errors)) {
         !empty($errors["name_conflict"]) OR $new_values->add_error("name", "Duplicate Name");
         !empty($errors["slug_conflict"]) OR
@@ -242,4 +245,30 @@ class gallery_rest_Core {
 
     return $new_values;
   }
+
+  private static function _check_for_conflicts($parent_id, $item_id, $new_name, $new_slug) {
+    $errors = array();
+
+    if ($row = db::build()
+        ->select(array("name", "slug"))
+        ->from("items")
+        ->where("parent_id", "=", $parent_id)
+        ->where("id", "<>", $item_id)
+        ->and_open()
+        ->where("name", "=", $new_name)
+        ->or_where("slug", "=", $new_slug)
+        ->close()
+        ->execute()
+        ->current()) {
+      if ($row->name == $new_name) {
+        $errors["name_conflict"] = 1;
+      }
+      if ($row->slug == $new_slug) {
+        $errors["slug_conflict"] = 1;
+      }
+    }
+
+    return $errors;
+  }
+
 }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index c620ba95..fc390e70 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -122,11 +122,11 @@ class item_Core {
     if ($row = db::build()
         ->select(array("name", "slug"))
         ->from("items")
-        ->where("parent_id", $item->parent_id)
-        ->where("id <>", $item->id)
+        ->where("parent_id", "=", $item->parent_id)
+        ->where("id", "<>", $item->id)
         ->and_open()
-        ->where("name", $new_name)
-        ->orwhere("slug", $new_slug)
+        ->where("name", "=", $new_name)
+        ->or_where("slug", "=", $new_slug)
         ->close()
         ->execute()
         ->current()) {
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 14c73248..f36f6aaf 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -208,7 +208,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                             "parent_path" => $this->_album->relative_url()))),
                         gallery_rest::delete($request));
     $this->_child->reload();
-    $this->assert_false($this->_child->loaded);
+    $this->assert_false($this->_child->loaded());
   }
 
   public function gallery_rest_delete_photo_test() {
@@ -222,7 +222,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                             "parent_path" => $this->_album->relative_url()))),
                         gallery_rest::delete($request));
     $this->_sibling->reload();
-    $this->assert_false($this->_sibling->loaded);
+    $this->assert_false($this->_sibling->loaded());
   }
 
   public function gallery_rest_post_album_test() {
@@ -235,9 +235,9 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $this->assert_equal(json_encode(array("status" => "OK", "path" => $new_path)),
                         gallery_rest::post($request));
     $album = ORM::factory("item")
-      ->where("relative_url_cache", $new_path)
+      ->where("relative_url_cache", "=", $new_path)
       ->find();
-    $this->assert_true($album->loaded);
+    $this->assert_true($album->loaded());
     $this->assert_equal("new child", $album->slug);
   }
 }
diff --git a/modules/image_block/helpers/image_block_rest.php b/modules/image_block/helpers/image_block_rest.php
index 45f849b1..7afd974c 100644
--- a/modules/image_block/helpers/image_block_rest.php
+++ b/modules/image_block/helpers/image_block_rest.php
@@ -26,18 +26,18 @@ class image_block_rest_Core {
 
       $items = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
-        ->where("rand_key < ", $random)
-        ->orderby(array("rand_key" => "DESC"))
+        ->where("type", "!=", "album")
+        ->where("rand_key", "<", $random)
+        ->order_by(array("rand_key" => "DESC"))
         ->find_all(1);
 
       if ($items->count() == 0) {
         // Try once more.  If this fails, just ditch the block altogether
         $items = ORM::factory("item")
           ->viewable()
-          ->where("type !=", "album")
-          ->where("rand_key >= ", $random)
-          ->orderby(array("rand_key" => "DESC"))
+          ->where("type", "!=", "album")
+          ->where("rand_key",  ">= ", $random)
+          ->order_by(array("rand_key" => "DESC"))
           ->find_all(1);
       }
       break;
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 1289d62b..6715bc15 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -18,7 +18,7 @@
  */
 class Rest_Controller extends Controller {
   public function access_key() {
-    $request = (object)$this->input->get();
+    $request = (object)Input::instance()->get();
     if (empty($request->user) || empty($request->password)) {
       print rest::forbidden("No user or password supplied");
       return;
@@ -36,13 +36,13 @@ class Rest_Controller extends Controller {
     }
 
     $key = ORM::factory("user_access_token")
-      ->where("user_id", $user->id)
+      ->where("user_id", "=", $user->id)
       ->find();
-    if (!$key->loaded) {
+    if (!$key->loaded()) {
       $key->user_id = $user->id;
       $key->access_key = md5($user->name . rand());
       $key->save();
-      Kohana::log("alert",  Kohana::debug($key->as_array()));
+      Kohana_Log::add("alert",  Kohana::debug($key->as_array()));
     }
     print rest::success(array("token" => $key->access_key));
   }
@@ -67,22 +67,23 @@ class Rest_Controller extends Controller {
   }
 
   private function _normalize_request($args=array()) {
-    $method = strtolower($this->input->server("REQUEST_METHOD"));
+    $input = Input::instance();
+    $method = strtolower($input->server("REQUEST_METHOD"));
     $request = new stdClass();
-    foreach (array_keys($this->input->get()) as $key) {
-      $request->$key = $this->input->get($key);
+    foreach (array_keys($input->get()) as $key) {
+      $request->$key = $input->get($key);
     }
     if ($method != "get") {
-      foreach (array_keys($this->input->post()) as $key) {
-        $request->$key = $this->input->post($key);
+      foreach (array_keys($input->post()) as $key) {
+        $request->$key = $input->post($key);
       }
       foreach (array_keys($_FILES) as $key) {
         $request->$key = $_FILES[$key];
       }
     }
 
-    $request->method = strtolower($this->input->server("HTTP_X_GALLERY_REQUEST_METHOD", $method));
-    $request->access_token = $this->input->server("HTTP_X_GALLERY_REQUEST_KEY");
+    $request->method = strtolower($input->server("HTTP_X_GALLERY_REQUEST_METHOD", $method));
+    $request->access_token = $input->server("HTTP_X_GALLERY_REQUEST_KEY");
     $request->arguments = $args;  // Let the rest handler figure out what the arguments mean
 
     return $request;
@@ -93,10 +94,10 @@ class Rest_Controller extends Controller {
       $user = identity::guest();
     } else {
       $key = ORM::factory("user_access_token")
-        ->where("access_key", $access_token)
+        ->where("access_key", "=", $access_token)
         ->find();
 
-      if ($key->loaded) {
+      if ($key->loaded()) {
         $user = identity::lookup_user($key->user_id);
         if (empty($user)) {
           print rest::forbidden("User not found: {$key->user_id}");
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index ad6ca7c7..276ff0c2 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -88,7 +88,7 @@ class rest_Core {
 
   private static function _format_failure_response($message, $log_message) {
     if (!empty($log_message)) {
-      Kohana::log("info", $log_message);
+      Kohana_Log::add("info", $log_message);
     }
     // We don't need to save the session for this request
     Session::abort_save();
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index b7fbd5a3..6bebc47d 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -173,7 +173,7 @@ class rest_rest {
   static function get($request) {
     self::$request = $request;
     $item = ORM::factory("item")
-      ->where("relative_url_cache", implode("/", $request->arguments))
+      ->where("relative_url_cache", "=", implode("/", $request->arguments))
       ->find();
     $response["path"] = $item->relative_url();
     $response["title"] = $item->title;
diff --git a/modules/tag/helpers/tag_rest.php b/modules/tag/helpers/tag_rest.php
index d62c0231..cca9a88b 100644
--- a/modules/tag/helpers/tag_rest.php
+++ b/modules/tag/helpers/tag_rest.php
@@ -18,40 +18,44 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class tag_rest_Core {
+  // If no arguments just return all the tags.  If 2 or more then it is a path then
+  // return the tags for that item.  But if its only 1, then is it a path or a tag?
+  // Assume a tag first, if nothing is found then try finding the item.
   static function get($request) {
-    if (empty($request->arguments)) {
+    $resources = array();
+    switch (count($request->arguments)) {
+    case 0:
       $tags = ORM::factory("tag")
         ->select("name", "count")
-        ->orderby("count", "DESC");
+        ->order_by("count", "DESC");
       if (!empty($request->limit)) {
         $tags->limit($request->limit);
       }
       if (!empty($request->offset)) {
         $tags->offset($request->offset);
       }
-      $response = array("tags" => array());
+      $resources = array("tags" => array());
       foreach ($tags->find_all() as $row) {
-        $response["tags"][] = array("name" => $row->name, "count" => $row->count);
+        $resources["tags"][] = array("name" => $row->name, "count" => $row->count);
       }
-    } else {
-      $path = implode("/", $request->arguments);
-      if (strpos($path, ",") === false) {
-        $item = ORM::factory("item")
-          ->where("relative_url_cache", $path)
-          ->viewable()
-          ->find();
-        // If we didn't find it and there was only one argument, retry as a tag not a path
-        if ($item->loaded || count($request->arguments) != 1) {
-          $response = array("tags" => $item->loaded ? tag::item_tags($item) : array());
-        } else {
-          $response = array("resources" => tag_rest::_get_items($request));
-        }
-      } else {
-        $response = array("resources" => tag_rest::_get_items($request));
+      break;
+    case 1:
+      $resources = tag_rest::_get_items($request);
+      if (!empty($resources)) {
+        $resources = array("resources" =>$resources);
+        break;
+      }
+    default:
+      $item = ORM::factory("item")
+        ->where("relative_url_cache", "=", implode("/", $request->arguments))
+        ->viewable()
+        ->find();
+      if ($item->loaded()) {
+        $resources = array("tags" => tag::item_tags($item));
       }
     }
 
-    return rest::success($response);
+    return rest::success($resources);
   }
 
   static function post($request) {
@@ -62,10 +66,10 @@ class tag_rest_Core {
     $tags = explode(",", $request->arguments[0]);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -87,9 +91,9 @@ class tag_rest_Core {
     $name = $request->arguments[0];
 
     $tag = ORM::factory("tag")
-      ->where("name", $name)
+      ->where("name", "=", $name)
       ->find();
-    if (!$tag->loaded) {
+    if (!$tag->loaded()) {
       return rest::not_found("Tag: {$name} not found.");
     }
 
@@ -108,13 +112,13 @@ class tag_rest_Core {
       $tag_list = ORM::factory("tag")
         ->join("items_tags", "tags.id", "items_tags.tag_id")
         ->join("items", "items.id", "items_tags.item_id")
-        ->in("tags.name", $tags)
-        ->where("relative_url_cache", $request->path)
+        ->where("tags.name", "IN",  $tags)
+        ->where("relative_url_cache", "=", $request->path)
         ->viewable()
         ->find_all();
     } else {
       $tag_list = ORM::factory("tag")
-        ->in("name", $tags)
+        ->where("name", "IN", $tags)
         ->find_all();
     }
 
@@ -129,10 +133,10 @@ class tag_rest_Core {
   private static function _get_items($request) {
     $tags = explode(",", $request->arguments[0]);
     $items = ORM::factory("item")
-      ->select("distinct *")
+      ->select_distinct("*")
       ->join("items_tags", "items.id", "items_tags.item_id")
       ->join("tags", "tags.id", "items_tags.tag_id")
-      ->in("tags.name", $tags);
+      ->where("tags.name", "IN",  $tags);
     if (!empty($request->limit)) {
       $items->limit($request->limit);
     }
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index b2ce9eda..d0d2117c 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -108,7 +108,9 @@ class Tag_Model extends ORM {
     $result = parent::delete();
 
     if ($related_item_ids) {
-      foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+      foreach (ORM::factory("item")
+               ->where("id", "IN", array_keys($related_item_ids))
+               ->find_all() as $item) {
         module::event("item_related_update", $item);
       }
     }
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 1c550366..6b1c9a33 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -210,11 +210,11 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
     $this->assert_equal(json_encode(array("status" => "OK")), tag_rest::delete($request));
 
     $request = (object)array("arguments" => array("T1,P1"));
-    $this->assert_equal(json_encode(array("status" => "OK", "resources" => array())),
+    $this->assert_equal(json_encode(array("status" => "OK")),
                         tag_rest::get($request));
   }
 
-  public function tag_rest_delete_tag_from_item_test() {
+  public function tag_rest_delete_tagc_from_item_test() {
     $request = (object)array("arguments" => array("T1,P1"),
                              $this->_photo->relative_url());
 
-- 
cgit v1.2.3


From d6ddbd1a31600543c4d8dec406ef73b0e8b84dde Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Dec 2009 16:12:32 -0800
Subject: Rollback the refactoring of the update into a helper method. Also
 remove the refactoring for check for commits

---
 modules/gallery/controllers/albums.php | 42 ++++++++++++++++++-------------
 modules/gallery/controllers/movies.php | 38 ++++++++++++++++------------
 modules/gallery/controllers/photos.php | 41 +++++++++++++++++++------------
 modules/gallery/helpers/item.php       | 45 ----------------------------------
 4 files changed, 73 insertions(+), 93 deletions(-)

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

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index fde5c02d..2134a419 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -134,32 +134,40 @@ class Albums_Controller extends Items_Controller {
           $form->edit_item->dirname->value != $album->name ||
           $form->edit_item->slug->value != $album->slug) {
         // Make sure that there's not a conflict
-        $errors = item::check_for_conflicts(
-          $album, $form->edit_item->dirname->value, $form->edit_item->slug->value);
-
-        if (!empty($errors["name_conflict"])) {
-          $form->edit_item->dirname->add_error("name_conflict", 1);
-        }
-        if (!empty($errors["slug_conflict"])) {
-          $form->edit_item->slug->add_error("slug_conflict", 1);
+        if ($row = db::build()
+            ->select(array("name", "slug"))
+            ->from("items")
+            ->where("parent_id", "=", $album->parent_id)
+            ->where("id", "<>", $album->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->dirname->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
+            ->close()
+            ->execute()
+            ->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;
         }
-        $valid = empty($errors);
       }
     }
 
     if ($valid) {
       $watching_album = $album->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
 
-      $new_values = array("title" => $form->edit_item->title->value,
-                          "description" => $form->edit_item->description->value,
-                          "sort_column" => $form->edit_item->sort_order->column->value,
-                          "sort_order" => $form->edit_item->sort_order->direction->value,
-                          "slug" => $form->edit_item->slug->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) {
-        $new_values["name"] = $form->edit_item->dirname->value;
+        $album->rename($form->edit_item->dirname->value);
       }
-      item::update($album, $new_values);
-
+      $album->slug = $form->edit_item->slug->value;
+      $album->save();
       module::event("item_edit_form_completed", $album, $form);
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 2d429910..b5785ecf 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -76,26 +76,34 @@ class Movies_Controller extends Items_Controller {
       if ($form->edit_item->filename->value != $movie->name ||
           $form->edit_item->slug->value != $movie->slug) {
         // Make sure that there's not a name or slug conflict
-        $errors = item::check_for_conflicts(
-          $movie, $form->edit_item->filename->value, $form->edit_item->slug->value);
-
-        if (!empty($errors["name_conflict"])) {
-          $form->edit_item->filename->add_error("name_conflict", 1);
-        }
-        if (!empty($errors["slug_conflict"])) {
-          $form->edit_item->slug->add_error("slug_conflict", 1);
+        if ($row = db::build()
+            ->select(array("name", "slug"))
+            ->from("items")
+            ->where("parent_id", "=", $movie->parent_id)
+            ->where("id", "<>", $movie->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
+            ->close()
+            ->execute()
+            ->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;
         }
-        $valid = empty($errors);
       }
     }
 
     if ($valid) {
-      $new_values = array("title" => $form->edit_item->title->value,
-                          "description" => $form->edit_item->description->value,
-                          "name" => $form->edit_item->filename->value,
-                          "slug" => $form->edit_item->slug->value);
-      item::update($movie, $new_values);
-
+      $movie->title = $form->edit_item->title->value;
+      $movie->description = $form->edit_item->description->value;
+      $movie->slug = $form->edit_item->slug->value;
+      $movie->rename($form->edit_item->filename->value);
+      $movie->save();
       module::event("item_edit_form_completed", $movie, $form);
 
       log::success("content", "Updated movie", "<a href=\"{$movie->url()}\">view</a>");
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 7c2c266c..ced9da2f 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -76,33 +76,42 @@ class Photos_Controller extends Items_Controller {
       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
-        $errors = item::check_for_conflicts(
-          $photo, $form->edit_item->filename->value, $form->edit_item->slug->value);
-
-        if (!empty($errors["name_conflict"])) {
-          $form->edit_item->filename->add_error("name_conflict", 1);
-        }
-        if (!empty($errors["slug_conflict"])) {
-          $form->edit_item->slug->add_error("slug_conflict", 1);
+        if ($row = db::build()
+            ->select(array("name", "slug"))
+            ->from("items")
+            ->where("parent_id", "=", $photo->parent_id)
+            ->where("id", "<>", $photo->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->or_where("slug", "=", $form->edit_item->slug->value)
+            ->close()
+            ->execute()
+            ->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;
         }
-        $valid = empty($errors);
       }
     }
 
     if ($valid) {
       $watching_album = $photo->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
 
-      $new_values = array("title" => $form->edit_item->title->value,
-                          "description" => $form->edit_item->description->value,
-                          "name" => $form->edit_item->filename->value,
-                          "slug" => $form->edit_item->slug->value);
-      item::update($photo, $new_values);
-
+      $photo->title = $form->edit_item->title->value;
+      $photo->description = $form->edit_item->description->value;
+      $photo->slug = $form->edit_item->slug->value;
+      $photo->rename($form->edit_item->filename->value);
+      $photo->save();
       module::event("item_edit_form_completed", $photo, $form);
 
       log::success("content", "Updated photo", "<a href=\"{$photo->url()}\">view</a>");
       message::success(
-        t("Saved photo %photo_title", array("photo_title" => html::purify($photo->title))));
+                       t("Saved photo %photo_title",
+                         array("photo_title" => html::purify($photo->title))));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index fc390e70..f6181f8a 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -96,51 +96,6 @@ class item_Core {
     }
   }
 
-
-  static function update($item, $fields) {
-    $dirty = false;
-    if ($item->id != 1 && !empty($fields["name"]) && $fields["name"] != $item->name) {
-      $item->rename($fields["name"]);
-      unset($fields["name"]);
-      $dirty = true;
-    }
-    foreach ($fields as $field => $value) {
-      if ($value !== $item->$field) {
-        $item->$field = $value;
-        $dirty = true;
-      }
-    }
-
-    if ($dirty) {
-      $item->save();
-    }
-  }
-
-  static function check_for_conflicts($item, $new_name, $new_slug) {
-    $errors = array();
-
-    if ($row = db::build()
-        ->select(array("name", "slug"))
-        ->from("items")
-        ->where("parent_id", "=", $item->parent_id)
-        ->where("id", "<>", $item->id)
-        ->and_open()
-        ->where("name", "=", $new_name)
-        ->or_where("slug", "=", $new_slug)
-        ->close()
-        ->execute()
-        ->current()) {
-      if ($row->name == $new_name) {
-        $errors["name_conflict"] = 1;
-      }
-      if ($row->slug == $new_slug) {
-        $errors["slug_conflict"] = 1;
-      }
-    }
-
-    return $errors;
-  }
-
   /**
    * Sanitize a filename into something presentable as an item title
    * @param string $filename
-- 
cgit v1.2.3