From 2b83918efd387dac1b86667a6c9027758dd4dbef Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 23 Dec 2010 23:16:30 -0800
Subject: Fix PHPDoc for composite().

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index 6038a95b..fca18076 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -75,7 +75,7 @@ class gallery_graphics_Core {
   /**
    * Overlay an image on top of the input file.
    *
-   * Valid options are: file, mime_type, position, transparency_percent, padding
+   * Valid options are: file, position, transparency, padding
    *
    * Valid positions: northwest, north, northeast,
    *                  west, center, east,
-- 
cgit v1.2.3


From b5ba61fc53e44d55978dd0d35ada80da4c47715d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 23 Dec 2010 23:34:04 -0800
Subject: Create a way for controllers to exempty themselves from maintenance
 mode and private gallery mode by setting the following constants in the
 controller to true.

  ALLOW_MAINTENANCE_MODE
  ALLOW_PRIVATE_GALLERY

Fixes #1411 and the subsequent refactoring fixes #1551 as well.
---
 modules/digibug/controllers/digibug.php  |  2 +
 modules/gallery/controllers/combined.php |  3 ++
 modules/gallery/controllers/login.php    |  2 +
 modules/gallery/helpers/gallery.php      | 68 ++++++++++++++++++--------------
 modules/rest/controllers/rest.php        |  2 +
 5 files changed, 48 insertions(+), 29 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index bc0c7c5e..22bbe1a6 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Digibug_Controller extends Controller {
+  const ALLOW_PRIVATE_GALLERY = true;
+
   public function print_photo($id) {
     access::verify_csrf();
     $item = ORM::factory("item", $id);
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 4b1a342a..64f8d22b 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Combined_Controller extends Controller {
+  const ALLOW_MAINTENANCE_MODE = true;
+  const ALLOW_PRIVATE_GALLERY = true;
+
   /**
    * Return the combined Javascript bundle associated with the given key.
    */
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 62d33345..adb2e50b 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Login_Controller extends Controller {
+  const ALLOW_MAINTENANCE_MODE = true;
+  const ALLOW_PRIVATE_GALLERY = true;
 
   public function ajax() {
     $view = new View("login_ajax.html");
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 2bb55ccb..69aabc4f 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -25,18 +25,27 @@ class gallery_Core {
    * down for maintenance" page.
    */
   static function maintenance_mode() {
-    // @todo: we need a mechanism here to identify controllers that are still legally accessible
-    // when the entire Gallery is in maintenance mode.  Perhaps a controller class function or
-    // method?
-    // https://sourceforge.net/apps/trac/gallery/ticket/1411
-    if (Router::$controller != "login" &&
-        Router::$controller != "combined" &&
-        module::get_var("gallery", "maintenance_mode", 0) &&
+    if (module::get_var("gallery", "maintenance_mode", 0) &&
         !identity::active_user()->admin) {
-      Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
-      Router::$controller = "login";
-      Router::$controller_path = MODPATH . "gallery/controllers/login.php";
-      Router::$method = "html";
+      try {
+        $class = new ReflectionClass(ucfirst(Router::$controller).'_Controller');
+        $allowed = $class->getConstant("ALLOW_MAINTENANCE_MODE") === true;
+      } catch (ReflectionClass $e) {
+        $allowed = false;
+      }
+      if (!$allowed) {
+        if (Router::$controller == "admin") {
+          // At this point we're in the admin theme and it doesn't have a themed login page, so
+          // we can't just swap in the login controller and have it work.  So redirect back to the
+          // root item where we'll run this code again with the site theme.
+          url::redirect(item::root()->abs_url());
+        } else {
+          Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
+          Router::$controller = "login";
+          Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+          Router::$method = "html";
+        }
+      }
     }
   }
 
@@ -45,26 +54,27 @@ class gallery_Core {
    * the login page.
    */
   static function private_gallery() {
-    // @todo: we need a mechanism here to identify controllers that are still legally accessible
-    // when the entire Gallery is private.  Perhaps a controller class function or method?
-    // https://sourceforge.net/apps/trac/gallery/ticket/1411
-    if (Router::$controller != "login" &&
-        Router::$controller != "combined" &&
-        Router::$controller != "digibug" &&
-        Router::$controller != "rest" &&
-        identity::active_user()->guest &&
+    if (identity::active_user()->guest &&
         !access::user_can(identity::guest(), "view", item::root()) &&
         php_sapi_name() != "cli") {
-      if (Router::$controller == "admin") {
-        // At this point we're in the admin theme and it doesn't have a themed login page, so
-        // we can't just swap in the login controller and have it work.  So redirect back to the
-        // root item where we'll run this code again with the site theme.
-        url::redirect(item::root()->abs_url());
-      } else {
-        Session::instance()->set("continue_url", url::abs_current());
-        Router::$controller = "login";
-        Router::$controller_path = MODPATH . "gallery/controllers/login.php";
-        Router::$method = "html";
+      try {
+        $class = new ReflectionClass(ucfirst(Router::$controller).'_Controller');
+        $allowed = $class->getConstant("ALLOW_PRIVATE_GALLERY") === true;
+      } catch (ReflectionClass $e) {
+        $allowed = false;
+      }
+      if (!$allowed) {
+        if (Router::$controller == "admin") {
+          // At this point we're in the admin theme and it doesn't have a themed login page, so
+          // we can't just swap in the login controller and have it work.  So redirect back to the
+          // root item where we'll run this code again with the site theme.
+          url::redirect(item::root()->abs_url());
+        } else {
+          Session::instance()->set("continue_url", url::abs_current());
+          Router::$controller = "login";
+          Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+          Router::$method = "html";
+        }
       }
     }
   }
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index c4e0fda4..00c7cda2 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Rest_Controller extends Controller {
+  const ALLOW_PRIVATE_GALLERY = true;
+
   public function index() {
     $username = Input::instance()->post("user");
     $password = Input::instance()->post("password");
-- 
cgit v1.2.3


From 11df9f204f110ebb1a82e851a668bbaa4b7560ee Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 24 Dec 2010 01:10:17 -0800
Subject: Added Croatian as hr_HR.  Fixes #1514.

---
 modules/gallery/helpers/locales.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 565e9da8..d06bb319 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -64,6 +64,7 @@ class locales_Core {
   // @todo Might want to add a localizable language name as well.
   // ref: http://cldr.unicode.org/
   // ref: http://cldr.unicode.org/index/cldr-spec/picking-the-right-language-code
+  // ref: http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/likely_subtags.html
   private static function _init_language_data() {
     $l["af_ZA"] = "Afrikaans";                // Afrikaans
     $l["ar_SA"] = "العربية";                   // Arabic
@@ -88,6 +89,7 @@ class locales_Core {
     $l["fr_FR"] = "Français";                 // French
     $l["ga_IE"] = "Gaeilge";                  // Irish
     $l["he_IL"] = "עברית";                    // Hebrew
+    $l["hr_HR"] = "hr̀vātskī";                 // Croatian
     $l["hu_HU"] = "Magyar";                   // Hungarian
     $l["is_IS"] = "Icelandic";                // Icelandic
     $l["it_IT"] = "Italiano";                 // Italian
-- 
cgit v1.2.3


From b42fcb9cda4dafdb9db86770f54965b3fb2fc7ab Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 28 Dec 2010 23:10:05 -0800
Subject: Use db::expr instead of "new Database_Expression".  Resolves #1560.

---
 .../comment/controllers/admin_manage_comments.php  |  2 +-
 modules/digibug/controllers/digibug.php            |  2 +-
 modules/gallery/controllers/admin_maintenance.php  |  2 +-
 modules/gallery/helpers/gallery_installer.php      |  6 +++---
 modules/gallery/helpers/gallery_task.php           |  6 +++---
 modules/gallery/helpers/module.php                 |  2 +-
 modules/gallery/libraries/ORM_MPTT.php             | 22 +++++++++++-----------
 modules/gallery/tests/Gallery_Installer_Test.php   |  2 +-
 modules/notification/helpers/notification.php      |  2 +-
 modules/tag/helpers/tag.php                        |  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index 49bd85d5..ec876fc4 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -25,7 +25,7 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
     db::build()
       ->delete("comments")
       ->where("state", "IN", array("deleted", "spam"))
-      ->where("updated", "<", new Database_Expression("UNIX_TIMESTAMP() - 86400 * 7"))
+      ->where("updated", "<", db::expr("UNIX_TIMESTAMP() - 86400 * 7"))
       ->execute();
 
     // Redirect to the appropriate queue
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 22bbe1a6..c48e3e87 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -114,7 +114,7 @@ class Digibug_Controller extends Controller {
   private function _clean_expired() {
     db::build()
       ->delete("digibug_proxies")
-      ->where("request_date", "<=", new Database_Expression("(CURDATE() - INTERVAL 10 DAY)"))
+      ->where("request_date", "<=", db::expr("(CURDATE() - INTERVAL 10 DAY)"))
       ->limit(20)
       ->execute();
   }
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 7729d797..80247a0f 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -27,7 +27,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
       ->set("state", "stalled")
       ->where("done", "=", 0)
       ->where("state", "<>", "stalled")
-      ->where(new Database_Expression("UNIX_TIMESTAMP(NOW()) - `updated` > 15"))
+      ->where(db::expr("UNIX_TIMESTAMP(NOW()) - `updated` > 15"))
       ->execute();
     $stalled_count = $query->count();
     if ($stalled_count) {
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a6b8e6a2..fb7933f7 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -503,7 +503,7 @@ class gallery_installer {
       foreach (db::build()
                ->from("items")
                ->select("id", "slug")
-               ->where(new Database_Expression("`slug` REGEXP '[^_A-Za-z0-9-]'"), "=", 1)
+               ->where(db::expr("`slug` REGEXP '[^_A-Za-z0-9-]'"), "=", 1)
                ->execute() as $row) {
         $new_slug = item::convert_filename_to_slug($row->slug);
         if (empty($new_slug)) {
@@ -540,7 +540,7 @@ class gallery_installer {
     if ($version == 25) {
       db::build()
         ->update("items")
-        ->set("title", new Database_Expression("`name`"))
+        ->set("title", db::expr("`name`"))
         ->and_open()
         ->where("title", "IS", null)
         ->or_where("title", "=", "")
@@ -581,7 +581,7 @@ class gallery_installer {
       $db->query("ALTER TABLE {modules} ADD COLUMN `weight` int(9) DEFAULT NULL");
       $db->query("ALTER TABLE {modules} ADD KEY (`weight`)");
       db::update("modules")
-        ->set("weight", new Database_Expression("`id`"))
+        ->set("weight", db::expr("`id`"))
         ->execute();
       module::set_version("gallery", $version = 32);
     }
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index e69ff91a..9ccff152 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -74,7 +74,7 @@ class gallery_task_Core {
       // Choose the dirty images in a random order so that if we run this task multiple times
       // concurrently each task is rebuilding different images simultaneously.
       $result = graphics::find_dirty_images_query()->select("id")
-        ->select(new Database_Expression("RAND() as r"))
+        ->select(db::expr("RAND() as r"))
         ->order_by("r", "ASC")
         ->execute();
       $total_count = $task->get("total_count", $result->count());
@@ -608,7 +608,7 @@ class gallery_task_Core {
   static function find_dupe_slugs() {
     return db::build()
       ->select_distinct(
-        array("parent_slug" => new Database_Expression("CONCAT(`parent_id`, ':', LOWER(`slug`))")))
+        array("parent_slug" => db::expr("CONCAT(`parent_id`, ':', LOWER(`slug`))")))
       ->select("id")
       ->select(array("C" => "COUNT(\"*\")"))
       ->from("items")
@@ -620,7 +620,7 @@ class gallery_task_Core {
   static function find_dupe_names() {
     return db::build()
       ->select_distinct(
-        array("parent_name" => new Database_Expression("CONCAT(`parent_id`, ':', LOWER(`name`))")))
+        array("parent_name" => db::expr("CONCAT(`parent_id`, ':', LOWER(`name`))")))
       ->select("id")
       ->select(array("C" => "COUNT(\"*\")"))
       ->from("items")
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 2b446daa..7c5578af 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -488,7 +488,7 @@ class module_Core {
   static function incr_var($module_name, $name, $increment=1) {
     db::build()
       ->update("vars")
-      ->set("value", new Database_Expression("`value` + $increment"))
+      ->set("value", db::expr("`value` + $increment"))
       ->where("module_name", "=", $module_name)
       ->where("name", "=", $name)
       ->execute();
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index f20fafa0..4556273c 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -54,12 +54,12 @@ class ORM_MPTT_Core extends ORM {
         // Make a hole in the parent for this new item
         db::build()
           ->update($this->table_name)
-          ->set("left_ptr", new Database_Expression("`left_ptr` + 2"))
+          ->set("left_ptr", db::expr("`left_ptr` + 2"))
           ->where("left_ptr", ">=", $parent->right_ptr)
           ->execute();
         db::build()
           ->update($this->table_name)
-          ->set("right_ptr", new Database_Expression("`right_ptr` + 2"))
+          ->set("right_ptr", db::expr("`right_ptr` + 2"))
           ->where("right_ptr", ">=", $parent->right_ptr)
           ->execute();
         $parent->right_ptr += 2;
@@ -109,12 +109,12 @@ class ORM_MPTT_Core extends ORM {
     try {
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` - 2"))
+        ->set("left_ptr", db::expr("`left_ptr` - 2"))
         ->where("left_ptr", ">", $this->right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` - 2"))
+        ->set("right_ptr", db::expr("`right_ptr` - 2"))
         ->where("right_ptr", ">", $this->right_ptr)
         ->execute();
     } catch (Exception $e) {
@@ -253,7 +253,7 @@ class ORM_MPTT_Core extends ORM {
         // Update the levels for the to-be-moved items
         db::build()
           ->update($this->table_name)
-          ->set("level", new Database_Expression("`level` + $level_delta"))
+          ->set("level", db::expr("`level` + $level_delta"))
           ->where("left_ptr", ">=", $original_left_ptr)
           ->where("right_ptr", "<=", $original_right_ptr)
           ->execute();
@@ -262,12 +262,12 @@ class ORM_MPTT_Core extends ORM {
       // Make a hole in the target for the move
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` + $size_of_hole"))
+        ->set("left_ptr", db::expr("`left_ptr` + $size_of_hole"))
         ->where("left_ptr", ">=", $target_right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` + $size_of_hole"))
+        ->set("right_ptr", db::expr("`right_ptr` + $size_of_hole"))
         ->where("right_ptr", ">=", $target_right_ptr)
         ->execute();
 
@@ -290,8 +290,8 @@ class ORM_MPTT_Core extends ORM {
       $new_offset = $target->right_ptr - $left_ptr;
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` + $new_offset"))
-        ->set("right_ptr", new Database_Expression("`right_ptr` + $new_offset"))
+        ->set("left_ptr", db::expr("`left_ptr` + $new_offset"))
+        ->set("right_ptr", db::expr("`right_ptr` + $new_offset"))
         ->where("left_ptr", ">=", $left_ptr)
         ->where("right_ptr", "<=", $right_ptr)
         ->execute();
@@ -299,12 +299,12 @@ class ORM_MPTT_Core extends ORM {
       // Close the hole in the source's parent after the move
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` - $size_of_hole"))
+        ->set("left_ptr", db::expr("`left_ptr` - $size_of_hole"))
         ->where("left_ptr", ">", $right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` - $size_of_hole"))
+        ->set("right_ptr", db::expr("`right_ptr` - $size_of_hole"))
         ->where("right_ptr", ">", $right_ptr)
         ->execute();
     } catch (Exception $e) {
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 67e712de..d34c3b0e 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -35,7 +35,7 @@ class Gallery_Installer_Test extends Gallery_Unit_Test_Case {
 
   public function install_creates_root_item_test() {
     $max_right_ptr = ORM::factory("item")
-      ->select(new Database_Expression("MAX(`right_ptr`) AS `right_ptr`"))
+      ->select(db::expr("MAX(`right_ptr`) AS `right_ptr`"))
       ->find()->right_ptr;
     $root = ORM::factory('item')->find(1);
     $this->assert_equal("Gallery", $root->title);
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 0564d336..2ff8ff48 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -160,7 +160,7 @@ class notification {
 
   static function send_pending_notifications() {
     foreach (db::build()
-             ->select(new Database_Expression("DISTINCT `email`"))
+             ->select(db::expr("DISTINCT `email`"))
              ->from("pending_notifications")
              ->execute() as $row) {
       $email = $row->email;
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 14d27c94..bcd3b0c0 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -118,7 +118,7 @@ class tag_Core {
   static function clear_all($item) {
     db::build()
       ->update("tags")
-      ->set("count", new Database_Expression("`count` - 1"))
+      ->set("count", db::expr("`count` - 1"))
       ->where("count", ">", 0)
       ->where("id", "IN", db::build()->select("tag_id")->from("items_tags")->where("item_id", "=", $item->id))
       ->execute();
-- 
cgit v1.2.3


From 440597356d8719bdc6733d2d86aaef5f86d05a1e Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 27 Dec 2010 22:16:29 +0100
Subject: Added changes to installer and upgrader scripts to support INSERT ON
 DUPLICATE KEY UPDATE SYNTAX in cache lib

---
 installer/install.sql                         | 2 +-
 modules/gallery/helpers/gallery_installer.php | 7 ++++++-
 modules/gallery/module.info                   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 427a3283..baee2b9d 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -43,7 +43,7 @@ CREATE TABLE {caches} (
   `expiration` int(9) NOT NULL,
   `cache` longblob,
   PRIMARY KEY (`id`),
-  KEY `key` (`key`),
+  UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index fb7933f7..bf6186a9 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -309,7 +309,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 41);
+    module::set_version("gallery", 42);
   }
 
   static function upgrade($version) {
@@ -642,6 +642,11 @@ class gallery_installer {
       module::clear_var("gallery", "_cache");
       module::set_version("gallery", $version = 41);
     }
+
+    if ($version == 41) {
+      $db->query("ALTER TABLE {caches} DROP INDEX `key`, ADD UNIQUE `key` (`key`)");
+      module::set_version("gallery", $version = 42);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 2b684e5e..0cc3f6d1 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 41
+version = 42
-- 
cgit v1.2.3


From 869bba5e132ceb960b72744fc3ebad5e6af14439 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Tue, 28 Dec 2010 18:42:43 +0100
Subject: Truncating table first againt collides when converting INDEX into
 Unique

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index bf6186a9..cb314527 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -644,6 +644,7 @@ class gallery_installer {
     }
 
     if ($version == 41) {
+      $db->query("TRUNCATE TABLE {caches}");
       $db->query("ALTER TABLE {caches} DROP INDEX `key`, ADD UNIQUE `key` (`key`)");
       module::set_version("gallery", $version = 42);
     }
-- 
cgit v1.2.3


From a8b0254e4a64b46bef303fbf2dafc4d9553ae38f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 29 Dec 2010 17:31:28 -0800
Subject: Improve the solution for #1545 by sorting the settings menu properly
 to be naturally ordered and case insensitive.

---
 modules/gallery/helpers/gallery_event.php | 2 +-
 modules/gallery/libraries/Admin_View.php  | 2 +-
 modules/gallery/libraries/Menu.php        | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 5d3ee6ee..689e21d1 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -377,7 +377,7 @@ class gallery_event_Core {
         module::event("admin_menu", $admin_menu, $theme);
 
         $settings_menu = $admin_menu->get("settings_menu");
-        sort($settings_menu->elements);
+        uasort($settings_menu->elements, array("Menu", "title_comparator"));
       }
     }
   }
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 11f8ad14..bff13ace 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -46,7 +46,7 @@ class Admin_View_Core extends Gallery_View {
     module::event("admin_menu", $menu, $this);
 
     $settings_menu = $menu->get("settings_menu");
-    sort($settings_menu->elements);
+    uasort($settings_menu->elements, array("Menu", "title_comparator"));
 
     return $menu->render();
   }
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 58852a72..78b60196 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -250,4 +250,8 @@ class Menu_Core extends Menu_Element {
     $view->menu = $this;
     return $view;
   }
+
+  static function title_comparator($a, $b) {
+    return strnatcasecmp((string)$a->label, (string)$b->label);
+  }
 }
-- 
cgit v1.2.3


From b26eff7f23b970a7983baf5e211ba88968effb9d Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 3 Jan 2011 15:44:36 +0100
Subject: Bugfix: input validation validates description up to length of 65535
 chars, but DB trimmed data over 2048 chars. Converting column into TEXT type.
 Note: The effective maximum length of a VARCHAR in MySQL 5.0.3 and later is
 subject to the maximum row size (65,535 bytes, which is shared among all
 columns) and the character set used. In contrast to CHAR, VARCHAR values are
 stored as a one-byte or two-byte length prefix plus data. The length prefix
 indicates the number of bytes in the value. A column uses one length byte if
 values require no more than 255 bytes, two length bytes if values may require
 more than 255 bytes.

---
 installer/install.sql                         | 2 +-
 modules/gallery/helpers/gallery_installer.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 2a2bf269..7a0f99c4 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -152,7 +152,7 @@ CREATE TABLE {items} (
   `album_cover_item_id` int(9) DEFAULT NULL,
   `captured` int(9) DEFAULT NULL,
   `created` int(9) DEFAULT NULL,
-  `description` varchar(2048) DEFAULT NULL,
+  `description` TEXT DEFAULT NULL,
   `height` int(9) DEFAULT NULL,
   `left_ptr` int(9) NOT NULL,
   `level` int(9) NOT NULL,
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index cb314527..90d6d4b7 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -309,7 +309,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 42);
+    module::set_version("gallery", 43);
   }
 
   static function upgrade($version) {
@@ -648,6 +648,11 @@ class gallery_installer {
       $db->query("ALTER TABLE {caches} DROP INDEX `key`, ADD UNIQUE `key` (`key`)");
       module::set_version("gallery", $version = 42);
     }
+
+    if ($version == 42) {
+      $db->query("ALTER TABLE {items} CHANGE `description` `description` TEXT DEFAULT NULL");
+      module::set_version("gallery", $version = 43);
+    }
   }
 
   static function uninstall() {
-- 
cgit v1.2.3


From e6a5f39b9113fa9cfc526b873947e365793d4e3e Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 3 Jan 2011 20:07:12 +0100
Subject: case fix

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 90d6d4b7..834a27fa 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -650,7 +650,7 @@ class gallery_installer {
     }
 
     if ($version == 42) {
-      $db->query("ALTER TABLE {items} CHANGE `description` `description` TEXT DEFAULT NULL");
+      $db->query("ALTER TABLE {items} CHANGE `description` `description` text DEFAULT NULL");
       module::set_version("gallery", $version = 43);
     }
   }
-- 
cgit v1.2.3


From d74aad072d8ccca70efb1c8b673e8368566a1974 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 3 Jan 2011 12:25:51 -0800
Subject: Some small follow on fixes for #1559 and #1568: 1) Make database
 changes in gallery_installer::install() instead of    in installer/install.ql
 2) Bump the version number in modules/gallery/module.info

---
 installer/install.sql                         | 4 ++--
 modules/gallery/helpers/gallery_installer.php | 4 ++--
 modules/gallery/module.info                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 84a975ae..6aae8014 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -43,7 +43,7 @@ CREATE TABLE {caches} (
   `expiration` int(9) NOT NULL,
   `cache` longblob,
   PRIMARY KEY (`id`),
-  KEY `key` (`key`),
+  UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -152,7 +152,7 @@ CREATE TABLE {items} (
   `album_cover_item_id` int(9) DEFAULT NULL,
   `captured` int(9) DEFAULT NULL,
   `created` int(9) DEFAULT NULL,
-  `description` varchar(2048) DEFAULT NULL,
+  `description` text,
   `height` int(9) DEFAULT NULL,
   `left_ptr` int(9) NOT NULL,
   `level` int(9) NOT NULL,
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 834a27fa..f7b8da5f 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -44,7 +44,7 @@ class gallery_installer {
                 `expiration` int(9) NOT NULL,
                 `cache` longblob,
                 PRIMARY KEY (`id`),
-                KEY (`key`),
+                UNIQUE KEY (`key`),
                 KEY (`tags`))
                 DEFAULT CHARSET=utf8;");
 
@@ -84,7 +84,7 @@ class gallery_installer {
                  `album_cover_item_id` int(9) default NULL,
                  `captured` int(9) default NULL,
                  `created` int(9) default NULL,
-                 `description` varchar(2048) default NULL,
+                 `description` text default NULL,
                  `height` int(9) default NULL,
                  `left_ptr` int(9) NOT NULL,
                  `level` int(9) NOT NULL,
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 0cc3f6d1..eb579ab6 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 42
+version = 43
-- 
cgit v1.2.3


From 3ec0ba956dced01a97f2ee7bd943d326c42350e3 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sat, 8 Jan 2011 19:39:23 +0100
Subject: Refactored graphics::detect_toolkits() so ImageMagick and
 GraphicsMagick shares the same loop. Just as premarked as todo. Will make
 https://sourceforge.net/apps/trac/gallery/ticket/1555#comment:3 an even
 quicker task

---
 modules/gallery/helpers/graphics.php | 76 ++++++++++++++----------------------
 1 file changed, 29 insertions(+), 47 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index edba6b76..cb48ce82 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -318,55 +318,37 @@ class graphics_Core {
               getenv("PATH"),
               module::get_var("gallery", "extra_binary_paths")));
 
-      // @todo: consider refactoring the two segments below into a loop since they are so
-      // similar.
-
-      // ImageMagick
-      $path = exec("which convert");
-      $toolkits->imagemagick->name = "ImageMagick";
-      if ($path) {
-        if (@is_file($path)) {
-          preg_match('/Version: \S+ (\S+)/', `convert -v`, $matches);
-          $version = $matches[1];
-
-          $toolkits->imagemagick->installed = true;
-          $toolkits->imagemagick->version = $version;
-          $toolkits->imagemagick->binary = $path;
-          $toolkits->imagemagick->dir = dirname($path);
-          $toolkits->imagemagick->rotate = true;
-          $toolkits->imagemagick->sharpen = true;
-        } else {
-          $toolkits->imagemagick->installed = false;
-          $toolkits->imagemagick->error =
-            t("ImageMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
-        }
-      } else {
-        $toolkits->imagemagick->installed = false;
-        $toolkits->imagemagick->error = t("We could not locate ImageMagick on your system.");
-      }
-
-      // GraphicsMagick
-      $path = exec("which gm");
-      $toolkits->graphicsmagick->name = "GraphicsMagick";
-      if ($path) {
-        if (@is_file($path)) {
-          preg_match('/\S+ (\S+)/', `gm version`, $matches);
-          $version = $matches[1];
-
-          $toolkits->graphicsmagick->installed = true;
-          $toolkits->graphicsmagick->version = $version;
-          $toolkits->graphicsmagick->binary = $path;
-          $toolkits->graphicsmagick->dir = dirname($path);
-          $toolkits->graphicsmagick->rotate = true;
-          $toolkits->graphicsmagick->sharpen = true;
+      // ImageMagick & GraphicsMagick
+      $magick_kits = array(
+          "imagemagick" => array(
+              "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v"),
+          "graphicsmagick" => array(
+              "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
+      // Loop through the kits
+      foreach ( $magick_kits as $index => $settings ) {
+        $path = exec("which " . $settings["binary"]);
+        $toolkits->$index->name = $settings["name"];
+        if ($path) {
+          if (@is_file($path)) {
+            preg_match('/Version: \S+ (\S+)/', shell_exec($settings["version"]), $matches);
+            $version = $matches[1];
+
+            $toolkits->$index->installed = true;
+            $toolkits->$index->version = $version;
+            $toolkits->$index->binary = $path;
+            $toolkits->$index->dir = dirname($path);
+            $toolkits->$index->rotate = true;
+            $toolkits->$index->sharpen = true;
+          } else {
+            $toolkits->$index->installed = false;
+            $toolkits->$index->error =
+              t($settings["name"] . " is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+          }
         } else {
-          $toolkits->graphicsmagick->installed = false;
-          $toolkits->graphicsmagick->error =
-            t("GraphicsMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+          $toolkits->$index->installed = false;
+          $toolkits->$index->error =
+            t("We could not locate " . $settings["name"] . " on your system.");
         }
-      } else {
-        $toolkits->graphicsmagick->installed = false;
-        $toolkits->graphicsmagick->error = t("We could not locate GraphicsMagick on your system.");
       }
     }
 
-- 
cgit v1.2.3


From 7dd63630d8f7fc46847388c307ecf160a729aafb Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sat, 8 Jan 2011 19:44:46 +0100
Subject: Minor coding style fix

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cb48ce82..96a6ceba 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -325,7 +325,7 @@ class graphics_Core {
           "graphicsmagick" => array(
               "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
       // Loop through the kits
-      foreach ( $magick_kits as $index => $settings ) {
+      foreach ($magick_kits as $index => $settings) {
         $path = exec("which " . $settings["binary"]);
         $toolkits->$index->name = $settings["name"];
         if ($path) {
-- 
cgit v1.2.3


From e1e1e860cd1b19ebef491f0c0f82a3cd18e63721 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 16:51:25 -0800
Subject: Use the code version when installing a module that has no installer,
 instead of hardcoding version 1.  Fixes #1589.

---
 installer/install.sql              | 2 +-
 modules/gallery/helpers/module.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 09fabc7d..0ed7f2f3 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -247,7 +247,7 @@ CREATE TABLE {modules} (
 INSERT INTO {modules} VALUES (1,1,'gallery',43,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
-INSERT INTO {modules} VALUES (4,1,'organize',1,4);
+INSERT INTO {modules} VALUES (4,1,'organize',3,4);
 INSERT INTO {modules} VALUES (5,1,'info',2,5);
 INSERT INTO {modules} VALUES (6,1,'rss',1,6);
 INSERT INTO {modules} VALUES (7,1,'search',1,7);
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 7c5578af..6efe6162 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -168,7 +168,7 @@ class module_Core {
     if (method_exists($installer_class, "install")) {
       call_user_func_array(array($installer_class, "install"), array());
     } else {
-      module::set_version($module_name, 1);
+      module::set_version($module_name, module::available()->$module_name->code_version);
     }
 
     // Set the weight of the new module, which controls the order in which the modules are
-- 
cgit v1.2.3


From 92f66058d30a04681a01b886bdc652a70652cbfa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 16:58:52 -0800
Subject: Revert "Warn admins after login if their PHP install has the"

This reverts commit 612ddd7050889974fc1f7e449e715b4c1129c0bb.
---
 modules/gallery/helpers/gallery_event.php | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 689e21d1..13a0bdb4 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -178,10 +178,6 @@ class gallery_event_Core {
     }
     Session::instance()->set("active_auth_timestamp", time());
     auth::clear_failed_attempts($user);
-
-    if ($user->admin && ini_get("session.use_trans_sid")) {
-      message::info(t("PHP is configured with <a href=\"url\">session.use_trans_sid</a> enabled which will cause random logouts.  Please disable this setting.", array("url" => "http://www.php.net/manual/en/session.configuration.php#ini.session.use-trans-sid")));
-    }
   }
 
   static function user_auth_failed($name) {
-- 
cgit v1.2.3


From eecb24429115b5f1883971befe0de18ac718fc2a Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 9 Jan 2011 02:06:35 +0100
Subject: Made t() calls parsable by localization scanner

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 96a6ceba..a30699e8 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -342,12 +342,14 @@ class graphics_Core {
           } else {
             $toolkits->$index->installed = false;
             $toolkits->$index->error =
-              t($settings["name"] . " is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+              t("%toolkit_name is installed, but PHP's open_basedir restriction prevents Gallery from using it.",
+                array("toolkit_name" => $settings["name"]));
           }
         } else {
           $toolkits->$index->installed = false;
           $toolkits->$index->error =
-            t("We could not locate " . $settings["name"] . " on your system.");
+            t("We could not locate %toolkit_name on your system.",
+              array("toolkit_name" => $settings["name"]));
         }
       }
     }
-- 
cgit v1.2.3


From 713bd4eb6a9bc91a244680828ce881ee8ea5f836 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Jan 2011 18:10:43 -0800
Subject: Improve gallery::find_file() to do a better job of detecting the
 modules/themes directories. Fixes #1590.

---
 modules/gallery/helpers/gallery.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 69aabc4f..282289b5 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -153,8 +153,15 @@ class gallery_Core {
     if (is_string($file_name)) {
       // make relative to DOCROOT
       $parts = explode("/", $file_name);
+      $count = count($parts);
       foreach ($parts as $idx => $part) {
-        if (in_array($part, array("application", "modules", "themes", "lib"))) {
+        // If this part is "modules" or "themes" make sure that the part 2 after this
+        // is the target directory, and if it is then we're done.  This check makes
+        // sure that if Gallery is installed in a directory called "modules" or "themes"
+        // We don't parse the directory structure incorrectly.
+        if (in_array($part, array("modules", "themes")) &&
+            $idx + 2 < $count &&
+            $parts[$idx + 2] == $directory) {
           break;
         }
         unset($parts[$idx]);
-- 
cgit v1.2.3


From 0d7e951aa5f7329edb25e821de95051668789bcd Mon Sep 17 00:00:00 2001
From: Jérémy Subtil <bigmadwolf@gmail.com>
Date: Sat, 8 Jan 2011 22:57:09 +0100
Subject: Moved item_Model::get_position() method to the Item helper.  It now
 calls the viewable() method on every query.

---
 modules/gallery/helpers/item.php | 85 ++++++++++++++++++++++++++++++++++++++++
 modules/gallery/models/item.php  | 79 ++-----------------------------------
 2 files changed, 89 insertions(+), 75 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 29dd8603..a2d5f74d 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -304,4 +304,89 @@ class item_Core {
       ->where("rand_key", "<", random::percent())
       ->order_by("rand_key", "DESC");
   }
+
+  /**
+   * Find the position of the given item in its parent album.  The resulting
+   * value is 1-indexed, so the first child in the album is at position 1.
+   */
+  static function get_position($item, $where=array()) {
+    $album = $item->parent();
+
+    if (!strcasecmp($album->sort_order, "DESC")) {
+      $comp = ">";
+    } else {
+      $comp = "<";
+    }
+    $query_model = ORM::factory("item");
+
+    // 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 = $query_model->viewable()
+      ->where("parent_id", "=", $album->id)
+      ->where($album->sort_column, "IS", null)
+      ->merge_where($where)
+      ->count_all();
+
+    if (empty($count)) {
+      // There are no NULLs in the sort column, so we can just use it directly.
+      $sort_column = $album->sort_column;
+
+      $position = $query_model->viewable()
+        ->where("parent_id", "=", $album->id)
+        ->where($sort_column, $comp, $item->$sort_column)
+        ->merge_where($where)
+        ->count_all();
+
+      // We stopped short of our target value in the sort (notice that we're
+      // using a < comparator above) because it's possible that we have
+      // duplicate values in the sort column.  An equality check would just
+      // arbitrarily pick one of those multiple possible equivalent columns,
+      // which would mean that if you choose a sort order that has duplicates,
+      // it'd pick any one of them as the child's "position".
+      //
+      // Fix this by doing a 2nd query where we iterate over the equivalent
+      // columns and add them to our base value.
+      foreach ($query_model->viewable()
+               ->select("id")
+               ->where("parent_id", "=", $album->id)
+               ->where($sort_column, "=", $item->$sort_column)
+               ->merge_where($where)
+               ->order_by(array("id" => "ASC"))
+               ->find_all() as $row) {
+        $position++;
+        if ($row->id == $item->id) {
+          break;
+        }
+      }
+    } else {
+      // There are NULLs in the sort column, so we can't use MySQL comparators.
+      // Fall back to iterating over every child row to get to the current one.
+      // This can be wildly inefficient for really large albums, but it should
+      // be a rare case that the user is sorting an album with null values in
+      // the sort column.
+      //
+      // Reproduce the children() functionality here using Database directly to
+      // avoid loading the whole ORM for each row.
+      $order_by = array($album->sort_column => $album->sort_order);
+      // Use id as a tie breaker
+      if ($album->sort_column != "id") {
+        $order_by["id"] = "ASC";
+      }
+
+      $position = 0;
+      foreach ($query_model->viewable()
+               ->select("id")
+               ->where("parent_id", "=", $album->id)
+               ->merge_where($where)
+               ->order_by($order_by)
+               ->find_all() as $row) {
+        $position++;
+        if ($row->id == $item->id) {
+          break;
+        }
+      }
+    }
+
+    return $position;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 88a444b4..47b062b8 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -546,83 +546,12 @@ class Item_Model_Core extends ORM_MPTT {
   /**
    * Find the position of the given child id in this album.  The resulting value is 1-indexed, so
    * the first child in the album is at position 1.
+   *
+   * This method stands as a backward compatibility for gallery 3.0, and will
+   * be deprecated in version 3.1.
    */
   public function get_position($child, $where=array()) {
-    if (!strcasecmp($this->sort_order, "DESC")) {
-      $comp = ">";
-    } else {
-      $comp = "<";
-    }
-    $db = db::build();
-
-    // 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, "IS", null)
-      ->merge_where($where)
-      ->count_records();
-
-    if (empty($count)) {
-      // There are no NULLs in the sort column, so we can just use it directly.
-      $sort_column = $this->sort_column;
-
-      $position = $db->from("items")
-        ->where("parent_id", "=", $this->id)
-        ->where($sort_column, $comp, $child->$sort_column)
-        ->merge_where($where)
-        ->count_records();
-
-      // We stopped short of our target value in the sort (notice that we're using a < comparator
-      // above) because it's possible that we have duplicate values in the sort column.  An
-      // equality check would just arbitrarily pick one of those multiple possible equivalent
-      // columns, which would mean that if you choose a sort order that has duplicates, it'd pick
-      // any one of them as the child's "position".
-      //
-      // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
-      // our base value.
-      foreach ($db
-               ->select("id")
-               ->from("items")
-               ->where("parent_id", "=", $this->id)
-               ->where($sort_column, "=", $child->$sort_column)
-               ->merge_where($where)
-               ->order_by(array("id" => "ASC"))
-               ->execute() as $row) {
-        $position++;
-        if ($row->id == $child->id) {
-          break;
-        }
-      }
-    } else {
-      // There are NULLs in the sort column, so we can't use MySQL comparators.  Fall back to
-      // iterating over every child row to get to the current one.  This can be wildly inefficient
-      // for really large albums, but it should be a rare case that the user is sorting an album
-      // with null values in the sort column.
-      //
-      // Reproduce the children() functionality here using Database directly to avoid loading the
-      // whole ORM for each row.
-      $order_by = array($this->sort_column => $this->sort_order);
-      // Use id as a tie breaker
-      if ($this->sort_column != "id") {
-        $order_by["id"] = "ASC";
-      }
-
-      $position = 0;
-      foreach ($db->select("id")
-               ->from("items")
-               ->where("parent_id", "=", $this->id)
-               ->merge_where($where)
-               ->order_by($order_by)
-               ->execute() as $row) {
-        $position++;
-        if ($row->id == $child->id) {
-          break;
-        }
-      }
-    }
-
-    return $position;
+    return item::get_position($child, $where);
   }
 
   /**
-- 
cgit v1.2.3


From bd6bd029a7c2e0247d4da931c49f3731498cd303 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 14:04:15 -0800
Subject: Fix up the version detecting regex for GraphicsMagick and don't crash
 if the regex doesn't return properly.  Follow on to
 3ec0ba956dced01a97f2ee7bd943d326c42350e3 for ticket #1595.

---
 modules/gallery/helpers/graphics.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a30699e8..29527705 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -321,16 +321,18 @@ class graphics_Core {
       // ImageMagick & GraphicsMagick
       $magick_kits = array(
           "imagemagick" => array(
-              "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v"),
+            "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v",
+            "version_regex" => "/Version: \S+ (\S+)/"),
           "graphicsmagick" => array(
-              "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
+            "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version",
+            "version_regex" => "/\S+ (\S+)/"));
       // Loop through the kits
       foreach ($magick_kits as $index => $settings) {
         $path = exec("which " . $settings["binary"]);
         $toolkits->$index->name = $settings["name"];
         if ($path) {
-          if (@is_file($path)) {
-            preg_match('/Version: \S+ (\S+)/', shell_exec($settings["version"]), $matches);
+          if (@is_file($path) &&
+              preg_match($settings["version_regex"], shell_exec($settings["version"]), $matches)) {
             $version = $matches[1];
 
             $toolkits->$index->installed = true;
-- 
cgit v1.2.3


From 23eaec7063b81d4dae04ec3f5c311a0a2f228a05 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 15:49:15 -0800
Subject: Stop using "which" to find binaries.  Create system::find_binary()
 which traverses the $PATH and returns any executable binary of the
 appropriate name that it can find.  Fixes #1555.

---
 modules/gallery/helpers/graphics.php |  8 ++-----
 modules/gallery/helpers/movie.php    | 14 +++++-------
 modules/gallery/helpers/system.php   | 43 ++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 modules/gallery/helpers/system.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 29527705..18820ed7 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -313,11 +313,6 @@ class graphics_Core {
       $toolkits->graphicsmagick->installed = false;
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
-      gallery::set_path_env(
-        array(module::get_var("gallery", "graphics_toolkit_path"),
-              getenv("PATH"),
-              module::get_var("gallery", "extra_binary_paths")));
-
       // ImageMagick & GraphicsMagick
       $magick_kits = array(
           "imagemagick" => array(
@@ -328,7 +323,8 @@ class graphics_Core {
             "version_regex" => "/\S+ (\S+)/"));
       // Loop through the kits
       foreach ($magick_kits as $index => $settings) {
-        $path = exec("which " . $settings["binary"]);
+        $path = system::find_binary(
+          $settings["binary"], module::get_var("gallery", "graphics_toolkit_path"));
         $toolkits->$index->name = $settings["name"];
         if ($path) {
           if (@is_file($path) &&
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 0895c5f4..dd0b437e 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -83,22 +83,18 @@ class movie_Core {
     }
   }
 
+  /**
+   * Return the path to the ffmpeg binary if one exists and is executable, or null.
+   */
   static function find_ffmpeg() {
     if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
-      gallery::set_path_env(
-        array(module::get_var("gallery", "graphics_toolkit_path"),
-              getenv("PATH"),
-              module::get_var("gallery", "extra_binary_paths")));
-      if (function_exists("exec")) {
-        $ffmpeg_path = exec("which ffmpeg");
-      }
-
+      $ffmpeg_path = system::find_binary(
+        "ffmpeg", module::get_var("gallery", "graphics_toolkit_path"));
       module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
     }
     return $ffmpeg_path;
   }
 
-
   /**
    * Return the width, height, mime_type and extension of the given movie file.
    */
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
new file mode 100644
index 00000000..4a6a3c0f
--- /dev/null
+++ b/modules/gallery/helpers/system.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 system_Core {
+  /**
+   * Return the path to an executable version of the named binary, or null.
+   * Traverse the PATH environment variable looking for the given file.  If
+   * the $priority_path variable is set, check that path first.
+   */
+  static function find_binary($binary, $priority_path=null) {
+    $paths = array_merge(
+      explode(":", getenv("PATH")),
+      explode(":", module::get_var("gallery", "extra_binary_paths")));
+    if ($priority_path) {
+      array_unshift($paths, $priority_path);
+    }
+
+    foreach ($paths as $path) {
+      $candidate = "$path/$binary";
+      // @suppress errors below to avoid open_basedir issues
+      if (@file_exists($candidate) && @is_executable($candidate)) {
+        return $candidate;
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 84e08a62838b0299a5daa7c9cac4be3eca6d0cb1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 01:04:10 -0800
Subject: Don't resize if the target size is the same as the original. Fixes
 #1602.

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index fca18076..4cd7143e 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -56,7 +56,7 @@ class gallery_graphics_Core {
     }
 
     $dims = getimagesize($input_file);
-    if (max($dims[0], $dims[1]) < min($options["width"], $options["height"])) {
+    if (max($dims[0], $dims[1]) <= min($options["width"], $options["height"])) {
       // Image would get upscaled; do nothing
       copy($input_file, $output_file);
     } else {
-- 
cgit v1.2.3


From 049f2af1c982bb12fee6e5512e4830f63d06d343 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Wed, 12 Jan 2011 00:05:11 +0100
Subject: Returning 2 flags from l10n_client::validate_api_key(), 1 to reflect
 if connection was built up properly (just a boolean, not distuingishing
 between reasons in case of a failure), the other to reflect API validating
 success status. Using this presenting a slightly more meaningfull error msg
 to user in case the connection would fail. Fixes Ticket #1504

---
 modules/gallery/controllers/admin_languages.php | 11 +++++++----
 modules/gallery/helpers/l10n_client.php         |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 573ededf..e9be2a88 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -74,9 +74,11 @@ class Admin_Languages_Controller extends Admin_Controller {
 
   private function _save_api_key($form) {
     $new_key = $form->sharing->api_key->value;
-    if ($new_key && !l10n_client::validate_api_key($new_key)) {
-      $form->sharing->api_key->add_error("invalid", 1);
-      $valid = false;
+    if ($new_key) {
+      list($connected, $valid) = l10n_client::validate_api_key($new_key);
+      if (!$valid) {
+        $form->sharing->api_key->add_error($connected ? "invalid" : "noconn", 1);
+      }
     } else {
       $valid = true;
     }
@@ -119,7 +121,8 @@ class Admin_Languages_Controller extends Admin_Controller {
                   array("server-link" => html::mark_clean(html::anchor($server_link))))
               : t("API key"))
       ->value($api_key)
-      ->error_messages("invalid", t("The API key you provided is invalid."));
+      ->error_messages("invalid", t("The API key you provided is invalid."))
+      ->error_messages("noconn", t("Could not connect to remote server to validate the API key."));
     $group->submit("save")->value(t("Save settings"));
     if ($api_key && $this->_outgoing_translations_count()) {
       // TODO: UI improvement: hide API key / save button when API key is set.
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 8c2685a8..2af5c8d0 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -60,10 +60,14 @@ class l10n_client_Core {
                   "client_token" => l10n_client::client_token(),
                   "signature" => $signature,
                   "uid" => l10n_client::server_uid($api_key)));
+    if (!isset($response_data) && !isset($response_status)) {
+      return array(false, false);
+    }
+
     if (!remote::success($response_status)) {
-      return false;
+      return array(true, false);
     }
-    return true;
+    return array(true, true);
   }
 
   /**
-- 
cgit v1.2.3


From 92db7f42181f6582763e7b5c56b18b989b061e21 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 15:23:20 -0800
Subject: Update some comments.

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index a2d5f74d..8aa14934 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -308,6 +308,9 @@ class item_Core {
   /**
    * Find the position of the given item in its parent album.  The resulting
    * value is 1-indexed, so the first child in the album is at position 1.
+   *
+   * @param Item_Model $item
+   * @param array      $where an array of arrays, each compatible with ORM::where()
    */
   static function get_position($item, $where=array()) {
     $album = $item->parent();
@@ -338,14 +341,14 @@ class item_Core {
         ->count_all();
 
       // We stopped short of our target value in the sort (notice that we're
-      // using a < comparator above) because it's possible that we have
+      // using a inequality comparator above) because it's possible that we have
       // duplicate values in the sort column.  An equality check would just
       // arbitrarily pick one of those multiple possible equivalent columns,
       // which would mean that if you choose a sort order that has duplicates,
       // it'd pick any one of them as the child's "position".
       //
       // Fix this by doing a 2nd query where we iterate over the equivalent
-      // columns and add them to our base value.
+      // columns and add them to our position count.
       foreach ($query_model->viewable()
                ->select("id")
                ->where("parent_id", "=", $album->id)
-- 
cgit v1.2.3


From ee53744aa73b06f262122b6236014618fe6d742c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 16:59:57 -0800
Subject: Two improvements to Joe's fix for #1504: 1) Trap all exceptions, eg
 dns or connectivity issues and    report back in the form (but put the stack
 trace in the logs) 2) Rename "noconn" to "no_connection"

---
 modules/gallery/controllers/admin_languages.php |  5 +++--
 modules/gallery/helpers/l10n_client.php         | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index e9be2a88..f96a0eb7 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -77,7 +77,7 @@ class Admin_Languages_Controller extends Admin_Controller {
     if ($new_key) {
       list($connected, $valid) = l10n_client::validate_api_key($new_key);
       if (!$valid) {
-        $form->sharing->api_key->add_error($connected ? "invalid" : "noconn", 1);
+        $form->sharing->api_key->add_error($connected ? "invalid" : "no_connection", 1);
       }
     } else {
       $valid = true;
@@ -122,7 +122,8 @@ class Admin_Languages_Controller extends Admin_Controller {
               : t("API key"))
       ->value($api_key)
       ->error_messages("invalid", t("The API key you provided is invalid."))
-      ->error_messages("noconn", t("Could not connect to remote server to validate the API key."));
+      ->error_messages(
+        "no_connection", t("Could not connect to remote server to validate the API key."));
     $group->submit("save")->value(t("Save settings"));
     if ($api_key && $this->_outgoing_translations_count()) {
       // TODO: UI improvement: hide API key / save button when API key is set.
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 2af5c8d0..8fc66b68 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -55,11 +55,16 @@ class l10n_client_Core {
     $url = self::_server_url("status");
     $signature = self::_sign($version, $api_key);
 
-    list ($response_data, $response_status) = remote::post(
-      $url, array("version" => $version,
-                  "client_token" => l10n_client::client_token(),
-                  "signature" => $signature,
-                  "uid" => l10n_client::server_uid($api_key)));
+    try {
+      list ($response_data, $response_status) = remote::post(
+        $url, array("version" => $version,
+                    "client_token" => l10n_client::client_token(),
+                    "signature" => $signature,
+                    "uid" => l10n_client::server_uid($api_key)));
+    } catch (ErrorException $e) {
+      // Log the error, but then return a "can't make connection" error
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+    }
     if (!isset($response_data) && !isset($response_status)) {
       return array(false, false);
     }
-- 
cgit v1.2.3