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/g2_import/helpers/g2_import.php      | 14 +++++++-------
 modules/g2_import/helpers/g2_import_task.php |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 202a0e92..1e835a59 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -458,7 +458,7 @@ class g2_import_Core {
     switch ($g2_type) {
     case "GalleryPhotoItem":
       if (!in_array($g2_item->getMimeType(), array("image/jpeg", "image/gif", "image/png"))) {
-        Kohana::log("alert", "$g2_path is an unsupported image type; using a placeholder gif");
+        Kohana_Log::add("alert", "$g2_path is an unsupported image type; using a placeholder gif");
         $message[] = t("'%path' is an unsupported image type, using a placeholder",
                      array("path" => $g2_path));
         $g2_path = MODPATH . "g2_import/data/broken-image.gif";
@@ -473,7 +473,7 @@ class g2_import_Core {
           self::_decode_html_special_chars(self::extract_description($g2_item)),
           self::map($g2_item->getOwnerId()));
       } catch (Exception $e) {
-        Kohana::log(
+        Kohana_Log::add(
           "alert", "Corrupt image $g2_path\n" . $e->__toString());
         $message[] = t("Corrupt image '%path'", array("path" => $g2_path));
         $message[] = $e->__toString();
@@ -493,13 +493,13 @@ class g2_import_Core {
             self::_decode_html_special_chars(self::extract_description($g2_item)),
             self::map($g2_item->getOwnerId()));
         } catch (Exception $e) {
-          Kohana::log("alert", "Corrupt movie $g2_path\n" . $e->__toString());
+          Kohana_Log::add("alert", "Corrupt movie $g2_path\n" . $e->__toString());
           $message[] = t("Corrupt movie '%path'", array("path" => $g2_path));
           $message[] = $e->__toString();
           $corrupt = 1;
         }
       } else {
-        Kohana::log("alert", "$g2_path is an unsupported movie type");
+        Kohana_Log::add("alert", "$g2_path is an unsupported movie type");
         $message[] = t("'%path' is an unsupported movie type", array("path" => $g2_path));
         $corrupt = 1;
       }
@@ -868,7 +868,7 @@ class g2_import_Core {
   static function map($g2_id) {
     if (!array_key_exists($g2_id, self::$map)) {
       $g2_map = ORM::factory("g2_map")->where("g2_id", $g2_id)->find();
-      self::$map[$g2_id] = $g2_map->loaded ? $g2_map->g3_id : null;
+      self::$map[$g2_id] = $g2_map->loaded() ? $g2_map->g3_id : null;
     }
 
     return self::$map[$g2_id];
@@ -887,7 +887,7 @@ class g2_import_Core {
 
   static function log($msg) {
     message::warning($msg);
-    Kohana::log("alert", $msg);
+    Kohana_Log::add("alert", $msg);
   }
 }
 
@@ -906,7 +906,7 @@ function g2() {
   $args = func_get_arg(0);
   $ret = array_shift($args);
   if ($ret) {
-    Kohana::log("error", "Gallery 2 call failed with: " . $ret->getAsText());
+    Kohana_Log::add("error", "Gallery 2 call failed with: " . $ret->getAsText());
     throw new Exception("@todo G2_FUNCTION_FAILED");
   }
   if (count($args) == 1) {
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index 47a205bd..fef0d186 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -66,7 +66,7 @@ class g2_import_task_Core {
 
       $root_g2_id = g2(GalleryCoreApi::getDefaultAlbumId());
       $root = ORM::factory("g2_map")->where("g2_id", $root_g2_id)->find();
-      if (!$root->loaded) {
+      if (!$root->loaded()) {
         $root->g2_id = $root_g2_id;
         $root->g3_id = 1;
         $root->save();
-- 
cgit v1.2.3


From 1fd0e14359a7c7164573e4aa897c07680339e713 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 12:09:04 -0800
Subject: Convert all DB where() calls to take 3 arguments. Convert all
 open_paren() calls to and_open() or or_open() as appropriate.

---
 modules/comment/controllers/admin_comments.php     |  4 +-
 modules/comment/helpers/comment_event.php          |  6 +--
 modules/comment/helpers/comment_rss.php            |  4 +-
 modules/comment/helpers/comment_theme.php          |  4 +-
 modules/comment/tests/Comment_Model_Test.php       |  4 +-
 modules/exif/helpers/exif.php                      | 14 +++----
 modules/exif/helpers/exif_task.php                 | 10 ++---
 modules/exif/helpers/exif_theme.php                |  2 +-
 modules/g2_import/helpers/g2_import.php            |  2 +-
 modules/g2_import/helpers/g2_import_task.php       |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  6 +--
 modules/gallery/controllers/albums.php             | 12 +++---
 modules/gallery/controllers/file_proxy.php         |  4 +-
 modules/gallery/controllers/l10n_client.php        |  6 +--
 modules/gallery/controllers/move.php               |  4 +-
 modules/gallery/controllers/movies.php             | 10 ++---
 modules/gallery/controllers/photos.php             | 12 +++---
 modules/gallery/helpers/MY_url.php                 |  6 +--
 modules/gallery/helpers/access.php                 | 46 ++++++++++----------
 modules/gallery/helpers/album.php                  | 10 ++---
 modules/gallery/helpers/gallery_block.php          |  8 ++--
 modules/gallery/helpers/gallery_event.php          | 12 +++---
 modules/gallery/helpers/gallery_rss.php            |  4 +-
 modules/gallery/helpers/graphics.php               | 10 ++---
 modules/gallery/helpers/l10n_client.php            |  6 ++-
 modules/gallery/helpers/l10n_scanner.php           |  2 +-
 modules/gallery/helpers/module.php                 | 11 ++---
 modules/gallery/helpers/movie.php                  | 10 ++---
 modules/gallery/helpers/photo.php                  | 10 ++---
 modules/gallery/helpers/site_status.php            |  4 +-
 modules/gallery/libraries/Gallery_I18n.php         |  4 +-
 .../gallery/libraries/drivers/Cache/Database.php   |  9 ++--
 modules/gallery/models/item.php                    | 20 ++++-----
 modules/gallery/tests/Access_Helper_Test.php       | 16 +++----
 modules/gallery/tests/Cache_Test.php               |  2 +-
 modules/gallery/tests/Database_Test.php            | 49 +++++++++++-----------
 modules/gallery/tests/Gallery_Installer_Test.php   |  2 +-
 modules/gallery/tests/I18n_Test.php                |  4 +-
 modules/gallery/tests/Item_Helper_Test.php         |  4 +-
 .../notification/helpers/notification_event.php    |  4 +-
 modules/search/helpers/search.php                  | 10 ++---
 modules/search/helpers/search_event.php            |  2 +-
 modules/search/helpers/search_task.php             |  4 +-
 modules/server_add/controllers/server_add.php      |  8 ++--
 modules/tag/controllers/admin_tags.php             |  2 +-
 modules/tag/helpers/tag.php                        |  4 +-
 modules/tag/models/tag.php                         |  8 ++--
 modules/tag/tests/Tag_Test.php                     |  6 +--
 modules/user/helpers/group.php                     |  2 +-
 modules/user/helpers/user.php                      |  2 +-
 modules/user/tests/User_Groups_Test.php            |  4 +-
 51 files changed, 208 insertions(+), 203 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 039956d7..271c7d51 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -49,7 +49,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
       ->order_by("created", "DESC")
-      ->where("state", $state)
+      ->where("state", "=", $state)
       ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
       ->find_all();
     $view->content->pager = new Pagination();
@@ -120,7 +120,7 @@ class Admin_Comments_Controller extends Admin_Controller {
     access::verify_csrf();
 
     ORM::factory("comment")
-      ->where("state", "spam")
+      ->where("state", "=", "spam")
       ->delete_all();
     url::redirect("admin/comments/queue/spam");
   }
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index a72102b9..cf5d0a60 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -29,7 +29,7 @@ class comment_event_Core {
                   "guest_email" => null,
                   "guest_name" => "guest",
                   "guest_url" => null))
-      ->where(array("author_id" => $user->id))
+      ->where("author_id", "=", $user->id)
       ->update();
   }
 
@@ -40,7 +40,7 @@ class comment_event_Core {
                   "guest_email" => null,
                   "guest_name" => "guest",
                   "guest_url" => null))
-      ->where("1 = 1")
+      ->where("1", "=", "1")  // @todo: why do we do this?
       ->update();
   }
 
@@ -65,7 +65,7 @@ class comment_event_Core {
     foreach (Database::instance()
              ->select("text")
              ->from("comments")
-             ->where("item_id", $item->id)
+             ->where("item_id", "=", $item->id)
              ->get()
              ->as_array() as $row) {
       $data[] = $row->text;
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index d0bb7859..77044884 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -35,11 +35,11 @@ class comment_rss_Core {
 
     $comments = ORM::factory("comment")
       ->viewable()
-      ->where("state", "published")
+      ->where("state", "=", "published")
       ->order_by("created", "DESC");
 
     if ($feed_id == "item") {
-      $comments->where("item_id", $id);
+      $comments->where("item_id", "=", $id);
     }
 
     $feed->view = "comment.mrss";
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index 2f12192b..ebcc1c42 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -37,8 +37,8 @@ class comment_theme_Core {
 
     $view = new View("comments.html");
     $view->comments = ORM::factory("comment")
-      ->where("item_id", $theme->item()->id)
-      ->where("state", "published")
+      ->where("item_id", "=", $theme->item()->id)
+      ->where("state", "=", "published")
       ->order_by("created", "ASC")
       ->find_all();
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index de19648d..aa91d6f2 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -29,12 +29,12 @@ class Comment_Model_Test extends Unit_Test_Case {
     access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
     access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
-      ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
+      ORM::factory("comment")->viewable()->where("comments.id", "=", $comment->id)->count_all());
   }
 }
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b6a55679..b4241e89 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -73,7 +73,7 @@ class exif_Core {
     }
     $item->save();
 
-    $record = ORM::factory("exif_record")->where("item_id", $item->id)->find();
+    $record = ORM::factory("exif_record")->where("item_id", "=", $item->id)->find();
     if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
@@ -86,7 +86,7 @@ class exif_Core {
   static function get($item) {
     $exif = array();
     $record = ORM::factory("exif_record")
-      ->where("item_id", $item->id)
+      ->where("item_id", "=", $item->id)
       ->find();
     if (!$record->loaded()) {
       return array();
@@ -143,11 +143,11 @@ class exif_Core {
       ->select("items.id")
       ->from("items")
       ->join("exif_records", "items.id", "exif_records.item_id", "left")
-      ->where("type", "photo")
-      ->open_paren()
-      ->where("exif_records.item_id", null)
-      ->orwhere("exif_records.dirty", 1)
-      ->close_paren()
+      ->where("type", "=", "photo")
+      ->and_open()
+      ->where("exif_records.item_id", "=", null)
+      ->orwhere("exif_records.dirty", "=", 1)
+      ->close()
       ->get()
       ->count();
 
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 7c4c97c4..1a449fc7 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -44,11 +44,11 @@ class exif_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("exif_records", "items.id", "exif_records.item_id", "left")
-               ->where("type", "photo")
-               ->open_paren()
-               ->where("exif_records.item_id", null)
-               ->orwhere("exif_records.dirty", 1)
-               ->close_paren()
+               ->where("type", "=", "photo")
+               ->and_open()
+               ->where("exif_records.item_id", "=", null)
+               ->orwhere("exif_records.dirty", "=", 1)
+               ->close()
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
diff --git a/modules/exif/helpers/exif_theme.php b/modules/exif/helpers/exif_theme.php
index bb6926d3..db51f305 100644
--- a/modules/exif/helpers/exif_theme.php
+++ b/modules/exif/helpers/exif_theme.php
@@ -24,7 +24,7 @@ class exif_theme_Core {
       $record = Database::instance()
         ->select("key_count")
         ->from("exif_records")
-        ->where("item_id", $item->id)
+        ->where("item_id", "=", $item->id)
         ->get()
         ->current();
       if ($record && $record->key_count) {
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 1e835a59..3cf7eb80 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -867,7 +867,7 @@ class g2_import_Core {
    */
   static function map($g2_id) {
     if (!array_key_exists($g2_id, self::$map)) {
-      $g2_map = ORM::factory("g2_map")->where("g2_id", $g2_id)->find();
+      $g2_map = ORM::factory("g2_map")->where("g2_id", "=", $g2_id)->find();
       self::$map[$g2_id] = $g2_map->loaded() ? $g2_map->g3_id : null;
     }
 
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index fef0d186..e80b88b9 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -65,7 +65,7 @@ class g2_import_task_Core {
       $task->set("done", $done);
 
       $root_g2_id = g2(GalleryCoreApi::getDefaultAlbumId());
-      $root = ORM::factory("g2_map")->where("g2_id", $root_g2_id)->find();
+      $root = ORM::factory("g2_map")->where("g2_id", "=", $root_g2_id)->find();
       if (!$root->loaded()) {
         $root->g2_id = $root_g2_id;
         $root->g3_id = 1;
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 3b896553..6377f40f 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)->order_by("updated", "DESC")->find_all();
+      ->where("done", "=", 0)->order_by("updated", "DESC")->find_all();
     $view->content->finished_tasks = ORM::factory("task")
-      ->where("done", 1)->order_by("updated", "DESC")->find_all();
+      ->where("done", "=", 1)->order_by("updated", "DESC")->find_all();
     print $view;
   }
 
@@ -164,7 +164,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
 
     // Do it the long way so we can call delete and remove the cache.
     $finished = ORM::factory("task")
-      ->where(array("done" => 1))
+      ->where("done", "=", 1)
       ->find_all();
     foreach ($finished as $task) {
       task::remove($task->id);
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 19140891..431d98a0 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -126,12 +126,12 @@ class Albums_Controller extends Items_Controller {
         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()
+            ->where("parent_id", "=", $album->parent_id)
+            ->where("id", "<>", $album->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->dirname->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->dirname->value) {
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 11d858c0..53afe0e4 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -57,7 +57,7 @@ class File_Proxy_Controller extends Controller {
     $path = preg_replace("|/.album.jpg$|", "", $path);
 
     // We now have the relative path to the item.  Search for it in the path cache
-    $item = ORM::factory("item")->where("relative_path_cache", $path)->find();
+    $item = ORM::factory("item")->where("relative_path_cache", "=", $path)->find();
     if (!$item->loaded()) {
       // We didn't turn it up.  It's possible that the relative_path_cache is out of date here.
       // There was fallback code, but bharat deleted it in 8f1bca74.  If it turns out to be
@@ -69,7 +69,7 @@ class File_Proxy_Controller extends Controller {
       if (preg_match('/.jpg$/', $path)) {
         foreach (array("flv", "mp4") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $path);
-          $item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
+          $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find();
           if ($item->loaded()) {
             break;
           }
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 2eda741c..30a18631 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -116,7 +116,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "message")
                ->from("incoming_translations")
-               ->where(array("locale" => 'root'))
+               ->where("locale", "=", "root"))
                ->get()
                ->as_array() as $row) {
         $calls[$row->key] = array(unserialize($row->message), array());
@@ -131,7 +131,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "translation")
                ->from("incoming_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->get()
                ->as_array() as $row) {
         $translations[$row->key] = unserialize($row->translation);
@@ -140,7 +140,7 @@ class L10n_Client_Controller extends Controller {
       foreach (Database::instance()
                ->select("key", "translation")
                ->from("outgoing_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->get()
                ->as_array() as $row) {
         $translations[$row->key] = unserialize($row->translation);
diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
index 87b73436..863b13bb 100644
--- a/modules/gallery/controllers/move.php
+++ b/modules/gallery/controllers/move.php
@@ -64,8 +64,8 @@ class Move_Controller extends Controller {
     $view->parent = $target;
     $view->children = ORM::factory("item")
       ->viewable()
-      ->where("type", "album")
-      ->where("parent_id", $target->id)
+      ->where("type", "=", "album")
+      ->where("parent_id", "=", $target->id)
       ->find_all();
     return $view;
   }
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 3d5eac32..7ceeefdf 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -74,12 +74,12 @@ class Movies_Controller extends Items_Controller {
         if ($row = Database::instance()
             ->select(array("name", "slug"))
             ->from("items")
-            ->where("parent_id", $movie->parent_id)
+            ->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()
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f052eccd..0d7daac4 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -74,12 +74,12 @@ class Photos_Controller extends Items_Controller {
         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()
+            ->where("parent_id", "=", $photo->parent_id)
+            ->where("id", "<>", $photo->id)
+            ->and_open()
+            ->where("name", "=", $form->edit_item->filename->value)
+            ->orwhere("slug", "=", $form->edit_item->slug->value)
+            ->close()
             ->get()
             ->current()) {
           if ($row->name == $form->edit_item->filename->value) {
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index e5eefad7..a2b2e461 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -50,12 +50,12 @@ class url extends url_Core {
     // In most cases, we'll have an exact match in the relative_url_cache item field.
     // but failing that, walk down the tree until we find it.  The fallback code will fix caches
     // as it goes, so it'll never be run frequently.
-    $item = ORM::factory("item")->where("relative_url_cache", $current_uri)->find();
+    $item = ORM::factory("item")->where("relative_url_cache", "=", $current_uri)->find();
     if (!$item->loaded()) {
       $count = count(Router::$segments);
       foreach (ORM::factory("item")
-               ->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
-               ->where("level", $count + 1)
+               ->where("slug", "=", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
+               ->where("level", "=", $count + 1)
                ->find_all() as $match) {
         if ($match->relative_url() == $current_uri) {
           $item = $match;
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index d0200a73..445f9b86 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -166,11 +166,11 @@ class access_Core {
     // For view permissions, if any parent is self::DENY, then those parents lock this one.
     // Return
     $lock = ORM::factory("item")
-      ->where("`left_ptr` <= $item->left_ptr")
-      ->where("`right_ptr` >= $item->right_ptr")
-      ->where("items.id <> $item->id")
+      ->where("left_ptr", "<=", $item->left_ptr)
+      ->where("right_ptr", ">=", $item->right_ptr)
+      ->where("items.id", "<>", $item->id)
       ->join("access_intents", "items.id", "access_intents.item_id")
-      ->where("access_intents.view_$group->id", self::DENY)
+      ->where("access_intents.view_$group->id", "=", self::DENY)
       ->order_by("level", "DESC")
       ->limit(1)
       ->find();
@@ -304,7 +304,7 @@ class access_Core {
     foreach (self::_get_all_groups() as $group) {
       self::_drop_columns($name, $group);
     }
-    $permission = ORM::factory("permission")->where("name", $name)->find();
+    $permission = ORM::factory("permission")->where("name", "=", $name)->find();
     if ($permission->loaded()) {
       $permission->delete();
     }
@@ -354,7 +354,7 @@ class access_Core {
     $access_cache->item_id = $item->id;
     if ($item->id != 1) {
       $parent_access_cache =
-        ORM::factory("access_cache")->where("item_id", $item->parent()->id)->find();
+        ORM::factory("access_cache")->where("item_id", "=", $item->parent()->id)->find();
       foreach (self::_get_all_groups() as $group) {
         foreach (ORM::factory("permission")->find_all() as $perm) {
           $field = "{$perm->name}_{$group->id}";
@@ -377,8 +377,8 @@ class access_Core {
    * @return void
    */
   static function delete_item($item) {
-    ORM::factory("access_intent")->where("item_id", $item->id)->find()->delete();
-    ORM::factory("access_cache")->where("item_id", $item->id)->find()->delete();
+    ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->delete();
+    ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->delete();
   }
 
   /**
@@ -475,7 +475,7 @@ class access_Core {
    * @return void
    */
   private static function _update_access_view_cache($group, $item) {
-    $access = ORM::factory("access_intent")->where("item_id", $item->id)->find();
+    $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
 
     $db = Database::instance();
     $field = "view_{$group->id}";
@@ -490,10 +490,10 @@ class access_Core {
     // item, then its safe to propagate from here.
     if ($access->$field !== self::DENY) {
       $tmp_item = ORM::factory("item")
-        ->where("left_ptr <", $item->left_ptr)
-        ->where("right_ptr >", $item->right_ptr)
+        ->where("left_ptr", "<", $item->left_ptr)
+        ->where("right_ptr", ">", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
-        ->where("access_intents.$field", self::DENY)
+        ->where("access_intents.$field", "=", self::DENY)
         ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
@@ -512,10 +512,10 @@ class access_Core {
     $query = ORM::factory("access_intent")
       ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr", "items.id"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left_ptr >=", $item->left_ptr)
-      ->where("right_ptr <=", $item->right_ptr)
-      ->where("type", "album")
-      ->where("access_intents.$field IS NOT", self::INHERIT)
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->where("type", "=", "album")
+      ->where("access_intents.$field", "IS NOT", self::INHERIT)
       ->order_by("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
@@ -549,7 +549,7 @@ class access_Core {
    * @return void
    */
   private static function _update_access_non_view_cache($group, $perm_name, $item) {
-    $access = ORM::factory("access_intent")->where("item_id", $item->id)->find();
+    $access = ORM::factory("access_intent")->where("item_id", "=", $item->id)->find();
 
     $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
@@ -562,9 +562,9 @@ class access_Core {
     if ($access->$field === self::INHERIT) {
       $tmp_item = ORM::factory("item")
         ->join("access_intents", "items.id", "access_intents.item_id")
-        ->where("left_ptr <", $item->left_ptr)
-        ->where("right_ptr >", $item->right_ptr)
-        ->where("$field IS NOT", self::UNKNOWN)
+        ->where("left_ptr", "<", $item->left_ptr)
+        ->where("right_ptr", ">", $item->right_ptr)
+        ->where($field, "IS NOT", self::UNKNOWN)
         ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
@@ -578,9 +578,9 @@ class access_Core {
     $query = ORM::factory("access_intent")
       ->select(array("access_intents.$field", "items.left_ptr", "items.right_ptr"))
       ->join("items", "items.id", "access_intents.item_id")
-      ->where("left_ptr >=", $item->left_ptr)
-      ->where("right_ptr <=", $item->right_ptr)
-      ->where("$field IS NOT", self::INHERIT)
+      ->where("left_ptr", ">=", $item->left_ptr)
+      ->where("right_ptr", "<=", $item->right_ptr)
+      ->where($field, "IS NOT", self::INHERIT)
       ->order_by("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 84a60f83..cd8777e2 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -68,11 +68,11 @@ class album_Core {
     // Randomize the name or slug if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $album->name)
-           ->orwhere("slug", $album->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $album->name)
+           ->orwhere("slug", "=", $album->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $album->name = "{$name}-$rand";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index d09f1c80..40660874 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -45,8 +45,8 @@ class gallery_block_Core {
       $block->css_id = "g-photo-stream";
       $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
-      $block->content->photos =
-        ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
+      $block->content->photos = ORM::factory("item")
+        ->where("type", "=", "photo")->order_by("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
@@ -62,8 +62,8 @@ class gallery_block_Core {
       $block->title = t("Gallery stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count =
-        ORM::factory("item")->where("type", "album")->where("id <>", 1)->count_all();
-      $block->content->photo_count = ORM::factory("item")->where("type", "photo")->count_all();
+        ORM::factory("item")->where("type", "=", "album")->where("id", "<>", 1)->count_all();
+      $block->content->photo_count = ORM::factory("item")->where("type", "=", "photo")->count_all();
       break;
 
     case "platform_info":
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 02bfdf28..fa4db317 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -33,15 +33,15 @@ class gallery_event_Core {
     $db = Database::instance();
     $db->from("tasks")
       ->set(array("owner_id" => $admin->id))
-      ->where(array("owner_id" => $user->id))
+      ->where("owner_id", "=", $user->id)
       ->update();
     $db->from("items")
       ->set(array("owner_id" => $admin->id))
-      ->where(array("owner_id" => $user->id))
+      ->where("owner_id", "=", $user->id)
       ->update();
     $db->from("logs")
       ->set(array("user_id" => $admin->id))
-      ->where(array("user_id" => $user->id))
+      ->where("user_id", "=", $user->id)
       ->update();
   }
 
@@ -50,15 +50,15 @@ class gallery_event_Core {
     $db = Database::instance();
     $db->from("tasks")
       ->set(array("owner_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
     $db->from("items")
       ->set(array("owner_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
     $db->from("logs")
       ->set(array("user_id" => $admin->id))
-      ->where("1 = 1")
+      ->where("1", "=", "1") // @todo why do we need this?
       ->update();
   }
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index e195be8d..93ace10b 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -29,13 +29,13 @@ class gallery_rss_Core {
     case "latest":
       $feed->children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
+        ->where("type", "<>", "album")
         ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
+        ->where("type", "<>", "album")
         ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index aef09003..e45a5125 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -61,9 +61,9 @@ class graphics_Core {
    */
   static function remove_rule($module_name, $target, $operation) {
     ORM::factory("graphics_rule")
-      ->where("module_name", $module_name)
-      ->where("target", $target)
-      ->where("operation", $operation)
+      ->where("module_name", "=", $module_name)
+      ->where("target", "=", $target)
+      ->where("operation", "=", $operation)
       ->delete_all();
 
     self::mark_dirty($target == "thumb", $target == "resize");
@@ -181,8 +181,8 @@ class graphics_Core {
     if (empty(self::$_rules_cache[$target])) {
       $rules = array();
       foreach (ORM::factory("graphics_rule")
-               ->where("target", $target)
-               ->where("active", true)
+               ->where("target", "=", $target)
+               ->where("active", "=", true)
                ->order_by("priority", "asc")
                ->find_all() as $rule) {
         $rules[] = (object)$rule->as_array();
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index aaf6ff46..14ab5a85 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -134,12 +134,14 @@ class l10n_client_Core {
       // incoming_translations.message to be NULL?
       $locale = $message_data->locale;
       $entry = ORM::factory("incoming_translation")
-        ->where(array("key" => $key, "locale" => $locale))
+        ->where("key", "=", $key)
+        ->where("locale", "=", $locale)
         ->find();
       if (!$entry->loaded()) {
         // @todo Load a message key -> message (text) dict into memory outside of this loop
         $root_entry = ORM::factory("incoming_translation")
-          ->where(array("key" => $key, "locale" => "root"))
+          ->where("key", "=", $key)
+          ->where("locale", "=", "root")
           ->find();
         $entry->key = $key;
         $entry->message = $root_entry->message;
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 6c09a686..a7ce2c59 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -31,7 +31,7 @@ class l10n_scanner_Core {
       foreach (Database::instance()
                ->select("key")
                ->from("incoming_translations")
-               ->where("locale", "root")
+               ->where("locale", "=", "root")
                ->get() as $row) {
         $cache[$row->key] = true;
       }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index b7e13b9a..d89b8401 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -354,7 +354,8 @@ class module_Core {
       $row = db::build()
         ->select("value")
         ->from("vars")
-        ->where(array("module_name" => "gallery", "name" => "_cache"))
+        ->where("module_name", "=", "gallery")
+        ->where("name", "=", "_cache")
         ->execute()
         ->current();
       if ($row) {
@@ -395,8 +396,8 @@ class module_Core {
    */
   static function set_var($module_name, $name, $value) {
     $var = ORM::factory("var")
-      ->where("module_name", $module_name)
-      ->where("name", $name)
+      ->where("module_name", "=", $module_name)
+      ->where("name", "=", $name)
       ->find();
     if (!$var->loaded()) {
       $var->module_name = $module_name;
@@ -432,8 +433,8 @@ class module_Core {
    */
   static function clear_var($module_name, $name) {
     $var = ORM::factory("var")
-      ->where("module_name", $module_name)
-      ->where("name", $name)
+      ->where("module_name", "=", $module_name)
+      ->where("name", "=", $name)
       ->find();
     if ($var->loaded()) {
       $var->delete();
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index ff86403a..82247eb0 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -90,11 +90,11 @@ class movie_Core {
     // Randomize the name if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $movie->name)
-           ->orwhere("slug", $movie->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $movie->name)
+           ->orwhere("slug", "=", $movie->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $movie->name = "{$name}.$rand.{$pi['extension']}";
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 21cb13a0..2a563043 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -89,11 +89,11 @@ class photo_Core {
     // Randomize the name or slug if there's a conflict
     // @todo Improve this.  Random numbers are not user friendly
     while (ORM::factory("item")
-           ->where("parent_id", $parent->id)
-           ->open_paren()
-           ->where("name", $photo->name)
-           ->orwhere("slug", $photo->slug)
-           ->close_paren()
+           ->where("parent_id", "=", $parent->id)
+           ->and_open()
+           ->where("name", "=", $photo->name)
+           ->orwhere("slug", "=", $photo->slug)
+           ->close()
            ->find()->id) {
       $rand = rand();
       $photo->name = "{$name}.$rand.{$pi['extension']}";
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index d58b935d..04316fff 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -67,7 +67,7 @@ class site_status_Core {
    */
   private static function _add($msg, $severity, $permanent_key) {
     $message = ORM::factory("message")
-      ->where("key", $permanent_key)
+      ->where("key", "=", $permanent_key)
       ->find();
     if (!$message->loaded()) {
       $message->key = $permanent_key;
@@ -82,7 +82,7 @@ class site_status_Core {
    * @param string $permanent_key
    */
   static function clear($permanent_key) {
-    $message = ORM::factory("message")->where("key", $permanent_key)->find();
+    $message = ORM::factory("message")->where("key", "=", $permanent_key)->find();
     if ($message->loaded()) {
       $message->delete();
     }
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index 42fae266..9a5e7dc1 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -131,7 +131,7 @@ class Gallery_I18n_Core {
       foreach (db::build()
                ->select("key", "translation")
                ->from("incoming_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
@@ -141,7 +141,7 @@ class Gallery_I18n_Core {
       foreach (db::build()
                ->select("key", "translation")
                ->from("outgoing_translations")
-               ->where(array("locale" => $locale))
+               ->where("locale", "=", $locale)
                ->execute()
                ->as_array() as $row) {
         $this->_cache[$locale][$row->key] = unserialize($row->translation);
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index eda445b6..a317798e 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -86,7 +86,7 @@ class Cache_Database_Driver extends Cache_Driver {
   public function get_tag($tags) {
     $db = db::build()->from("caches");
     foreach ($tags as $tag) {
-      $db->where("tags", "like", "<$tag>");
+      $db->where("tags", "LIKE", "<$tag>");
     }
     $db_result = $db->execute()->as_array();
 
@@ -152,12 +152,12 @@ class Cache_Database_Driver extends Cache_Driver {
   public function delete($id, $tag = false) {
     $this->db->from("caches");
     if ($id === true) {
-      $this->db->where(1);
       // Delete all caches
+      $this->db->where("1", "=", "1");
     } else if ($tag === true) {
       $this->db->like("tags", "<$id>");
     } else {
-      $this->db->where("key", $id);
+      $this->db->where("key", "=", $id);
     }
 
     $status = $this->db->delete();
@@ -178,7 +178,8 @@ class Cache_Database_Driver extends Cache_Driver {
   public function delete_expired() {
     // Delete all expired caches
     $status = $this->db->from("caches")
-      ->where(array("expiration !=" => 0, "expiration <=" => time()))
+      ->where("expiration", "<>", 0)
+      ->where("expiration", "<=", time())
       ->delete();
 
     return count($status) > 0;
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c8386b1c..c8d25cc5 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -288,9 +288,9 @@ class Item_Model extends ORM_MPTT {
     foreach (Database::instance()
              ->select(array("name", "slug"))
              ->from("items")
-             ->where("left_ptr <=", $this->left_ptr)
-             ->where("right_ptr >=", $this->right_ptr)
-             ->where("id <>", 1)
+             ->where("left_ptr", "<=", $this->left_ptr)
+             ->where("right_ptr", ">=", $this->right_ptr)
+             ->where("id", "<>", 1)
              ->order_by("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
@@ -433,8 +433,8 @@ class Item_Model extends ORM_MPTT {
     // If the comparison column has NULLs in it, we can't use comparators on it and will have to
     // deal with it the hard way.
     $count = $db->from("items")
-      ->where("parent_id", $this->id)
-      ->where($this->sort_column, NULL)
+      ->where("parent_id", "=", $this->id)
+      ->where($this->sort_column, "=", NULL)
       ->where($where)
       ->count_records();
 
@@ -443,8 +443,8 @@ class Item_Model extends ORM_MPTT {
       $sort_column = $this->sort_column;
 
       $position = $db->from("items")
-        ->where("parent_id", $this->id)
-        ->where("$sort_column $comp ", $child->$sort_column)
+        ->where("parent_id", "=", $this->id)
+        ->where($sort_column, $comp, $child->$sort_column)
         ->where($where)
         ->count_records();
 
@@ -457,8 +457,8 @@ class Item_Model extends ORM_MPTT {
       // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
       // our base value.
       foreach ($db->from("items")
-               ->where("parent_id", $this->id)
-               ->where($sort_column, $child->$sort_column)
+               ->where("parent_id", "=", $this->id)
+               ->where($sort_column, "=", $child->$sort_column)
                ->where($where)
                ->order_by(array("id" => "ASC"))
                ->get() as $row) {
@@ -484,7 +484,7 @@ class Item_Model extends ORM_MPTT {
       $position = 0;
       foreach ($db->select("id")
                ->from("items")
-               ->where("parent_id", $this->id)
+               ->where("parent_id", "=", $this->id)
                ->where($where)
                ->order_by($order_by)
                ->get() as $row) {
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index d90d7ed6..771c6a85 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -106,15 +106,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $item = album::create($root,  rand(), "test album");
 
     // New rows exist
-    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
-    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->loaded());
 
     // Delete the item
     $item->delete();
 
     // Rows are gone
-    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
-    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_cache")->where("item_id", "=", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_intent")->where("item_id", "=", $item->id)->find()->loaded());
   }
 
   public function new_photos_inherit_parent_permissions_test() {
@@ -131,7 +131,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   public function can_allow_deny_and_reset_intent_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
-    $intent = ORM::factory("access_intent")->where("item_id", $album)->find();
+    $intent = ORM::factory("access_intent")->where("item_id", "=", $album)->find();
 
     // Allow
     access::allow(identity::everybody(), "view", $album);
@@ -141,19 +141,19 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::deny(identity::everybody(), "view", $album);
     $this->assert_same(
       access::DENY,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
     access::allow(identity::everybody(), "view", $album);
     $this->assert_same(
       access::ALLOW,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
 
     access::reset(identity::everybody(), "view", $album);
     $this->assert_same(
       null,
-      ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
+      ORM::factory("access_intent")->where("item_id", "=", $album)->find()->view_1);
   }
 
   public function cant_reset_root_item_test() {
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index 6b525265..776c6625 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -20,7 +20,7 @@
 class Cache_Test extends Unit_Test_Case {
   private $_driver;
   public function setup() {
-    Database::instance()->from("caches")->where(1)->delete();
+    Database::instance()->from("caches")->where("1", "=", "1")->delete();
     $this->_driver = new Cache_Database_Driver();
   }
 
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 98bd4046..4f5a1da2 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -20,8 +20,8 @@
 class Database_Test extends Unit_Test_Case {
   function simple_where_test() {
     $sql = Database::instance()
-      ->where("a", 1)
-      ->where("b", 2)
+      ->where("a", "=", 1)
+      ->where("b", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same("SELECT * WHERE `a` = 1 AND `b` = 2", $sql);
@@ -29,12 +29,12 @@ class Database_Test extends Unit_Test_Case {
 
   function compound_where_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer2", 2)
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -44,12 +44,12 @@ class Database_Test extends Unit_Test_Case {
 
   function group_first_test() {
     $sql = Database::instance()
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere("inner2", 2)
-      ->close_paren()
-      ->where("outer1", 1)
-      ->where("outer2", 2)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->close()
+      ->where("outer1", "=", 1)
+      ->where("outer2", "=", 2)
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -59,11 +59,12 @@ class Database_Test extends Unit_Test_Case {
 
   function where_array_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->where("inner1", 1)
-      ->orwhere(array("inner2" => 2, "inner3" => 3))
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->and_open()
+      ->where("inner1", "=", 1)
+      ->orwhere("inner2", "=", 2)
+      ->orwhere("inner3", "=", 3))
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -73,10 +74,10 @@ class Database_Test extends Unit_Test_Case {
 
   function notlike_test() {
     $sql = Database::instance()
-      ->where("outer1", 1)
-      ->open_paren()
-      ->ornotlike("inner1", 1)
-      ->close_paren()
+      ->where("outer1", "=", 1)
+      ->or_open()
+      ->where("inner1", "NOT LIKE", 1)
+      ->close()
       ->compile();
     $sql = str_replace("\n", " ", $sql);
     $this->assert_same(
@@ -118,7 +119,7 @@ class Database_Test extends Unit_Test_Case {
 
   function prefix_no_replacement_test() {
     $update = Database_For_Test::instance()->from("test_tables")
-      ->where("1 = 1")
+      ->where("1", "=", "1")
       ->set(array("name" => "Test Name"))
       ->update();
 
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 36ced2bb..f36f638f 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -29,7 +29,7 @@ class Gallery_Installer_Test extends Unit_Test_Case {
   }
 
   public function install_registers_gallery_module_test() {
-    $gallery = ORM::factory("module")->where("name", "gallery")->find();
+    $gallery = ORM::factory("module")->where("name", "=", "gallery")->find();
     $this->assert_equal("gallery", $gallery->name);
   }
 
diff --git a/modules/gallery/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index d0555cbf..895e3051 100644
--- a/modules/gallery/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
@@ -29,7 +29,7 @@ class Gallery_I18n_Test extends Unit_Test_Case {
     $this->i18n = Gallery_I18n::instance($config);
 
     ORM::factory("incoming_translation")
-      ->where("locale", "te_ST")
+      ->where("locale", "=", "te_ST")
       ->delete_all();
 
     $messages_te_ST = array(
@@ -62,7 +62,7 @@ class Gallery_I18n_Test extends Unit_Test_Case {
     $locale = $this->i18n->locale();
     $this->assert_equal("de_DE", $locale);
   }
-  
+
   public function translate_simple_test() {
     $result = $this->i18n->translate('Hello world');
     $this->assert_equal('Hallo Welt', $result);
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index a364423a..f0c653c0 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -29,13 +29,13 @@ class Item_Helper_Test extends Unit_Test_Case {
     access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
-      ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
+      ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
 
     // We can't see the item when permissions are denied
     access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
-      ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
+      ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
   }
 
   public function validate_url_safe_test() {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index e6d09d74..951e6e52 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -54,7 +54,7 @@ class notification_event_Core {
 
   static function user_deleted($user) {
     ORM::factory("subscriptions")
-      ->where(array("user_id", $user->id))
+      ->where("user_id", "=", $user->id)
       ->delete_all();
   }
 
@@ -88,7 +88,7 @@ class notification_event_Core {
   static function user_before_delete($user) {
     try {
       ORM::factory("subscription")
-        ->where("user_id", $user->id)
+        ->where("user_id", "=", $user->id)
         ->delete_all();
     } catch (Exception $e) {
       Kohana_Log::add("error", "@todo notification_event::user_before_delete() failed");
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 9d732c11..c0bb1b32 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -60,7 +60,7 @@ class search_Core {
 
   static function update($item) {
     $data = new ArrayObject();
-    $record = ORM::factory("search_record")->where("item_id", $item->id)->find();
+    $record = ORM::factory("search_record")->where("item_id", "=", $item->id)->find();
     if (!$record->loaded()) {
       $record->item_id = $item->id;
     }
@@ -76,10 +76,10 @@ class search_Core {
       ->select("items.id")
       ->from("items")
       ->join("search_records", "items.id", "search_records.item_id", "left")
-      ->open_paren()
-      ->where("search_records.item_id", null)
-      ->orwhere("search_records.dirty", 1)
-      ->close_paren()
+      ->and_open()
+      ->where("search_records.item_id", "=", null)
+      ->orwhere("search_records.dirty", "=", 1)
+      ->close()
       ->get()
       ->count();
 
diff --git a/modules/search/helpers/search_event.php b/modules/search/helpers/search_event.php
index 836bbe15..1add6e5f 100644
--- a/modules/search/helpers/search_event.php
+++ b/modules/search/helpers/search_event.php
@@ -28,7 +28,7 @@ class search_event_Core {
 
   static function item_deleted($item) {
     ORM::factory("search_record")
-      ->where("item_id", $item->id)
+      ->where("item_id", "=", $item->id)
       ->delete_all();
   }
 
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 9508f420..061f4084 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -45,8 +45,8 @@ class search_task_Core {
       $start = microtime(true);
       foreach (ORM::factory("item")
                ->join("search_records", "items.id", "search_records.item_id", "left")
-               ->where("search_records.item_id", null)
-               ->orwhere("search_records.dirty", 1)
+               ->where("search_records.item_id", "=", null)
+               ->orwhere("search_records.dirty", "=", 1)
                ->find_all() as $item) {
         // The query above can take a long time, so start the timer after its done
         // to give ourselves a little time to actually process rows.
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 053a1891..3c3a6c2b 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -177,7 +177,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->percent_complete = min($task->percent_complete + 0.1, 10);
       $task->status = t2("Found one file", "Found %count files",
                          Database::instance()
-                         ->where("task_id", $task->id)
+                         ->where("task_id", "=", $task->id)
                          ->count_records("server_add_files"));
 
       if (!$queue) {
@@ -197,8 +197,8 @@ class Server_Add_Controller extends Admin_Controller {
       // will create albums first.  Ignore entries which already have an Item_Model attached,
       // they're done.
       $entries = ORM::factory("server_add_file")
-        ->where("task_id", $task->id)
-        ->where("item_id", null)
+        ->where("task_id", "=", $task->id)
+        ->where("item_id", "=", null)
         ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
@@ -265,7 +265,7 @@ class Server_Add_Controller extends Admin_Controller {
       $task->done = true;
       $task->state = "success";
       $task->percent_complete = 100;
-      ORM::factory("server_add_file")->where("task_id", $task->id)->delete_all();
+      ORM::factory("server_add_file")->where("task_id", "=", $task->id)->delete_all();
       message::info(t2("Successfully added one photo / album",
                        "Successfully added %count photos / albums",
                        $task->get("completed_files")));
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index aff44803..6cd2f337 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -106,7 +106,7 @@ class Admin_Tags_Controller extends Admin_Controller {
   }
 
   public function check_for_duplicate(Validation $post_data, $field) {
-    $tag_exists = ORM::factory("tag")->where("name", $post_data[$field])->count_all();
+    $tag_exists = ORM::factory("tag")->where("name", "=", $post_data[$field])->count_all();
     if ($tag_exists) {
       $post_data->add_error($field, "in_use");
     }
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 8694bcec..c4c4ba15 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -33,7 +33,7 @@ class tag_Core {
       throw new exception("@todo MISSING_TAG_NAME");
     }
 
-    $tag = ORM::factory("tag")->where("name", $tag_name)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find();
     if (!$tag->loaded()) {
       $tag->name = $tag_name;
       $tag->count = 0;
@@ -93,7 +93,7 @@ class tag_Core {
              ->select("name")
              ->from("tags")
              ->join("items_tags", "tags.id", "items_tags.tag_id", "left")
-             ->where("items_tags.item_id", $item->id)
+             ->where("items_tags.item_id", "=", $item->id)
              ->get() as $row) {
       $tags[] = $row->name;
     }
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index be020f5f..f9a453be 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -31,9 +31,9 @@ class Tag_Model extends ORM {
     $model = ORM::factory("item")
       ->viewable()
       ->join("items_tags", "items.id", "items_tags.item_id")
-      ->where("items_tags.tag_id", $this->id);
+      ->where("items_tags.tag_id", "=", $this->id);
     if ($type) {
-      $model->where("items.type", $type);
+      $model->where("items.type", "=", $type);
     }
     return $model->find_all($limit, $offset);
   }
@@ -47,10 +47,10 @@ class Tag_Model extends ORM {
     $model = ORM::factory("item")
       ->viewable()
       ->join("items_tags", "items.id", "items_tags.item_id")
-      ->where("items_tags.tag_id", $this->id);
+      ->where("items_tags.tag_id", "=", $this->id);
 
     if ($type) {
-      $model->where("items.type", $type);
+      $model->where("items.type", "=", $type);
     }
     return $model->count_all();
   }
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c9a96286..c96e7f2b 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -25,18 +25,18 @@ class Tag_Test extends Unit_Test_Case {
     $tag1 = "tag1";
 
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     // Make sure adding the tag again doesn't increase the count
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(1, $tag->count);
 
     $rand = rand();
     $album = album::create($root, $rand, $rand, $rand);
     tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", $tag1)->find();
+    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
     $this->assert_true(2, $tag->count);
   }
 }
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 1beaa1c2..2ada0ac1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -31,7 +31,7 @@ class group_Core {
    * @return Group_Definition the group object
    */
   static function create($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
+    $group = ORM::factory("group")->where("name", "=", $name)->find();
     if ($group->loaded()) {
       throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
     }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 4ed9daee..5027580c 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -44,7 +44,7 @@ class user_Core {
    * @return User_Model
    */
   static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
+    $user = ORM::factory("user")->where("name", "=", $name)->find();
     if ($user->loaded()) {
       throw new Exception("@todo USER_ALREADY_EXISTS $name");
     }
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 6aedfde5..163b7d79 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -21,14 +21,14 @@
 class User_Groups_Test extends Unit_Test_Case {
   public function teardown() {
     try {
-      $group = ORM::factory("group")->where("name", "user_groups_test")->find();
+      $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
       if ($group->loaded()) {
         $group->delete();
       }
     } catch (Exception $e) { }
 
     try {
-      $user = ORM::factory("user")->where("name", "user_groups_test")->find();
+      $user = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
       if ($user->loaded()) {
         $user->delete();
       }
-- 
cgit v1.2.3


From 2ff84b092d0b9d8ca61b313d2aa5d7941f3f8711 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Dec 2009 21:35:04 -0800
Subject: Update database query.

---
 modules/g2_import/helpers/g2_import_event.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/helpers/g2_import_event.php b/modules/g2_import/helpers/g2_import_event.php
index 609e1a45..02a2126d 100644
--- a/modules/g2_import/helpers/g2_import_event.php
+++ b/modules/g2_import/helpers/g2_import_event.php
@@ -19,7 +19,10 @@
  */
 class g2_import_event_Core {
   static function item_deleted($item) {
-    Database::instance()->delete("g2_maps", array("g3_id" => $item->id));
+    db::build()
+      ->delete("g2_maps")
+      ->where("g3_id", "=", $item->id)
+      ->execute();
   }
 
   static function item_created($item) {
-- 
cgit v1.2.3


From b16ab9d94af3b463c3f3497c0b4cb57416349a27 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 24 Dec 2009 03:08:06 -0800
Subject: Don't treat objects like strings.

---
 modules/g2_import/helpers/g2_import.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 3cf7eb80..a7a69746 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -611,11 +611,9 @@ class g2_import_Core {
                array("id" => $g2_item_id, "exception" => $e->__toString()));
     }
 
-    $tags = "";
     // Multiword tags have the space changed to dots.s
     foreach ($tag_names as $tag_name) {
-      $tags .= (strlen($tags) ? ", " : "") .
-        tag::add($g3_item, $tag_name);
+      tag::add($g3_item, $tag_name);
     }
 
     // Tag operations are idempotent so we don't need to map them.  Which is good because we don't
@@ -634,11 +632,10 @@ class g2_import_Core {
       $delim = " ";
     }
 
-    $tags = "";
     foreach (preg_split("/$delim/", $keywords) as $keyword) {
       $keyword = trim($keyword);
       if ($keyword) {
-        $tags .= (strlen($tags) ? ", " : "") . tag::add($item, $keyword);
+        tag::add($item, $keyword);
       }
     }
   }
-- 
cgit v1.2.3


From 6d5d68a3f963109230b898bc1b559af7ac7585f7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 17:41:20 -0800
Subject: Start tracking the original G2 url and id for all entities.  This
 will allow us to map G2 image urls to the appropriate G3 ones.

---
 modules/g2_import/helpers/g2_import.php           | 69 ++++++++++++++++++-----
 modules/g2_import/helpers/g2_import_installer.php | 15 ++++-
 modules/g2_import/module.info                     |  2 +-
 3 files changed, 71 insertions(+), 15 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index a7a69746..478fd75d 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -21,6 +21,7 @@
 class g2_import_Core {
   public static $init = false;
   public static $map = array();
+  public static $g2_base_url = null;
 
   private static $current_g2_item = null;
 
@@ -155,6 +156,20 @@ class g2_import_Core {
     $admin = g2(GalleryCoreApi::loadEntitiesById($admin_id));
     $GLOBALS["gallery"]->setActiveUser($admin);
 
+    // Make sure we have an embed location so that embedded url generation comes out ok.  Without
+    // this, the Gallery2 ModRewrite code won't try to do url generation.
+    $g2_embed_location =
+      g2(GalleryCoreApi::getPluginParameter("module", "rewrite", "modrewrite.embeddedLocation"));
+
+    if (empty($g2_embed_location)) {
+      $g2_embed_location =
+        g2(GalleryCoreApi::getPluginParameter("module", "rewrite", "modrewrite.galleryLocation"));
+      g2(GalleryCoreApi::setPluginParameter(
+           "module", "rewrite", "modrewrite.embeddedLocation", $g2_embed_location));
+      g2($gallery->getStorage()->checkPoint());
+    }
+    self::$g2_base_url = $g2_embed_location;
+
     return true;
   }
 
@@ -254,7 +269,7 @@ class g2_import_Core {
     }
 
     if (isset($group)) {
-      self::set_map($g2_group->getId(), $group->id);
+      self::set_map($g2_group->getId(), $group->id, "group");
     }
 
     return $message;
@@ -270,7 +285,7 @@ class g2_import_Core {
     }
 
     if (g2(GalleryCoreApi::isAnonymousUser($g2_user_id))) {
-      self::set_map($g2_user_id, identity::guest()->id);
+      self::set_map($g2_user_id, identity::guest()->id, "group");
       return t("Skipping anonymous user");
     }
 
@@ -308,7 +323,7 @@ class g2_import_Core {
     }
     $user->save();
 
-    self::set_map($g2_user->getId(), $user->id);
+    self::set_map($g2_user->getId(), $user->id, "user");
 
     return $message;
   }
@@ -376,7 +391,11 @@ class g2_import_Core {
     $album->save();
 
     self::import_keywords_as_tags($g2_album->getKeywords(), $album);
-    self::set_map($g2_album_id, $album->id);
+
+    self::set_map(
+      $g2_album_id, $album->id,
+      "album",
+      self::g2_url(array("view" => "core.ShowItem", "itemId" => $g2_album->getId())));
 
     // @todo import album highlights
   }
@@ -515,19 +534,30 @@ class g2_import_Core {
       self::import_keywords_as_tags($g2_item->getKeywords(), $item);
     }
 
+    $g2_item_url = self::g2_url(array("view" => "core.ShowItem", "itemId" => $g2_item->getId()));
     if (isset($item)) {
-      self::set_map($g2_item_id, $item->id);
       $item->view_count = g2(GalleryCoreApi::fetchItemViewCount($g2_item_id));
       $item->save();
+
+      self::set_map($g2_item_id, $item->id, "item", $g2_item_url);
+      $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
+      if (!empty($derivatives[$g2_item_id])) {
+        foreach ($derivatives[$g2_item_id] as $derivative) {
+          switch ($derivative->getDerivativeType()) {
+          case DERIVATIVE_TYPE_IMAGE_THUMBNAIL: $resource_type = "thumbnail"; break;
+          case DERIVATIVE_TYPE_IMAGE_RESIZE:    $resource_type = "resize"; break;
+          case DERIVATIVE_TYPE_IMAGE_PREFERRED: $resource_type = "full"; break;
+          }
+
+          self::set_map(
+            $derivative->getId(), $item->id,
+            $resource_type,
+            self::g2_url(array("view" => "core.DownloadItem", "itemId" => $derivative->getId())));
+        }
+      }
     }
 
     if ($corrupt) {
-      $url_generator = $GLOBALS["gallery"]->getUrlGenerator();
-      // @todo we need a more persistent warning
-      $g2_item_url = $url_generator->generateUrl(array("itemId" => $g2_item->getId()));
-      // Why oh why did I ever approve the session id placeholder idea in G2?
-      $g2_item_url =
-        str_replace('&amp;g2_GALLERYSID=TMP_SESSION_ID_DI_NOISSES_PMT', '', $g2_item_url);
       if (!empty($item)) {
         $message[] =
           t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " .
@@ -874,10 +904,12 @@ class g2_import_Core {
   /**
    * Associate a Gallery 2 id with a Gallery 3 item id.
    */
-  static function set_map($g2_id, $g3_id) {
+  static function set_map($g2_id, $g3_id, $resource_type, $g2_url=null) {
     $g2_map = ORM::factory("g2_map");
     $g2_map->g3_id = $g3_id;
     $g2_map->g2_id = $g2_id;
+    $g2_map->resource_type = $resource_type;
+    $g2_map->g2_url = $g2_url;
     $g2_map->save();
     self::$map[$g2_id] = $g3_id;
   }
@@ -886,6 +918,17 @@ class g2_import_Core {
     message::warning($msg);
     Kohana_Log::add("alert", $msg);
   }
+
+  static function g2_url($params) {
+    global $gallery;
+    $url = $gallery->getUrlGenerator()->generateUrl(
+      $params,
+      array("forceSessionId" => false,
+            "htmlEntities" => false,
+            "urlEncode" => false,
+            "useAuthToken" => false));
+    return str_replace(self::$g2_base_url, "", $url);
+  }
 }
 
 /**
@@ -901,7 +944,7 @@ class g2_import_Core {
  */
 function g2() {
   $args = func_get_arg(0);
-  $ret = array_shift($args);
+  $ret = is_array($args) ? array_shift($args) : $args;
   if ($ret) {
     Kohana_Log::add("error", "Gallery 2 call failed with: " . $ret->getAsText());
     throw new Exception("@todo G2_FUNCTION_FAILED");
diff --git a/modules/g2_import/helpers/g2_import_installer.php b/modules/g2_import/helpers/g2_import_installer.php
index feacb518..77b61d3e 100644
--- a/modules/g2_import/helpers/g2_import_installer.php
+++ b/modules/g2_import/helpers/g2_import_installer.php
@@ -24,14 +24,27 @@ class g2_import_installer {
                  `id` int(9) NOT NULL auto_increment,
                  `g2_id` int(9) NOT NULL,
                  `g3_id` int(9) NOT NULL,
+                 `g2_url` varchar(255) default NULL,
+                 `resource_type` varchar(64) default NULL,
                PRIMARY KEY (`id`),
-               KEY (`g2_id`))
+               KEY `g2_url` (`g2_url`),
+               KEY `g2_id` (`g2_id`))
                DEFAULT CHARSET=utf8;");
 
     module::set_version("g2_import", 1);
     mkdir(VARPATH . "modules/g2_import");
   }
 
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      $db->query("ALTER TABLE {g2_maps} ADD COLUMN `g2_url` VARCHAR(255)");
+      $db->query("ALTER TABLE {g2_maps} ADD COLUMN `resource_type` VARCHAR(64)");
+      $db->query("ALTER TABLE {g2_maps} ADD KEY `g2_url` (`g2_url`)");
+      module::set_version("g2_import", $version = 2);
+    }
+  }
+
   static function uninstall() {
     @dir::unlink(VARPATH . "modules/g2_import");
   }
diff --git a/modules/g2_import/module.info b/modules/g2_import/module.info
index 554cf33b..977af251 100644
--- a/modules/g2_import/module.info
+++ b/modules/g2_import/module.info
@@ -1,3 +1,3 @@
 name = "Gallery2 Import"
 description = "Import your Gallery 2 content into Gallery 3"
-version = 1
+version = 2
-- 
cgit v1.2.3


From 161366e51d17a3a31fcce79505948c5945603ff3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 21:02:52 -0800
Subject: New controller for remapping Gallery 2 urls to Gallery 3 urls.

---
 modules/g2_import/controllers/g2.php | 73 ++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 modules/g2_import/controllers/g2.php

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
new file mode 100644
index 00000000..f303d604
--- /dev/null
+++ b/modules/g2_import/controllers/g2.php
@@ -0,0 +1,73 @@
+<?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 G2_Controller extends Admin_Controller {
+  /**
+   * Redirect Gallery 2 urls to their appropriate matching Gallery 3 url.
+   *
+   * Inputs look like this:
+   *   /g2/map?url=v/Family/Wedding/IMG_3.jpg.html
+   *   /g2/map?id=1931
+   */
+  public function map() {
+    $input = Input::instance();
+    if ($g2_id = $input->get("id")) {
+      $where = array("g2_id", "=", $g2_id);
+    } else if ($g2_url = $input->get("url")) {
+      $where = array("g2_url", "=", $g2_url);
+    } else {
+      throw new Kohana_404_Exception();
+    }
+
+    $g2_map = ORM::factory("g2_map")
+      ->merge_where(array($where))
+      ->find();
+
+    if (!$g2_map->loaded()) {
+      throw new Kohana_404_Exception();
+    }
+
+    $item = ORM::factory("item")->where("id", "=", $g2_map->g3_id)->find();
+    if (!$item->loaded() || !access::can("view", $item)) {
+      throw new Kohana_404_Exception();
+    }
+
+
+    // Redirect the user to the new url
+    switch ($g2_map->resource_type) {
+    case "thumbnail":
+      url::redirect($item->thumb_url(true));
+
+    case "resize":
+      url::redirect($item->resize_url(true));
+
+    case "full":
+      url::redirect($item->file_url(true));
+
+    case "item":
+    case "album":
+      url::redirect($item->abs_url());
+
+    case "group":
+    case "user":
+    default:
+      throw new Kohana_404_Exception();
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 80e35affcb20e9ec1ded7ae2e750444718f8bffe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 21:56:29 -0800
Subject: Improve the PHPdoc for map()

We now expect to either get query parameters from the Gallery2 url so
we can pick off g2_itemId, or we'll get the rewrite url in the path
query param.
---
 modules/g2_import/controllers/g2.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index f303d604..3e002758 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -21,16 +21,23 @@ class G2_Controller extends Admin_Controller {
   /**
    * Redirect Gallery 2 urls to their appropriate matching Gallery 3 url.
    *
-   * Inputs look like this:
-   *   /g2/map?url=v/Family/Wedding/IMG_3.jpg.html
-   *   /g2/map?id=1931
+   * We use mod_rewrite to create this path, so Gallery2 urls like this:
+   *   /gallery2/v/Family/Wedding.jpg.html
+   *   /gallery2/main.php?g2_view=core.ShowItem&g2_itemId=1234
+   *
+   * Show up here like this:
+   *   /g2/map?path=v/Family/Wedding.jpg.html
+   *   /g2/map?g2_view=core.ShowItem&g2_itemId=1931
    */
   public function map() {
     $input = Input::instance();
-    if ($g2_id = $input->get("id")) {
-      $where = array("g2_id", "=", $g2_id);
-    } else if ($g2_url = $input->get("url")) {
-      $where = array("g2_url", "=", $g2_url);
+    $path = $input->get("path");
+    $id = $input->get("g2_itemId");
+
+    if ($id) {
+      $where = array("g2_id", "=", $id);
+    } else if ($path) {
+      $where = array("g2_url", "=", $path);
     } else {
       throw new Kohana_404_Exception();
     }
-- 
cgit v1.2.3


From c3075d81815ee059658e5cd29ef849ab194ef0fa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 21:58:07 -0800
Subject: Add a code block showing how to add a mod_rewrite block to the old
 Gallery2 install to redirect urls to Gallery 3.

---
 modules/g2_import/views/admin_g2_import.html.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 9a5e3f05..5bac9e9e 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -26,6 +26,7 @@
         </li>
       </ul>
     </div>
+
     <?= $form ?>
 
     <? if (g2_import::is_initialized()): ?>
@@ -91,6 +92,21 @@
         </a>
       </p>
     </div>
+
+    <div>
+      <h2> <?= t("Migrating from Gallery 2") ?> </h2>
+      <p>
+        <?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
+      </p>
+
+      <code>
+        &lt;IfModule mod_rewrite.c&gt;<br/>
+          RewriteEngine On<br/>
+          RewriteBase <?= g2_import::$g2_base_url ?><br/>
+          RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
+        &lt;/IfModule&gt;<br/>
+      </code>
+    </div>
     <? endif ?>
   </div>
 </div>
-- 
cgit v1.2.3


From 0be0111b74c2a971b9c79f1dad29791eabe763b2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 22:11:08 -0800
Subject: Remove an obsolete todo.

---
 modules/g2_import/helpers/g2_import.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 478fd75d..8724ae50 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -396,8 +396,6 @@ class g2_import_Core {
       $g2_album_id, $album->id,
       "album",
       self::g2_url(array("view" => "core.ShowItem", "itemId" => $g2_album->getId())));
-
-    // @todo import album highlights
   }
 
   /**
-- 
cgit v1.2.3


From 1544bea535cd9ef46ffb0c9414fcdb3302d56670 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 Jan 2010 12:46:28 -0800
Subject: Add a tip about deactivating some modules to make importing faster.
 Combine two tips into one.

---
 modules/g2_import/views/admin_g2_import.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 5bac9e9e..ddd7c26f 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -16,10 +16,10 @@
           <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
         </li>
         <li>
-          <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
+          <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
+          <?= t("Deactivating the <b>notification</b>, <b>search</b> and <b>exif</b> modules during your import will make it go faster.") ?>
         </li>
         <li>
           <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
-- 
cgit v1.2.3


From b3023493f4be1c84412cbcce9273da279655ee6e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 Jan 2010 14:00:00 -0800
Subject: Clean the G2 base url so that we can't leak XSS vulnerabilities that
 way (highly unlikely, but now it's impossible).

---
 modules/g2_import/views/admin_g2_import.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/g2_import')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index ddd7c26f..0875e7f7 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -102,7 +102,7 @@
       <code>
         &lt;IfModule mod_rewrite.c&gt;<br/>
           RewriteEngine On<br/>
-          RewriteBase <?= g2_import::$g2_base_url ?><br/>
+          RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/>
           RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
         &lt;/IfModule&gt;<br/>
       </code>
-- 
cgit v1.2.3