From e90493aab36e42e0a69a24a8b1f27e4736e32d20 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 2 Mar 2011 21:11:49 -0700
Subject: Translate user Web Site label. Link web site on user profile page.

---
 modules/gallery/helpers/gallery_event.php | 6 ++++--
 1 file changed, 4 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 07817187..fbdb4ad5 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -539,9 +539,9 @@ class gallery_event_Core {
     $v = new View("user_profile_info.html");
 
     $fields = array("name" => t("Name"), "locale" => t("Language Preference"),
-                    "email" => t("Email"), "full_name" => t("Full name"), "url" => "Web site");
+                    "email" => t("Email"), "full_name" => t("Full name"), "url" => t("Web site"));
     if (!$data->user->guest) {
-      $fields = array("name" => t("Name"), "full_name" => t("Full name"), "url" => "Web site");
+      $fields = array("name" => t("Name"), "full_name" => t("Full name"), "url" => t("Web site"));
     }
     $v->user_profile_data = array();
     foreach ($fields as $field => $label) {
@@ -549,6 +549,8 @@ class gallery_event_Core {
         $value = $data->user->$field;
         if ($field == "locale") {
           $value = locales::display_name($value);
+        } elseif ($field == "url") {
+          $value = html::mark_clean(html::anchor($data->user->$field));
         }
         $v->user_profile_data[(string) $label] = $value;
       }
-- 
cgit v1.2.3


From fa6f233603267505c216abc4f12663d245cd23e7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 27 Mar 2011 11:31:34 -0700
Subject: Centralize our encoding code into a new helpers and use
 mb_convert_encoding if possible.  Build on the work in
 c791ae96d5bb28f39b26a0e556e10e636f97436c by momo-i.  Fixes #1660.

---
 modules/exif/helpers/exif.php        | 20 ++------------------
 modules/gallery/helpers/encoding.php | 32 ++++++++++++++++++++++++++++++++
 modules/tag/helpers/tag_event.php    |  5 +----
 3 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 modules/gallery/helpers/encoding.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index f752d336..a35a2141 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -36,15 +36,7 @@ class exif_Core {
         foreach(self::_keys() as $field => $exifvar) {
           if (isset($exif_raw[$exifvar[0]][$exifvar[1]])) {
             $value = $exif_raw[$exifvar[0]][$exifvar[1]];
-            if (function_exists("mb_detect_encoding") &&
-                function_exists("mb_convert_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-            }
-            else if (function_exists("mb_detect_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = utf8_encode($value);
-            }
+            $value = encoding::convert_to_utf8($value);
             $keys[$field] = Input::clean($value);
 
             if ($field == "DateTime") {
@@ -65,15 +57,7 @@ class exif_Core {
         foreach (array("Keywords" => "2#025", "Caption" => "2#120") as $keyword => $iptc_key) {
           if (!empty($iptc[$iptc_key])) {
             $value = implode(" ", $iptc[$iptc_key]);
-            if (function_exists("mb_detect_encoding") &&
-                function_exists("mb_convert_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-            }
-            else if (function_exists("mb_detect_encoding") &&
-                mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-              $value = utf8_encode($value);
-            }
+            $value = encoding::convert_to_utf8($value);
             $keys[$keyword] = Input::clean($value);
 
             if ($keyword == "Caption" && !$item->description) {
diff --git a/modules/gallery/helpers/encoding.php b/modules/gallery/helpers/encoding.php
new file mode 100644
index 00000000..c5928634
--- /dev/null
+++ b/modules/gallery/helpers/encoding.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 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 encoding_Core {
+  static function convert_to_utf8($value) {
+    if (function_exists("mb_detect_encoding") &&
+        function_exists("mb_convert_encoding") &&
+        mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
+      $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
+    } else if (function_exists("mb_detect_encoding") &&
+               mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
+      $value = utf8_encode($value);
+    }
+    return $value;
+  }
+}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index cd79f734..efef916f 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -36,10 +36,7 @@ class tag_event_Core {
             $tag = str_replace("\0",  "", $tag);
             foreach (explode(",", $tag) as $word) {
               $word = trim($word);
-              if (function_exists("mb_detect_encoding") &&
-                  mb_detect_encoding($word, "ISO-8859-1, UTF-8") != "UTF-8") {
-                $word = utf8_encode($word);
-              }
+              $word = encoding::convert_to_utf8($word);
               $tags[$word] = 1;
             }
           }
-- 
cgit v1.2.3


From 916b7543d13bf33ca704dab18ba3d1eca13d9624 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 10 Apr 2011 13:46:28 -0700
Subject: Gracefully degrade in the case where the .build_number file is
 missing.  Fixes #1673.

---
 modules/gallery/helpers/gallery.php                  | 16 +++++++++++-----
 modules/gallery/helpers/gallery_block.php            |  1 +
 modules/gallery/views/upgrade_checker_block.html.php |  4 +++-
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 1fafdef7..cbd9b33c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -193,19 +193,25 @@ class gallery_Core {
    */
   static function version_string() {
     if (gallery::RELEASE_CHANNEL == "git") {
+      $build_number = gallery::build_number();
       return sprintf(
-        "%s (branch %s build %s)", gallery::VERSION, gallery::RELEASE_BRANCH,
-        gallery::build_number());
+        "%s (branch %s, %s)", gallery::VERSION, gallery::RELEASE_BRANCH,
+        $build_number ? " build $build_number" : "unknown build number");
     } else {
       return sprintf("%s (%s)", gallery::VERSION, gallery::CODE_NAME);
     }
   }
 
   /**
-   * Return the contents of the .build_number file, which should be a single integer.
+   * Return the contents of the .build_number file, which should be a single integer
+   * or return null if the .build_number file is missing.
    */
   static function build_number() {
-    $result = parse_ini_file(DOCROOT . ".build_number");
-    return $result["build_number"];
+    $build_file = DOCROOT . ".build_number";
+    if (file_exists($build_file))  {
+      $result = parse_ini_file(DOCROOT . ".build_number");
+      return $result["build_number"];
+    }
+    return null;
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b9ccf25b..0ba7c936 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -112,6 +112,7 @@ class gallery_block_Core {
       $block->content->version_info = upgrade_checker::version_info();
       $block->content->auto_check_enabled = upgrade_checker::auto_check_enabled();
       $block->content->new_version = upgrade_checker::get_upgrade_message();
+      $block->content->build_number = gallery::build_number();
     }
     return $block;
   }
diff --git a/modules/gallery/views/upgrade_checker_block.html.php b/modules/gallery/views/upgrade_checker_block.html.php
index b04887b2..c984d99f 100644
--- a/modules/gallery/views/upgrade_checker_block.html.php
+++ b/modules/gallery/views/upgrade_checker_block.html.php
@@ -6,8 +6,10 @@
 <p>
   <? if (gallery::RELEASE_CHANNEL == "release"): ?>
   <?= t("You are using the official Gallery %version release, code named <i>%code_name</i>.", array("version" => gallery::VERSION, "code_name" => gallery::CODE_NAME)) ?>
+  <? elseif (isset($build_number)): ?>
+  <?= t("You are using an experimental snapshot of Gallery %version (build %build_number on branch %branch).", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => $build_number)) ?>
   <? else: ?>
-  <?= t("You are using an experimental snapshot of Gallery %version (build %build_number on branch %branch).", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => gallery::build_number())) ?>
+  <?= t("You are using an experimental snapshot of Gallery %version (branch %branch) but your gallery3/.build_number file is missing so we don't know what build you have.  You should probably upgrade so that you have that file.", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => $build_number)) ?>
   <? endif ?>
 </p>
 
-- 
cgit v1.2.3


From 08a6df2274ea196056eb7441d4aff050dc3531fa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 21 Apr 2011 15:50:53 -0700
Subject: Normally Router::find_uri() strips off the url suffix for us, but
 when we make the theme::$is_admin determination we're working off of the
 PATH_INFO so we need to strip it off manually.  Fixes #1631.

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index f285834c..a42fa7ad 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -41,6 +41,13 @@ class theme_Core {
 
     $config = Kohana_Config::instance();
     $modules = $config->get("core.modules");
+
+    // Normally Router::find_uri() strips off the url suffix for us, but we're working off of the
+    // PATH_INFO here so we need to strip it off manually
+    if ($suffix = Kohana::config("core.url_suffix")) {
+      $path = preg_replace("#" . preg_quote($suffix) . "$#u", "", $path);
+    }
+
     self::$is_admin = $path == "/admin" || !strncmp($path, "/admin/", 7);
     self::$site_theme_name = module::get_var("gallery", "active_site_theme");
     if (self::$is_admin) {
-- 
cgit v1.2.3


From 11703b24ffdf38443ac46afbfa65e6f07ec5648e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Apr 2011 09:28:19 -0700
Subject: Detect if the users theme is missing (or missing a theme.info) and in
 that case fall back to the wind theme.  Fixes #1655.

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index a42fa7ad..37707f28 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -50,9 +50,25 @@ class theme_Core {
 
     self::$is_admin = $path == "/admin" || !strncmp($path, "/admin/", 7);
     self::$site_theme_name = module::get_var("gallery", "active_site_theme");
+
+    // If the site theme doesn't exist, fall back to wind.
+    if (!file_exists(THEMEPATH . self::$site_theme_name . "/theme.info")) {
+      site_status::error(t("Theme '%name' is missing.  Falling back to the Wind theme.",
+                           array("name" => self::$site_theme_name)), "missing_site_theme");
+      module::set_var("gallery", "active_site_theme", self::$site_theme_name = "wind");
+    }
+
     if (self::$is_admin) {
       // Load the admin theme
       self::$admin_theme_name = module::get_var("gallery", "active_admin_theme");
+
+      // If the admin theme doesn't exist, fall back to admin_wind.
+      if (!file_exists(THEMEPATH . self::$admin_theme_name . "/theme.info")) {
+        site_status::error(t("Admin theme '%name' is missing!  Falling back to the Wind theme.",
+                             array("name" => self::$admin_theme_name)), "missing_admin_theme");
+        module::set_var("gallery", "active_admin_theme", self::$admin_theme_name = "admin_wind");
+      }
+
       array_unshift($modules, THEMEPATH . self::$admin_theme_name);
 
       // If the site theme has an admin subdir, load that as a module so that
-- 
cgit v1.2.3


From 4a9b45c9c3bbd574103e01debcd84cab1a18352a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 22 Apr 2011 12:37:28 -0400
Subject: Created apple-touch-icon and added to wind and admin_wind themes.

---
 installer/install.sql                               |   1 +
 lib/images/apple-touch-icon.png                     | Bin 0 -> 4441 bytes
 modules/gallery/controllers/admin_theme_options.php |   4 ++++
 modules/gallery/helpers/gallery_installer.php       |   8 +++++++-
 modules/gallery/helpers/gallery_theme.php           |   5 ++++-
 modules/gallery/module.info                         |   2 +-
 themes/admin_wind/views/admin.html.php              |   2 ++
 themes/wind/views/page.html.php                     |   3 ++-
 8 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 lib/images/apple-touch-icon.png

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 77cda72b..06d2fcde 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -406,6 +406,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico');
+INSERT INTO {vars} VALUES (NULL,'gallery','apple_touch_url','lib/images/apple-touch-icon.png');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
diff --git a/lib/images/apple-touch-icon.png b/lib/images/apple-touch-icon.png
new file mode 100644
index 00000000..d15ce1a6
Binary files /dev/null and b/lib/images/apple-touch-icon.png differ
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 055e063c..840b3b3d 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -59,6 +59,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
       module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
       module::set_var("gallery", "favicon_url", $form->edit_theme->favicon_url->value);
+      module::set_var("gallery", "apple_touch_url", $form->edit_theme->apple_touch_url->value);
 
       module::event("theme_edit_form_completed", $form);
 
@@ -93,6 +94,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $group->input("favicon_url")->label(t("URL (or relative path) to your favicon.ico"))
       ->id("g-favicon")
       ->value(module::get_var("gallery", "favicon_url"));
+    $group->input("apple_touch_url")->label(t("URL (or relative path) to your Apple Touch icon"))
+      ->id("g-apple-touch")
+      ->value(module::get_var("gallery", "apple_touch_url"));
     $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
       ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 01c59eaa..cd9526b1 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -304,6 +304,7 @@ class gallery_installer {
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
+    module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
     module::set_var("gallery", "email_from", "");
     module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
@@ -311,7 +312,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", 46);
+    module::set_version("gallery", 47);
   }
 
   static function upgrade($version) {
@@ -677,6 +678,11 @@ class gallery_installer {
       module::set_var("gallery", "upgrade_checker_auto_enabled", true);
       module::set_version("gallery", $version = 46);
     }
+
+    if ($version == 46) {
+      module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
+      module::set_version("gallery", $version = 47);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index c4a82390..aa3fb7bb 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -60,11 +60,14 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $buf .= $theme->css("debug.css");
     }
+    if (in_array(URI::instance()->segment(1), array("admin", "admin/dashboard"))) {
+      $buf .= $theme->script("jquery.jcarousel.min.js");
+    }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= $theme->css("l10n_client.css");
       $buf .= $theme->script("jquery.cookie.js");
-      $buf .=$theme->script("l10n_client.js");
+      $buf .= $theme->script("l10n_client.js");
     }
     return $buf;
   }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 4c0c8866..aa1dc341 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 46
+version = 47
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index a56b6f41..0d35ac97 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -15,6 +15,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
 
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 2b86556d..8b9ddf8a 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -21,7 +21,8 @@
     <link rel="shortcut icon"
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
-
+    <link rel="apple-touch-icon-precomposed"
+          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
-- 
cgit v1.2.3


From 3bce5d00eef5cd6c255ab63bd7391de4557a1784 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 22 Apr 2011 12:50:21 -0400
Subject: Renamed apple_touch_url to apple_touch_icon_url.

---
 installer/install.sql                               | 2 +-
 modules/gallery/controllers/admin_theme_options.php | 6 +++---
 modules/gallery/helpers/gallery_installer.php       | 4 ++--
 themes/admin_wind/views/admin.html.php              | 2 +-
 themes/wind/views/page.html.php                     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 06d2fcde..c45b421b 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -406,7 +406,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico');
-INSERT INTO {vars} VALUES (NULL,'gallery','apple_touch_url','lib/images/apple-touch-icon.png');
+INSERT INTO {vars} VALUES (NULL,'gallery','apple_touch_icon_url','lib/images/apple-touch-icon.png');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 840b3b3d..cb46da90 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -59,7 +59,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
       module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
       module::set_var("gallery", "favicon_url", $form->edit_theme->favicon_url->value);
-      module::set_var("gallery", "apple_touch_url", $form->edit_theme->apple_touch_url->value);
+      module::set_var("gallery", "apple_touch_icon_url", $form->edit_theme->apple_touch_icon_url->value);
 
       module::event("theme_edit_form_completed", $form);
 
@@ -94,9 +94,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $group->input("favicon_url")->label(t("URL (or relative path) to your favicon.ico"))
       ->id("g-favicon")
       ->value(module::get_var("gallery", "favicon_url"));
-    $group->input("apple_touch_url")->label(t("URL (or relative path) to your Apple Touch icon"))
+    $group->input("apple_touch_icon_url")->label(t("URL (or relative path) to your Apple Touch icon"))
       ->id("g-apple-touch")
-      ->value(module::get_var("gallery", "apple_touch_url"));
+      ->value(module::get_var("gallery", "apple_touch_icon_url"));
     $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
       ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index cd9526b1..20de1fea 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -304,7 +304,7 @@ class gallery_installer {
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
-    module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
+    module::set_var("gallery", "apple_touch_icon_url", "lib/images/apple-touch-icon.png");
     module::set_var("gallery", "email_from", "");
     module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
@@ -680,7 +680,7 @@ class gallery_installer {
     }
 
     if ($version == 46) {
-      module::set_var("gallery", "apple_touch_url", "lib/images/apple-touch-icon.png");
+      module::set_var("gallery", "apple_touch_icon_url", "lib/images/apple-touch-icon.png");
       module::set_version("gallery", $version = 47);
     }
   }
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 0d35ac97..12301e02 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -16,7 +16,7 @@
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
     <link rel="apple-touch-icon-precomposed"
-          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
+          href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
 
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 8b9ddf8a..1c67ff9d 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -22,7 +22,7 @@
           href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
           type="image/x-icon" />
     <link rel="apple-touch-icon-precomposed"
-          href="<?= url::file(module::get_var("gallery", "apple_touch_url")) ?>" />
+          href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
-- 
cgit v1.2.3


From 7deed8654549690ec7d5c7d9dd5ad479d9f0fdd8 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 22 Apr 2011 12:54:25 -0400
Subject: Removed incomplete jquery carousel code

---
 modules/gallery/helpers/gallery_theme.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index aa3fb7bb..e07839d9 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -60,9 +60,6 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $buf .= $theme->css("debug.css");
     }
-    if (in_array(URI::instance()->segment(1), array("admin", "admin/dashboard"))) {
-      $buf .= $theme->script("jquery.jcarousel.min.js");
-    }
 
     if ($session->get("l10n_mode", false)) {
       $buf .= $theme->css("l10n_client.css");
-- 
cgit v1.2.3


From 526859d9605d137ebe053ecbd80f46ca6a331194 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Apr 2011 13:56:32 -0700
Subject: Do simple transliteration when converting filenames to slugs, but
 check to see if the transliteration module is available and use a more
 complex transliteration if possible.  Fixes #1668.

---
 modules/gallery/helpers/item.php           | 12 +++++++++++-
 modules/gallery/models/item.php            |  4 +---
 modules/gallery/tests/Item_Helper_Test.php |  4 ++++
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 1a5c631e..7e779544 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -152,8 +152,18 @@ class item_Core {
    * @param string $filename
    */
   static function convert_filename_to_slug($filename) {
-    $result = pathinfo($filename, PATHINFO_FILENAME);
+    $result = str_replace("&", "-and-", $filename);
+    $result = str_replace(" ", "-", $result);
+
+    // It's not easy to extend the text helper since it's called by the Input class which is
+    // referenced in hooks/init_gallery, so it's
+    if (class_exists("transliterate")) {
+      $result = transliterate::utf8_to_ascii($result);
+    } else {
+      $result = text::transliterate_to_ascii($result);
+    }
     $result = preg_replace("/[^A-Za-z0-9-_]+/", "-", $result);
+    $result = preg_replace("/-+/", "-", $result);
     return trim($result, "-");
   }
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 8f4bc5e4..f46db696 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -336,9 +336,7 @@ class Item_Model_Core extends ORM_MPTT {
 
         // Make an url friendly slug from the name, if necessary
         if (empty($this->slug)) {
-          $tmp = pathinfo($this->name, PATHINFO_FILENAME);
-          $tmp = preg_replace("/[^A-Za-z0-9-_]+/", "-", $tmp);
-          $this->slug = trim($tmp, "-");
+          $this->slug = item::convert_filename_to_slug($this->name);
 
           // If the filename is all invalid characters, then the slug may be empty here.  Pick a
           // random value.
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 4d5aed41..2fde7cc0 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -49,6 +49,10 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
   public function convert_filename_to_slug_test() {
     $this->assert_equal("foo", item::convert_filename_to_slug("{[foo]}"));
     $this->assert_equal("foo-bar", item::convert_filename_to_slug("{[foo!@#!$@#^$@($!(@bar]}"));
+    $this->assert_equal("english-text", item::convert_filename_to_slug("english text"));
+    $this->assert_equal("new-line", item::convert_filename_to_slug("new \n line"));
+    $this->assert_equal("foo-and-bar", item::convert_filename_to_slug("foo&bar"));
+    $this->assert_equal("special", item::convert_filename_to_slug("šṗëçîąļ"));
   }
 
   public function move_test() {
-- 
cgit v1.2.3


From 6f916e49d5b431c2c1961a13d1a61fef8c02d628 Mon Sep 17 00:00:00 2001
From: Andy Lindeman <andy@highgroove.com>
Date: Fri, 22 Apr 2011 18:15:17 -0400
Subject: Allow timezone to be configurable

* Fixes #1637
* New advanced setting gallery/timezone
* Default setting comes from PHP
---
 modules/gallery/config/locale.php             | 8 ++------
 modules/gallery/helpers/gallery_installer.php | 7 +++++++
 modules/gallery/module.info                   | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 0509e45f..13de9098 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -29,14 +29,10 @@
 $config['language'] = array('en_US', 'English_United States');
 
 /**
- * Locale timezone. Defaults to use the server timezone.
+ * Locale timezone.  Set in 'Advanced' settings, falling back to the server's zone.
  * @see http://php.net/timezones
  */
-$config['timezone'] = ini_get('date.timezone');
-if (empty($config['timezone'])) {
-  // This is a required field.  Pick something as a default.
-  $config['timezone'] = "America/Los_Angeles";
-}
+$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
 
 // i18n settings
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 20de1fea..2cb04356 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -683,6 +683,13 @@ class gallery_installer {
       module::set_var("gallery", "apple_touch_icon_url", "lib/images/apple-touch-icon.png");
       module::set_version("gallery", $version = 47);
     }
+
+    if ($version == 47) {
+      // Add configuration variable to set timezone.  Defaults to the currently
+      // used timezone (from PHP configuration).
+      module::set_var("gallery", "timezone", Kohana::config('locale.timezone'));
+      module::set_version("gallery", $version = 48);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index aa1dc341..807d08fd 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 47
+version = 48
-- 
cgit v1.2.3


From c2a38087dcd77bf8c1e7a5ff81692502bdb3ff59 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Apr 2011 16:52:48 -0700
Subject: A few more fixes for #1637: - Update gallery_installer::install() to
 set the version to 48 and   set the timezone - Rebuild installer.sql

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

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index ff29e1a0..de5250d1 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS {access_caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -13,11 +13,11 @@ CREATE TABLE {access_caches} (
   PRIMARY KEY (`id`),
   KEY `item_id` (`item_id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_caches} VALUES (1,1,'1','0','0','1','0','0');
 DROP TABLE IF EXISTS {access_intents};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_intents} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -31,11 +31,11 @@ CREATE TABLE {access_intents} (
   `add_2` binary(1) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_intents} VALUES (1,1,'1','1','0','0','1','1','0','0');
 DROP TABLE IF EXISTS {caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) NOT NULL,
@@ -46,10 +46,10 @@ CREATE TABLE {caches} (
   UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {comments};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {comments} (
   `author_id` int(9) DEFAULT NULL,
   `created` int(9) NOT NULL,
@@ -75,10 +75,10 @@ CREATE TABLE {comments} (
   `updated` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {failed_auths};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {failed_auths} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `count` int(9) NOT NULL,
@@ -86,10 +86,10 @@ CREATE TABLE {failed_auths} (
   `time` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {graphics_rules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {graphics_rules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -100,12 +100,12 @@ CREATE TABLE {graphics_rules} (
   `target` varchar(32) NOT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'thumb');
 INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:640;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` char(64) DEFAULT NULL,
@@ -113,25 +113,25 @@ CREATE TABLE {groups} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups} VALUES (1,'Everybody',1);
 INSERT INTO {groups} VALUES (2,'Registered Users',1);
 DROP TABLE IF EXISTS {groups_users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups_users} (
   `group_id` int(9) NOT NULL,
   `user_id` int(9) NOT NULL,
   PRIMARY KEY (`group_id`,`user_id`),
   UNIQUE KEY `user_id` (`user_id`,`group_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups_users} VALUES (1,1);
 INSERT INTO {groups_users} VALUES (1,2);
 INSERT INTO {groups_users} VALUES (2,2);
 DROP TABLE IF EXISTS {incoming_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {incoming_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` char(32) NOT NULL,
@@ -143,10 +143,10 @@ CREATE TABLE {incoming_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {items};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `album_cover_item_id` int(9) DEFAULT NULL,
@@ -188,11 +188,11 @@ CREATE TABLE {items} (
   KEY `weight` (`weight`),
   KEY `left_ptr` (`left_ptr`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,2,0,NULL,'','',1,NULL,NULL,2,NULL,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
 DROP TABLE IF EXISTS {items_tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items_tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) NOT NULL,
@@ -201,10 +201,10 @@ CREATE TABLE {items_tags} (
   KEY `tag_id` (`tag_id`,`id`),
   KEY `item_id` (`item_id`,`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {logs};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {logs} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `category` varchar(64) DEFAULT NULL,
@@ -217,10 +217,10 @@ CREATE TABLE {logs} (
   `user_id` int(9) DEFAULT '0',
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {messages};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {messages} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) DEFAULT NULL,
@@ -229,10 +229,10 @@ CREATE TABLE {messages} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `key` (`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {modules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {modules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -243,8 +243,8 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`),
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',47,1);
+/*!40101 SET character_set_client = @saved_cs_client */;
+INSERT INTO {modules} VALUES (1,1,'gallery',48,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',4,3);
 INSERT INTO {modules} VALUES (4,1,'organize',4,4);
@@ -254,8 +254,8 @@ INSERT INTO {modules} VALUES (7,1,'search',1,7);
 INSERT INTO {modules} VALUES (8,1,'slideshow',2,8);
 INSERT INTO {modules} VALUES (9,1,'tag',3,9);
 DROP TABLE IF EXISTS {outgoing_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {outgoing_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `base_revision` int(9) DEFAULT NULL,
@@ -267,10 +267,10 @@ CREATE TABLE {outgoing_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {permissions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {permissions} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `display_name` varchar(64) DEFAULT NULL,
@@ -278,14 +278,14 @@ CREATE TABLE {permissions} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {permissions} VALUES (1,'View','view');
 INSERT INTO {permissions} VALUES (2,'View full size','view_full');
 INSERT INTO {permissions} VALUES (3,'Edit','edit');
 INSERT INTO {permissions} VALUES (4,'Add','add');
 DROP TABLE IF EXISTS {search_records};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {search_records} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -295,21 +295,21 @@ CREATE TABLE {search_records} (
   KEY `item_id` (`item_id`),
   FULLTEXT KEY `data` (`data`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {search_records} VALUES (1,1,0,'  Gallery');
 DROP TABLE IF EXISTS {sessions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {sessions} (
   `session_id` varchar(127) NOT NULL,
   `data` text NOT NULL,
   `last_activity` int(10) unsigned NOT NULL,
   PRIMARY KEY (`session_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(128) NOT NULL,
@@ -317,10 +317,10 @@ CREATE TABLE {tags} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tasks};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tasks} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `callback` varchar(128) DEFAULT NULL,
@@ -335,10 +335,10 @@ CREATE TABLE {tasks} (
   PRIMARY KEY (`id`),
   KEY `owner_id` (`owner_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {themes};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {themes} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(64) DEFAULT NULL,
@@ -346,12 +346,12 @@ CREATE TABLE {themes} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {themes} VALUES (1,'wind',1);
 INSERT INTO {themes} VALUES (2,'admin_wind',1);
 DROP TABLE IF EXISTS {users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {users} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(32) NOT NULL,
@@ -369,12 +369,12 @@ CREATE TABLE {users} (
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `hash` (`hash`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {users} VALUES (1,'guest','Guest User','',0,0,NULL,0,1,NULL,NULL,NULL);
 INSERT INTO {users} VALUES (2,'admin','Gallery Administrator','',0,0,'unknown@unknown.com',1,0,NULL,NULL,NULL);
 DROP TABLE IF EXISTS {vars};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {vars} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `module_name` varchar(64) NOT NULL,
@@ -382,8 +382,8 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','page_size','9');
@@ -413,6 +413,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
 INSERT INTO {vars} VALUES (NULL,'gallery','extra_binary_paths','/usr/local/bin:/opt/local/bin:/opt/bin');
+INSERT INTO {vars} VALUES (NULL,'gallery','timezone','PST8PDT');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:10;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:11;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:12;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:13;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
 INSERT INTO {vars} VALUES (NULL,'user','mininum_password_length','5');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 2cb04356..83c5ed71 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -311,8 +311,9 @@ class gallery_installer {
     module::set_var("gallery", "email_header_separator", serialize("\n"));
     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_var("gallery", "timezone", Kohana::config("locale.timezone"));
 
-    module::set_version("gallery", 47);
+    module::set_version("gallery", 48);
   }
 
   static function upgrade($version) {
@@ -687,7 +688,7 @@ class gallery_installer {
     if ($version == 47) {
       // Add configuration variable to set timezone.  Defaults to the currently
       // used timezone (from PHP configuration).
-      module::set_var("gallery", "timezone", Kohana::config('locale.timezone'));
+      module::set_var("gallery", "timezone", Kohana::config("locale.timezone"));
       module::set_version("gallery", $version = 48);
     }
   }
-- 
cgit v1.2.3


From 171e4fd0ee6493bb82bb1de3017b83319e7fc5e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 07:41:44 -0700
Subject: Remove displayed blocks from the admin block list.  If there are no
 available blocks to add, just hide the block adder block.  Fixes #1689.

---
 modules/gallery/helpers/gallery_block.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 0ba7c936..49d16246 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -82,9 +82,13 @@ class gallery_block_Core {
       break;
 
     case "block_adder":
-      $block->css_id = "g-block-adder";
-      $block->title = t("Dashboard content");
-      $block->content = gallery_block::get_add_block_form();
+      if ($form = gallery_block::get_add_block_form()) {
+        $block->css_id = "g-block-adder";
+        $block->title = t("Dashboard content");
+        $block->content = $form;
+      } else {
+        $block = "";
+      }
       break;
 
     case "language":
@@ -118,11 +122,22 @@ class gallery_block_Core {
   }
 
   static function get_add_block_form() {
+    $available_blocks = block_manager::get_available_admin_blocks();
+
+    $active = array();
+    foreach (array_merge(block_manager::get_active("dashboard_sidebar"),
+                         block_manager::get_active("dashboard_center")) as $b) {
+      unset($available_blocks[implode(":", $b)]);
+    }
+
+    if (!$available_blocks) {
+      return;
+    }
+
     $form = new Forge("admin/dashboard/add_block", "", "post",
                       array("id" => "g-add-dashboard-block-form"));
     $group = $form->group("add_block")->label(t("Add Block"));
-    $group->dropdown("id")->label(t("Available Blocks"))
-      ->options(block_manager::get_available_admin_blocks());
+    $group->dropdown("id")->label(t("Available blocks"))->options($available_blocks);
     $group->submit("center")->value(t("Add to center"));
     $group->submit("sidebar")->value(t("Add to sidebar"));
     return $form;
-- 
cgit v1.2.3


From 0235c2062e9d980a4778c4b22678238c525e1cd7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 23 Apr 2011 08:13:01 -0700
Subject: Fix for ticket #1681 (and maybe #1625). Change the parameter from -v
 to -version.

---
 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 04501132..f374f9da 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -316,7 +316,7 @@ class graphics_Core {
       // ImageMagick & GraphicsMagick
       $magick_kits = array(
           "imagemagick" => array(
-            "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v",
+            "name" => "ImageMagick", "binary" => "convert", "version" => "convert -version",
             "version_regex" => "/Version: \S+ (\S+)/"),
           "graphicsmagick" => array(
             "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version",
-- 
cgit v1.2.3


From ce2c6c3ada2854777891a7a8edec66b7b5be72ad Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 10:06:17 -0700
Subject: Add convert_to_human_readable and tests for both.  Resolves #1693.

---
 modules/gallery/helpers/MY_num.php        | 14 ++++++++++++++
 modules/gallery/tests/Num_Helper_Test.php | 32 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 modules/gallery/tests/Num_Helper_Test.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/MY_num.php b/modules/gallery/helpers/MY_num.php
index 9787044c..842a2ee3 100644
--- a/modules/gallery/helpers/MY_num.php
+++ b/modules/gallery/helpers/MY_num.php
@@ -37,4 +37,18 @@ class num extends num_Core {
 
     return $val;
   }
+
+  /**
+   * Convert a size value as accepted by PHP's shorthand to bytes.
+   * ref: http://us2.php.net/manual/en/function.ini-get.php
+   * ref: http://us2.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
+   */
+  static function convert_to_human_readable($num) {
+    foreach (array("G" => 1e9, "M" => 1e6, "K" => 1e3) as $k => $v) {
+      if ($num > $v) {
+        $num = round($num / $v) . $k;
+      }
+    }
+    return $num;
+  }
 }
diff --git a/modules/gallery/tests/Num_Helper_Test.php b/modules/gallery/tests/Num_Helper_Test.php
new file mode 100644
index 00000000..a22f9359
--- /dev/null
+++ b/modules/gallery/tests/Num_Helper_Test.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 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 Num_Helper_Test extends Gallery_Unit_Test_Case {
+  public function convert_to_bytes_test() {
+    $this->assert_equal(5 * 1024, num::convert_to_bytes("5K"));
+    $this->assert_equal(3 * 1024*1024, num::convert_to_bytes("3M"));
+    $this->assert_equal(4 * 1024*1024*1024, num::convert_to_bytes("4G"));
+  }
+
+  public function convert_to_human_readable_test() {
+    $this->assert_equal("6K", num::convert_to_human_readable(5615));
+    $this->assert_equal("1M", num::convert_to_human_readable(1205615));
+    $this->assert_equal("3G", num::convert_to_human_readable(3091205615));
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 76a7ad3161be0994d7ba98e9dff9b317b2430bb3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 10:07:32 -0700
Subject: Overhaul of the uploader code: - Propagate size limits (including
 detecting memory limits from GD) down to the   Flash so that we don't even
 start uploads that won't work - Improve the error messages to be more user
 meaningful and provide links to the   codex for errors - Tell the user up
 front what the file size limit is.

Fixes #1638
---
 modules/gallery/css/gallery.css               |  6 ++---
 modules/gallery/helpers/graphics.php          | 19 ++++++++++++++
 modules/gallery/libraries/Form_Uploadify.php  | 14 +++++++++++
 modules/gallery/views/form_uploadify.html.php | 36 ++++++++++++++-------------
 4 files changed, 55 insertions(+), 20 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 275a3d7d..97d09454 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -29,12 +29,12 @@
 
 #g-add-photos-canvas object,
 #g-add-photos-button {
-  left: 137px;
-  margin: .5em  0;
+  left: 93px;
+  margin: .5em 0;
   padding: .4em 1em;
   position: absolute;
   top: 0;
-  width: 175px;
+  width: auto;
 }
 
 #g-add-photos-canvas object {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 04501132..d19392cf 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -423,4 +423,23 @@ class graphics_Core {
 
     return true;
   }
+
+  /**
+   * Return the max file size that this graphics toolkit can handle.
+   */
+  static function max_filesize() {
+    if (module::get_var("gallery", "graphics_toolkit") == "gd") {
+      $memory_limit = trim(ini_get("memory_limit"));
+      $memory_limit_bytes = num::convert_to_bytes($memory_limit);
+
+      // GD expands images in memory and uses 4 bytes of RAM for every byte
+      // in the file.
+      $max_filesize = $memory_limit_bytes / 4;
+      $max_filesize_human_readable = num::convert_to_human_readable($max_filesize);
+      return array($max_filesize, $max_filesize_human_readable);
+    }
+
+    // Some arbitrarily large size
+    return array(1000000000, "1G");
+  }
 }
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index 27ab9684..3e35e380 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -48,6 +48,20 @@ class Form_Uploadify_Core extends Form_Input {
     $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit");
     $v->movies_allowed = (bool) movie::find_ffmpeg();
     $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt");
+
+    list ($toolkit_max_filesize_bytes, $toolkit_max_filesize) = graphics::max_filesize();
+
+    $upload_max_filesize = trim(ini_get("upload_max_filesize"));
+    $upload_max_filesize_bytes = num::convert_to_bytes($upload_max_filesize);
+
+    if ($upload_max_filesize_bytes < $toolkit_max_filesize_bytes) {
+      $v->size_limit_bytes = $upload_max_filesize_bytes;
+      $v->size_limit = $upload_max_filesize;
+    } else {
+      $v->size_limit_bytes = $toolkit_max_filesize_bytes;
+      $v->size_limit = $toolkit_max_filesize;
+    }
+
     return $v;
   }
 
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 77b6d493..83dfcc68 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -32,6 +32,7 @@
         fileDesc: <?= t("Photos and movies")->for_js() ?>,
         cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
         simUploadLimit: <?= $simultaneous_upload_limit ?>,
+        sizeLimit: <?= $size_limit_bytes ?>,
         wmode: "transparent",
         hideButton: true, /* should be true */
         auto: true,
@@ -66,26 +67,30 @@
           return true;
         },
         onError: function(event, queueID, fileObj, errorObj) {
-          var msg = " - ";
           if (errorObj.type == "HTTP") {
             if (errorObj.info == "500") {
-              msg += <?= t("Unable to process this file")->for_js() ?>;
-              // Server error - check server logs
+              error_msg = <?= t("Unable to process this photo")->for_js() ?>;
             } else if (errorObj.info == "404") {
-              msg += <?= t("The upload script was not found.")->for_js() ?>;
-              // Server script not found
+              error_msg = <?= t("The upload script was not found")->for_js() ?>;
+            } else if (errorObj.info == "400") {
+              error_msg = <?= t("This photo is too large (max is %size bytes)",
+                                array("size" => $size_limit))->for_js() ?>;
             } else {
-              // Server Error: status: errorObj.info
-              msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
+              msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
+                .replace("__INFO__", errorObj.info)
+                .replace("__TYPE__", errorObj.type));
             }
           } else if (errorObj.type == "File Size") {
-            var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
-            msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
+            error_msg = <?= t("This photo is too large (max is %size bytes)",
+                              array("size" => $size_limit))->for_js() ?>;
           } else {
-            msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
-              .replace("__INFO__", errorObj.info)
-              .replace("__TYPE__", errorObj.type));
+            error_msg = <?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
+                        .replace("__INFO__", errorObj.info)
+                        .replace("__TYPE__", errorObj.type);
           }
+          msg = " - <a target=\"_blank\" href=\"http://codex.gallery2.org/Gallery3:Troubleshooting:Uploading\">" +
+            error_msg + "</a>";
+
           $("#g-add-photos-status ul").append(
             "<li id=\"q" + queueID + "\" class=\"g-error\">" + fileObj.name + msg + "</li>");
           $("#g-uploadify").uploadifyCancel(queueID);
@@ -131,10 +136,7 @@
   <? endif ?>
 
   <div>
-    <p>
-      <?= t("Photos will be uploaded to album: ") ?>
-    </p>
-    <ul class="g-breadcrumbs ui-helper-clearfix">
+    <ul class="g-breadcrumbs">
       <? foreach ($album->parents() as $i => $parent): ?>
       <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
       <? endforeach ?>
@@ -143,7 +145,7 @@
   </div>
 
   <div id="g-add-photos-canvas">
-    <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
+    <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos (%size max per file)...", array("size" => $size_limit)) ?></button>
     <span id="g-uploadify"></span>
   </div>
   <div id="g-add-photos-status">
-- 
cgit v1.2.3


From 59d5ddc8abe882c3cc3994ca2478d8dd0915f0fe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 12:48:04 -0700
Subject: Set the default value for gallery.timezone to null so that each
 install uses date_default_timezone_get() in modules/gallery/config/locale.php
 but it's still overrideable in Admin > Settings > Advanced.  Follow on fix
 for #1637.

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

(limited to 'modules/gallery/helpers')

diff --git a/installer/install.sql b/installer/install.sql
index 7f9eda59..bbc2a5c7 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS {access_caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -13,11 +13,11 @@ CREATE TABLE {access_caches} (
   PRIMARY KEY (`id`),
   KEY `item_id` (`item_id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_caches} VALUES (1,1,'1','0','0','1','0','0');
 DROP TABLE IF EXISTS {access_intents};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_intents} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -31,11 +31,11 @@ CREATE TABLE {access_intents} (
   `add_2` binary(1) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_intents} VALUES (1,1,'1','1','0','0','1','1','0','0');
 DROP TABLE IF EXISTS {caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) NOT NULL,
@@ -46,10 +46,10 @@ CREATE TABLE {caches} (
   UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {comments};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {comments} (
   `author_id` int(9) DEFAULT NULL,
   `created` int(9) NOT NULL,
@@ -75,10 +75,10 @@ CREATE TABLE {comments} (
   `updated` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {failed_auths};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {failed_auths} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `count` int(9) NOT NULL,
@@ -86,10 +86,10 @@ CREATE TABLE {failed_auths} (
   `time` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {graphics_rules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {graphics_rules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -100,12 +100,12 @@ CREATE TABLE {graphics_rules} (
   `target` varchar(32) NOT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'thumb');
 INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:640;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` char(64) DEFAULT NULL,
@@ -113,25 +113,25 @@ CREATE TABLE {groups} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups} VALUES (1,'Everybody',1);
 INSERT INTO {groups} VALUES (2,'Registered Users',1);
 DROP TABLE IF EXISTS {groups_users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups_users} (
   `group_id` int(9) NOT NULL,
   `user_id` int(9) NOT NULL,
   PRIMARY KEY (`group_id`,`user_id`),
   UNIQUE KEY `user_id` (`user_id`,`group_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups_users} VALUES (1,1);
 INSERT INTO {groups_users} VALUES (1,2);
 INSERT INTO {groups_users} VALUES (2,2);
 DROP TABLE IF EXISTS {incoming_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {incoming_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` char(32) NOT NULL,
@@ -143,10 +143,10 @@ CREATE TABLE {incoming_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {items};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `album_cover_item_id` int(9) DEFAULT NULL,
@@ -188,11 +188,11 @@ CREATE TABLE {items} (
   KEY `weight` (`weight`),
   KEY `left_ptr` (`left_ptr`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,2,0,NULL,'','',1,NULL,NULL,2,NULL,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
 DROP TABLE IF EXISTS {items_tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items_tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) NOT NULL,
@@ -201,10 +201,10 @@ CREATE TABLE {items_tags} (
   KEY `tag_id` (`tag_id`,`id`),
   KEY `item_id` (`item_id`,`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {logs};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {logs} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `category` varchar(64) DEFAULT NULL,
@@ -217,10 +217,10 @@ CREATE TABLE {logs} (
   `user_id` int(9) DEFAULT '0',
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {messages};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {messages} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) DEFAULT NULL,
@@ -229,11 +229,11 @@ CREATE TABLE {messages} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `key` (`key`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {messages} VALUES (1,'upgrade_now','3','Some of your modules are out of date.  <a href=\"index.php/upgrader\">Upgrade now!</a>');
 DROP TABLE IF EXISTS {modules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {modules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -244,8 +244,8 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`),
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',48,1);
+/*!40101 SET character_set_client = @saved_cs_client */;
+INSERT INTO {modules} VALUES (1,1,'gallery',49,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',4,3);
 INSERT INTO {modules} VALUES (4,1,'organize',4,4);
@@ -255,8 +255,8 @@ INSERT INTO {modules} VALUES (7,1,'search',1,7);
 INSERT INTO {modules} VALUES (8,1,'slideshow',2,8);
 INSERT INTO {modules} VALUES (9,1,'tag',3,9);
 DROP TABLE IF EXISTS {outgoing_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {outgoing_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `base_revision` int(9) DEFAULT NULL,
@@ -268,10 +268,10 @@ CREATE TABLE {outgoing_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {permissions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {permissions} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `display_name` varchar(64) DEFAULT NULL,
@@ -279,14 +279,14 @@ CREATE TABLE {permissions} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {permissions} VALUES (1,'View','view');
 INSERT INTO {permissions} VALUES (2,'View full size','view_full');
 INSERT INTO {permissions} VALUES (3,'Edit','edit');
 INSERT INTO {permissions} VALUES (4,'Add','add');
 DROP TABLE IF EXISTS {search_records};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {search_records} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -296,21 +296,21 @@ CREATE TABLE {search_records} (
   KEY `item_id` (`item_id`),
   FULLTEXT KEY `data` (`data`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {search_records} VALUES (1,1,0,'  Gallery');
 DROP TABLE IF EXISTS {sessions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {sessions} (
   `session_id` varchar(127) NOT NULL,
   `data` text NOT NULL,
   `last_activity` int(10) unsigned NOT NULL,
   PRIMARY KEY (`session_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(128) NOT NULL,
@@ -318,10 +318,10 @@ CREATE TABLE {tags} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tasks};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tasks} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `callback` varchar(128) DEFAULT NULL,
@@ -336,10 +336,10 @@ CREATE TABLE {tasks} (
   PRIMARY KEY (`id`),
   KEY `owner_id` (`owner_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {themes};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {themes} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(64) DEFAULT NULL,
@@ -347,12 +347,12 @@ CREATE TABLE {themes} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {themes} VALUES (1,'wind',1);
 INSERT INTO {themes} VALUES (2,'admin_wind',1);
 DROP TABLE IF EXISTS {users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {users} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(32) NOT NULL,
@@ -370,12 +370,12 @@ CREATE TABLE {users} (
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `hash` (`hash`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {users} VALUES (1,'guest','Guest User','',0,0,NULL,0,1,NULL,NULL,NULL);
 INSERT INTO {users} VALUES (2,'admin','Gallery Administrator','',0,0,'unknown@unknown.com',1,0,NULL,NULL,NULL);
 DROP TABLE IF EXISTS {vars};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {vars} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `module_name` varchar(64) NOT NULL,
@@ -384,7 +384,7 @@ CREATE TABLE {vars} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
 ) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','page_size','9');
@@ -414,7 +414,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
 INSERT INTO {vars} VALUES (NULL,'gallery','extra_binary_paths','/usr/local/bin:/opt/local/bin:/opt/bin');
-INSERT INTO {vars} VALUES (NULL,'gallery','timezone','System/Localtime');
+INSERT INTO {vars} VALUES (NULL,'gallery','timezone',NULL);
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:10;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:11;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:12;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:13;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'user','minimum_password_length','5');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 83c5ed71..7a9af402 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -311,9 +311,9 @@ class gallery_installer {
     module::set_var("gallery", "email_header_separator", serialize("\n"));
     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_var("gallery", "timezone", Kohana::config("locale.timezone"));
+    module::set_var("gallery", "timezone", null);
 
-    module::set_version("gallery", 48);
+    module::set_version("gallery", 49);
   }
 
   static function upgrade($version) {
@@ -685,11 +685,12 @@ class gallery_installer {
       module::set_version("gallery", $version = 47);
     }
 
-    if ($version == 47) {
+    if ($version == 47 || $version == 48) {
       // Add configuration variable to set timezone.  Defaults to the currently
-      // used timezone (from PHP configuration).
-      module::set_var("gallery", "timezone", Kohana::config("locale.timezone"));
-      module::set_version("gallery", $version = 48);
+      // used timezone (from PHP configuration).  Note that in v48 we werew
+      // setting this value incorrectly, so we're going to stomp this value for v49.
+      module::set_var("gallery", "timezone", null);
+      module::set_version("gallery", $version = 49);
     }
   }
 
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 807d08fd..74c0658f 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 48
+version = 49
-- 
cgit v1.2.3


From c1df782a75193d4ee33ec1d0be10739f9320705f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 13:04:23 -0700
Subject: Use an absolute url for the upgrader link.  Also, clear the
 upgrade_now site status message every time we go to Admin > Modules. Fixes
 #1695.

---
 modules/gallery/controllers/admin_modules.php | 6 +++---
 modules/gallery/helpers/module.php            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index 787785ea..b712d14f 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -19,6 +19,9 @@
  */
 class Admin_Modules_Controller extends Admin_Controller {
   public function index() {
+    // If modules need upgrading, this will get recreated in module::available()
+    site_status::clear("upgrade_now");
+
     $view = new Admin_View("admin.html");
     $view->page_title = t("Modules");
     $view->content = new View("admin_modules.html");
@@ -103,9 +106,6 @@ class Admin_Modules_Controller extends Admin_Controller {
 
     module::event("module_change", $changes);
 
-    // If modules need upgrading, this will get recreated
-    site_status::clear("upgrade_now");
-
     // @todo this type of collation is questionable from an i18n perspective
     if ($activated_names) {
       message::success(t("Activated: %names", array("names" => join(", ", $activated_names))));
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 37f7f68a..4b7d4a5f 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -101,7 +101,7 @@ class module_Core {
         $m->locked = false;
 
         if ($m->active && $m->version != $m->code_version) {
-          site_status::warning(t("Some of your modules are out of date.  <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::site("upgrader"))), "upgrade_now");
+          site_status::warning(t("Some of your modules are out of date.  <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::abs_site("upgrader"))), "upgrade_now");
         }
       }
 
-- 
cgit v1.2.3


From c3b0c96460da336bf720db0de2b396517004f514 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 19:59:54 -0700
Subject: Revert 0235c2062e9d980a4778c4b22678238c525e1cd7 and instead apply the
 fix from iptox.net listed here:
 http://gallery.menalto.com/node/98768#comment-372398

Fixes for #1681, #1625
---
 modules/gallery/helpers/graphics.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/helpers')

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


From cbd04e1ae02491ab4c213fe03d62d12ca1546251 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 25 Apr 2011 23:26:43 -0700
Subject: Move random::string() to be test::random_string() and have it return
 a random string of any length.  Also introduce test::lorem_ipsum() and use
 that in places where we want strings of words.  Fixes #1713.

---
 modules/gallery/helpers/random.php                 |  10 +-
 modules/gallery/tests/Albums_Controller_Test.php   |   2 +-
 modules/gallery/tests/File_Structure_Test.php      |   1 +
 modules/gallery/tests/Gallery_Filters.php          |   1 +
 modules/gallery_unit_test/helpers/test.php         |  30 +-
 .../gallery_unit_test/vendor/LoremIpsum.class.php  | 461 +++++++++++++++++++++
 6 files changed, 489 insertions(+), 16 deletions(-)
 create mode 100644 modules/gallery_unit_test/vendor/LoremIpsum.class.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/random.php b/modules/gallery/helpers/random.php
index 6016df7b..06542e8c 100644
--- a/modules/gallery/helpers/random.php
+++ b/modules/gallery/helpers/random.php
@@ -19,21 +19,13 @@
  */
 class random_Core {
   /**
-   * Return a random 32 bit hash value.
+   * Return a random 32 byte hash value.
    * @param string extra entropy data
    */
   static function hash($entropy="") {
     return md5($entropy . uniqid(mt_rand(), true));
   }
 
-  /**
-   * Return a random hexadecimal string of the given length.
-   * @param int the desired length of the string
-   */
-  static function string($length) {
-    return substr(random::hash(), 0, $length);
-  }
-
   /**
    * Return a random floating point number between 0 and 1
    */
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index d9983cc2..2ff017d7 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -31,7 +31,7 @@ class Albums_Controller_Test extends Gallery_Unit_Test_Case {
     $album = test::random_album();
 
     // Randomize to avoid conflicts.
-    $new_name = "new_name_" . random::string(6);
+    $new_name = "new_name_" . test::random_string(6);
 
     $_POST["name"] = $new_name;
     $_POST["title"] = "new title";
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 69c4bbf9..1d1ff5ce 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -101,6 +101,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
       $expected_4 = array("<?php defined('SYSPATH') or die('No direct script access.');\n");
     } else if (strpos($path, MODPATH . "forge") === 0 ||
                strpos($path, MODPATH . "exif/lib") === 0 ||
+               strpos($path, MODPATH . "gallery_unit_test/vendor") === 0 ||
                strpos($path, MODPATH . "gallery/lib/HTMLPurifier") === 0 ||
                $path == MODPATH . "user/lib/PasswordHash.php" ||
                $path == DOCROOT . "var/database.php") {
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
index e0208ed3..b008b593 100644
--- a/modules/gallery/tests/Gallery_Filters.php
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -38,6 +38,7 @@ class GalleryCodeFilterIterator extends FilterIterator {
       strpos($path_name, MODPATH . "forge") !== false ||
       strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
       strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
+      strpos($path_name, MODPATH . "gallery_unit_test/vendor") !== false ||
       strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
       strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
       strpos($path_name, MODPATH . "unit_test") !== false ||
diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index b6b0055a..633f023e 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -19,7 +19,7 @@
  */
 class test_Core {
   static function random_album_unsaved($parent=null) {
-    $rand = random::string(6);
+    $rand = test::random_string(6);
 
     $album = ORM::factory("item");
     $album->type = "album";
@@ -34,7 +34,7 @@ class test_Core {
   }
 
   static function random_photo_unsaved($parent=null) {
-    $rand = random::string(6);
+    $rand = test::random_string(6);
     $photo = ORM::factory("item");
     $photo->type = "photo";
     $photo->parent_id = $parent ? $parent->id : 1;
@@ -49,16 +49,16 @@ class test_Core {
   }
 
   static function random_user($password="password") {
-    $rand = "name_" . random::string(6);
+    $rand = "name_" . test::random_string(6);
     return identity::create_user($rand, $rand, $password, "$rand@rand.com");
   }
 
   static function random_group() {
-    return identity::create_group(random::string(6));
+    return identity::create_group(test::random_string(6));
   }
 
   static function random_name($item=null) {
-    $rand = "name_" . random::string(6);
+    $rand = "name_" . test::random_string(6);
     if ($item && $item->is_photo()) {
       $rand .= ".jpg";
     }
@@ -77,7 +77,7 @@ class test_Core {
 
   static function random_tag() {
     $tag = ORM::factory("tag");
-    $tag->name = random::string(6);
+    $tag->name = test::lorem_ipsum(rand(2, 4));
 
     // Reload so that ORM coerces all fields into strings.
     return $tag->save()->reload();
@@ -88,4 +88,22 @@ class test_Core {
     fwrite(fopen($b_name = tempnam("/tmp", "test"), "w"), $b);
     return `diff $a_name $b_name`;
   }
+
+  static function random_string($length) {
+    $buf = "";
+    do {
+      $buf .= random::hash();
+    } while (strlen($buf) < $length);
+    return substr($buf, 0, $length);
+  }
+
+  static function lorem_ipsum($num) {
+    static $lorem_ipsum = null;
+    if (!$lorem_ipsum) {
+      require_once(MODPATH . "gallery_unit_test/vendor/LoremIpsum.class.php");
+      $lorem_ipsum = new LoremIpsumGenerator();
+    }
+    // skip past initial 'lorem ipsum'
+    return substr($lorem_ipsum->getContent($num + 2, "txt"), 13);
+  }
 }
diff --git a/modules/gallery_unit_test/vendor/LoremIpsum.class.php b/modules/gallery_unit_test/vendor/LoremIpsum.class.php
new file mode 100644
index 00000000..07050fe5
--- /dev/null
+++ b/modules/gallery_unit_test/vendor/LoremIpsum.class.php
@@ -0,0 +1,461 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+class LoremIpsumGenerator {
+	/**
+	*	Copyright (c) 2009, Mathew Tinsley (tinsley@tinsology.net)
+	*	All rights reserved.
+	*
+	*	Redistribution and use in source and binary forms, with or without
+	*	modification, are permitted provided that the following conditions are met:
+	*		* Redistributions of source code must retain the above copyright
+	*		  notice, this list of conditions and the following disclaimer.
+	*		* Redistributions in binary form must reproduce the above copyright
+	*		  notice, this list of conditions and the following disclaimer in the
+	*		  documentation and/or other materials provided with the distribution.
+	*		* Neither the name of the organization nor the
+	*		  names of its contributors may be used to endorse or promote products
+	*		  derived from this software without specific prior written permission.
+	*
+	*	THIS SOFTWARE IS PROVIDED BY MATHEW TINSLEY ''AS IS'' AND ANY
+	*	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	*	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	*	DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+	*	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	*	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	*	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	*	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	*	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	*	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+	
+	private $words, $wordsPerParagraph, $wordsPerSentence;
+	
+	function __construct($wordsPer = 100)
+	{
+		$this->wordsPerParagraph = $wordsPer;
+		$this->wordsPerSentence = 24.460;
+		$this->words = array(
+		'lorem',
+		'ipsum',
+		'dolor',
+		'sit',
+		'amet',
+		'consectetur',
+		'adipiscing',
+		'elit',
+		'curabitur',
+		'vel',
+		'hendrerit',
+		'libero',
+		'eleifend',
+		'blandit',
+		'nunc',
+		'ornare',
+		'odio',
+		'ut',
+		'orci',
+		'gravida',
+		'imperdiet',
+		'nullam',
+		'purus',
+		'lacinia',
+		'a',
+		'pretium',
+		'quis',
+		'congue',
+		'praesent',
+		'sagittis',
+		'laoreet',
+		'auctor',
+		'mauris',
+		'non',
+		'velit',
+		'eros',
+		'dictum',
+		'proin',
+		'accumsan',
+		'sapien',
+		'nec',
+		'massa',
+		'volutpat',
+		'venenatis',
+		'sed',
+		'eu',
+		'molestie',
+		'lacus',
+		'quisque',
+		'porttitor',
+		'ligula',
+		'dui',
+		'mollis',
+		'tempus',
+		'at',
+		'magna',
+		'vestibulum',
+		'turpis',
+		'ac',
+		'diam',
+		'tincidunt',
+		'id',
+		'condimentum',
+		'enim',
+		'sodales',
+		'in',
+		'hac',
+		'habitasse',
+		'platea',
+		'dictumst',
+		'aenean',
+		'neque',
+		'fusce',
+		'augue',
+		'leo',
+		'eget',
+		'semper',
+		'mattis',
+		'tortor',
+		'scelerisque',
+		'nulla',
+		'interdum',
+		'tellus',
+		'malesuada',
+		'rhoncus',
+		'porta',
+		'sem',
+		'aliquet',
+		'et',
+		'nam',
+		'suspendisse',
+		'potenti',
+		'vivamus',
+		'luctus',
+		'fringilla',
+		'erat',
+		'donec',
+		'justo',
+		'vehicula',
+		'ultricies',
+		'varius',
+		'ante',
+		'primis',
+		'faucibus',
+		'ultrices',
+		'posuere',
+		'cubilia',
+		'curae',
+		'etiam',
+		'cursus',
+		'aliquam',
+		'quam',
+		'dapibus',
+		'nisl',
+		'feugiat',
+		'egestas',
+		'class',
+		'aptent',
+		'taciti',
+		'sociosqu',
+		'ad',
+		'litora',
+		'torquent',
+		'per',
+		'conubia',
+		'nostra',
+		'inceptos',
+		'himenaeos',
+		'phasellus',
+		'nibh',
+		'pulvinar',
+		'vitae',
+		'urna',
+		'iaculis',
+		'lobortis',
+		'nisi',
+		'viverra',
+		'arcu',
+		'morbi',
+		'pellentesque',
+		'metus',
+		'commodo',
+		'ut',
+		'facilisis',
+		'felis',
+		'tristique',
+		'ullamcorper',
+		'placerat',
+		'aenean',
+		'convallis',
+		'sollicitudin',
+		'integer',
+		'rutrum',
+		'duis',
+		'est',
+		'etiam',
+		'bibendum',
+		'donec',
+		'pharetra',
+		'vulputate',
+		'maecenas',
+		'mi',
+		'fermentum',
+		'consequat',
+		'suscipit',
+		'aliquam',
+		'habitant',
+		'senectus',
+		'netus',
+		'fames',
+		'quisque',
+		'euismod',
+		'curabitur',
+		'lectus',
+		'elementum',
+		'tempor',
+		'risus',
+		'cras' );
+	}
+		
+	function getContent($count, $format = 'html', $loremipsum = true)
+	{
+		$format = strtolower($format);
+		
+		if($count <= 0)
+			return '';
+
+		switch($format)
+		{
+			case 'txt':
+				return $this->getText($count, $loremipsum);
+			case 'plain':
+				return $this->getPlain($count, $loremipsum);
+			default:
+				return $this->getHTML($count, $loremipsum);
+		}
+	}
+	
+	private function getWords(&$arr, $count, $loremipsum)
+	{
+		$i = 0;
+		if($loremipsum)
+		{
+			$i = 2;
+			$arr[0] = 'lorem';
+			$arr[1] = 'ipsum';
+		}
+		
+		for($i; $i < $count; $i++)
+		{
+			$index = array_rand($this->words);
+			$word = $this->words[$index];
+			//echo $index . '=>' . $word . '<br />';
+			
+			if($i > 0 && $arr[$i - 1] == $word)
+				$i--;
+			else
+				$arr[$i] = $word;
+		}
+	}
+	
+	private function getPlain($count, $loremipsum, $returnStr = true)
+	{
+		$words = array();
+		$this->getWords($words, $count, $loremipsum);
+		//print_r($words);
+		
+		$delta = $count;
+		$curr = 0;
+		$sentences = array();
+		while($delta > 0)
+		{
+			$senSize = $this->gaussianSentence();
+			//echo $curr . '<br />';
+			if(($delta - $senSize) < 4)
+				$senSize = $delta;
+
+			$delta -= $senSize;
+			
+			$sentence = array();
+			for($i = $curr; $i < ($curr + $senSize); $i++)
+				$sentence[] = $words[$i];
+
+			$this->punctuate($sentence);
+			$curr = $curr + $senSize;
+			$sentences[] = $sentence;
+		}
+		
+		if($returnStr)
+		{
+			$output = '';
+			foreach($sentences as $s)
+				foreach($s as $w)
+					$output .= $w . ' ';
+					
+			return $output;
+		}
+		else
+			return $sentences;
+	}
+	
+	private function getText($count, $loremipsum)
+	{
+		$sentences = $this->getPlain($count, $loremipsum, false);
+		$paragraphs = $this->getParagraphArr($sentences);
+		
+		$paragraphStr = array();
+		foreach($paragraphs as $p)
+		{
+			$paragraphStr[] = $this->paragraphToString($p);
+		}
+		
+		$paragraphStr[0] = "\t" . $paragraphStr[0];
+		return implode("\n\n\t", $paragraphStr);
+	}
+	
+	private function getParagraphArr($sentences)
+	{
+		$wordsPer = $this->wordsPerParagraph;
+		$sentenceAvg = $this->wordsPerSentence;
+		$total = count($sentences);
+		
+		$paragraphs = array();
+		$pCount = 0;
+		$currCount = 0;
+		$curr = array();
+		
+		for($i = 0; $i < $total; $i++)
+		{
+			$s = $sentences[$i];
+			$currCount += count($s);
+			$curr[] = $s;
+			if($currCount >= ($wordsPer - round($sentenceAvg / 2.00)) || $i == $total - 1)
+			{
+				$currCount = 0;
+				$paragraphs[] = $curr;
+				$curr = array();
+				//print_r($paragraphs);
+			}
+			//print_r($paragraphs);
+		}
+		
+		return $paragraphs;
+	}
+	
+	private function getHTML($count, $loremipsum)
+	{
+		$sentences = $this->getPlain($count, $loremipsum, false);
+		$paragraphs = $this->getParagraphArr($sentences);
+		//print_r($paragraphs);
+		
+		$paragraphStr = array();
+		foreach($paragraphs as $p)
+		{
+			$paragraphStr[] = "<p>\n" . $this->paragraphToString($p, true) . '</p>';
+		}
+		
+		//add new lines for the sake of clean code
+		return implode("\n", $paragraphStr);
+	}
+	
+	private function paragraphToString($paragraph, $htmlCleanCode = false)
+	{
+		$paragraphStr = '';
+		foreach($paragraph as $sentence)
+		{
+			foreach($sentence as $word)
+				$paragraphStr .= $word . ' ';
+				
+			if($htmlCleanCode)
+				$paragraphStr .= "\n";
+		}		
+		return $paragraphStr;
+	}
+	
+	/*
+	* Inserts commas and periods in the given
+	* word array.
+	*/
+	private function punctuate(& $sentence)
+	{
+		$count = count($sentence);
+		$sentence[$count - 1] = $sentence[$count - 1] . '.';
+		
+		if($count < 4)
+			return $sentence;
+		
+		$commas = $this->numberOfCommas($count);
+		
+		for($i = 1; $i <= $commas; $i++)
+		{
+			$index = (int) round($i * $count / ($commas + 1));
+			
+			if($index < ($count - 1) && $index > 0)
+			{
+				$sentence[$index] = $sentence[$index] . ',';
+			}
+		}
+	}
+	
+	/*
+	* Determines the number of commas for a
+	* sentence of the given length. Average and
+	* standard deviation are determined superficially
+	*/
+	private function numberOfCommas($len)
+	{
+		$avg = (float) log($len, 6);
+		$stdDev = (float) $avg / 6.000;
+		
+		return (int) round($this->gauss_ms($avg, $stdDev));
+	}
+	
+	/*
+	* Returns a number on a gaussian distribution
+	* based on the average word length of an english
+	* sentence.
+	* Statistics Source:
+	*	http://hearle.nahoo.net/Academic/Maths/Sentence.html
+	*	Average: 24.46
+	*	Standard Deviation: 5.08
+	*/
+	private function gaussianSentence()
+	{
+		$avg = (float) 24.460;
+		$stdDev = (float) 5.080;
+		
+		return (int) round($this->gauss_ms($avg, $stdDev));
+	}
+	
+	/*
+	* The following three functions are used to
+	* compute numbers with a guassian distrobution
+	* Source:
+	* 	http://us.php.net/manual/en/function.rand.php#53784
+	*/
+	private function gauss()
+	{   // N(0,1)
+		// returns random number with normal distribution:
+		//   mean=0
+		//   std dev=1
+		
+		// auxilary vars
+		$x=$this->random_0_1();
+		$y=$this->random_0_1();
+		
+		// two independent variables with normal distribution N(0,1)
+		$u=sqrt(-2*log($x))*cos(2*pi()*$y);
+		$v=sqrt(-2*log($x))*sin(2*pi()*$y);
+		
+		// i will return only one, couse only one needed
+		return $u;
+	}
+
+	private function gauss_ms($m=0.0,$s=1.0)
+	{
+		return $this->gauss()*$s+$m;
+	}
+
+	private function random_0_1()
+	{
+		return (float)rand()/(float)getrandmax();
+	}
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From b875368167658fd7992812504674afeb61c64831 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Thu, 28 Apr 2011 19:41:44 -0600
Subject: This patch helps provide raw photo support with some small changes to
 the framework. Items can now change their extension and MIME type.

Squashed commit of the following:

commit 4c2b2ebd3f2052898fbfb175650ed4cf49c8006e
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e5279d6cca9a7385066514ff18a2455
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48c392bbbb0370f67cb1bd6fcc00c2a4
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03236f0f70a75959e1d3002025f4e15e
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f12850f59bdeb47a2963f6968b99b5a201
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175bb9eeff36d9c294e97ace9374ef0f3
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70c7e48bea1145eec1b13fb5683e023f
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc4f38f450db9e18da47a5e2ad826af8
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238a1f8eaddfc68580f2d636dd8255795
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f571413e4d57db3515b2070c48d3e9b55
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea946f4c45a04b7e4c7c33929fa8b9f3
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa08c370bb5baf8454afc5b04bc9e49b4
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b793141ca36866a6dd349cd2eac5af68e
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
---
 modules/gallery/controllers/admin_graphics.php |  2 +
 modules/gallery/controllers/quick.php          |  4 +-
 modules/gallery/controllers/uploader.php       |  2 +-
 modules/gallery/helpers/extensions.php         | 39 ++++++++++++++++
 modules/gallery/helpers/system.php             | 25 ++++++++++
 modules/gallery/libraries/Form_Uploadify.php   |  1 +
 modules/gallery/models/item.php                | 63 ++++++++++++++------------
 modules/gallery/tests/Mock_Built_In.php        | 39 ++++++++++++++++
 modules/gallery/tests/System_Helper_Test.php   | 49 ++++++++++++++++++++
 modules/gallery/views/form_uploadify.html.php  |  2 +-
 10 files changed, 194 insertions(+), 32 deletions(-)
 create mode 100644 modules/gallery/helpers/extensions.php
 create mode 100644 modules/gallery/tests/Mock_Built_In.php
 create mode 100644 modules/gallery/tests/System_Helper_Test.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
index a2d19d4a..a8a7cdc0 100644
--- a/modules/gallery/controllers/admin_graphics.php
+++ b/modules/gallery/controllers/admin_graphics.php
@@ -40,6 +40,8 @@ class Admin_Graphics_Controller extends Admin_Controller {
       $msg = t("Changed graphics toolkit to: %toolkit", array("toolkit" => $tk->$toolkit_id->name));
       message::success($msg);
       log::success("graphics", $msg);
+
+      module::event("graphics_toolkit_change", $toolkit_id);
     }
 
     url::redirect("admin/graphics");
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index da4768fd..ce52cb8d 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,8 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      $tmpfile = tempnam(TMPPATH, "rotate") . "." .
-        pathinfo($item->file_path(), PATHINFO_EXTENSION);
+      $tmpfile = system::tempnam(TMPPATH, "rotate",
+        "." . pathinfo($item->file_path(), PATHINFO_EXTENSION));
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
       $item->set_data_file($tmpfile);
       $item->save();
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 6b1455e4..5f3e9ca4 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -51,7 +51,7 @@ class Uploader_Controller extends Controller {
     $file_validation = new Validation($_FILES);
     $file_validation->add_rules(
       "Filedata", "upload::valid",  "upload::required",
-      "upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
+      "upload::type[" . implode(",", extensions::get_upload_extensions()) . "]");
 
     if ($form->validate() && $file_validation->validate()) {
       $temp_filename = upload::save("Filedata");
diff --git a/modules/gallery/helpers/extensions.php b/modules/gallery/helpers/extensions.php
new file mode 100644
index 00000000..bccbfc41
--- /dev/null
+++ b/modules/gallery/helpers/extensions.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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 extensions_Core {
+  static function get_upload_extensions() {
+    // Create a default list of allowed extensions and then let modules modify it.
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    if (movie::find_ffmpeg()) {
+      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
+    }
+    module::event("upload_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_upload_filters() {
+    $filters = array();
+    foreach (self::get_upload_extensions() as $extension) {
+      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
+    }
+    return $filters;
+  }
+}
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index c39c7227..31ecafa7 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -40,4 +40,29 @@ class system_Core {
     }
     return null;
   }
+
+  /**
+   * Create a file with a unique file name.
+   * This helper is similar to the built-in tempnam, except that it supports an optional postfix.
+   */
+  static function tempnam($dir = TMPPATH, $prefix = "", $postfix = "") {
+    return self::_tempnam($dir, $prefix, $postfix, "tempnam");
+  }
+
+  // This helper provides a dependency-injected implementation of tempnam.
+  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+    $success = false;
+    do {
+      $basename = call_user_func($builtin, $dir, $prefix);
+      if (!$basename) {
+        return false;
+      }
+      $filename = $basename . $postfix;
+      $success = !file_exists($filename) && @rename($basename, $filename);
+      if (!$success) {
+        @unlink($basename);
+      }
+    } while (!$success);
+    return $filename;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index 3e35e380..884653e2 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -47,6 +47,7 @@ class Form_Uploadify_Core extends Form_Input {
     $v->script_data = $this->data["script_data"];
     $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit");
     $v->movies_allowed = (bool) movie::find_ffmpeg();
+    $v->extensions = extensions::get_upload_filters();
     $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt");
 
     list ($toolkit_max_filesize_bytes, $toolkit_max_filesize) = graphics::max_filesize();
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 2a5e6894..5ccbe75c 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -127,6 +127,15 @@ class Item_Model_Core extends ORM_MPTT {
     return $this;
   }
 
+  /**
+   * Get the path to the data file associated with this item.
+   * This data file field is only set until you call save().
+   * After that, you can get the path using get_file_path().
+   */
+  public function get_data_file() {
+    return $this->data_file;
+  }
+
   /**
    * Return the server-relative url to this item, eg:
    *   /gallery3/index.php/BobsWedding?page=2
@@ -408,6 +417,16 @@ class Item_Model_Core extends ORM_MPTT {
         // If any significant fields have changed, load up a copy of the original item and
         // keep it around.
         $original = ORM::factory("item", $this->id);
+
+        // Preserve the extension of the data file.
+        if (isset($this->data_file)) {
+          $extension = pathinfo($this->data_file, PATHINFO_EXTENSION);
+          $new_name = pathinfo($this->name, PATHINFO_FILENAME) . ".$extension";
+          if (!empty($extension) && strcmp($this->name, $new_name)) {
+            $this->name = $new_name;
+          }
+        }
+
         if (array_intersect($this->changed, array("parent_id", "name", "slug"))) {
           $original->_build_relative_caches();
           $this->relative_path_cache = null;
@@ -430,7 +449,10 @@ class Item_Model_Core extends ORM_MPTT {
 
         if ($original->parent_id != $this->parent_id || $original->name != $this->name) {
           // Move all of the items associated data files
-          @rename($original->file_path(), $this->file_path());
+          $this->_build_relative_caches();
+          if (!isset($this->data_file)) {
+            @rename($original->file_path(), $this->file_path());
+          }
           if ($this->is_album()) {
             @rename(dirname($original->resize_path()), dirname($this->resize_path()));
             @rename(dirname($original->thumb_path()), dirname($this->thumb_path()));
@@ -460,8 +482,6 @@ class Item_Model_Core extends ORM_MPTT {
         }
 
         // Replace the data file, if requested.
-        // @todo: we don't handle the case where you swap in a file of a different mime type
-        //        should we prevent that in validation?  or in set_data_file()
         if ($this->data_file && ($this->is_photo() || $this->is_movie())) {
           copy($this->data_file, $this->file_path());
 
@@ -481,6 +501,9 @@ class Item_Model_Core extends ORM_MPTT {
           // Null out the data file variable here, otherwise this event will trigger another
           // save() which will think that we're doing another file move.
           $this->data_file = null;
+          if ($original->file_path() != $this->file_path()) {
+            @unlink($original->file_path());
+          }
           module::event("item_updated_data_file", $this);
         }
       }
@@ -517,6 +540,8 @@ class Item_Model_Core extends ORM_MPTT {
         $this->name = "$base_name-$rand";
       }
       $this->slug = "$base_slug-$rand";
+      $this->relative_path_cache = null;
+      $this->relative_url_cache = null;
     }
   }
 
@@ -768,16 +793,7 @@ class Item_Model_Core extends ORM_MPTT {
     }
 
     if ($this->is_movie() || $this->is_photo()) {
-      if ($this->loaded()) {
-        // Existing items can't change their extension
-        $original = ORM::factory("item", $this->id);
-        $new_ext = pathinfo($this->name, PATHINFO_EXTENSION);
-        $old_ext = pathinfo($original->name, PATHINFO_EXTENSION);
-        if (strcasecmp($new_ext, $old_ext)) {
-          $v->add_error("name", "illegal_data_file_extension");
-          return;
-        }
-      } else {
+      if (!$this->loaded()) {
         // New items must have an extension
         $ext = pathinfo($this->name, PATHINFO_EXTENSION);
         if (!$ext) {
@@ -785,9 +801,11 @@ class Item_Model_Core extends ORM_MPTT {
           return;
         }
 
-        if ($this->is_movie() && !preg_match("/^(flv|mp4|m4v)$/i", $ext)) {
-          $v->add_error("name", "illegal_data_file_extension");
-        } else if ($this->is_photo() && !preg_match("/^(gif|jpg|jpeg|png)$/i", $ext)) {
+        if (($this->is_movie() || $this->is_photo()) &&
+            !preg_match("/^(" .
+                        implode("|", array_map("preg_quote",
+                                               extensions::get_upload_extensions())) .
+                        ")\$/i", $ext)) {
           $v->add_error("name", "illegal_data_file_extension");
         }
       }
@@ -813,17 +831,6 @@ class Item_Model_Core extends ORM_MPTT {
     } else if (filesize($this->data_file) == 0) {
       $v->add_error("name", "empty_data_file");
     }
-
-    if ($this->loaded()) {
-      if ($this->is_photo()) {
-        list ($a, $b, $mime_type) = photo::get_file_metadata($this->data_file);
-      } else if ($this->is_movie()) {
-        list ($a, $b, $mime_type) = movie::get_file_metadata($this->data_file);
-      }
-      if ($mime_type != $this->mime_type) {
-        $v->add_error("name", "cant_change_mime_type");
-      }
-    }
   }
 
   /**
@@ -879,7 +886,7 @@ class Item_Model_Core extends ORM_MPTT {
       if ($this->is_movie()) {
         $legal_values = array("video/flv", "video/x-flv", "video/mp4");
       } if ($this->is_photo()) {
-        $legal_values = array("image/jpeg", "image/gif", "image/png");
+        $legal_values = array("image/jpeg", "image/gif", "image/png", "image/tiff");
       }
       break;
 
diff --git a/modules/gallery/tests/Mock_Built_In.php b/modules/gallery/tests/Mock_Built_In.php
new file mode 100644
index 00000000..b02e5ecf
--- /dev/null
+++ b/modules/gallery/tests/Mock_Built_In.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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.
+ */
+/**
+ * Deterministic replacement for the built-in tempnam function.
+ * This is useful in unit tests where a dependency on tempnam needs to be mocked.
+ */
+class Mock_Built_In {
+  private $nonces;
+
+  function __construct() {
+    $this->nonces = func_get_args();
+  }
+
+  function _tempnam($dir, $prefix) {
+    if (empty($this->nonces))
+      return false;
+    $filename = "$dir/$prefix" . array_shift($this->nonces);
+    if (!touch($filename))
+      return false;
+    return $filename;
+  }
+}
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
new file mode 100644
index 00000000..734f98ac
--- /dev/null
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -0,0 +1,49 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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_Helper_Test extends Gallery_Unit_Test_Case {
+  public function tempnam_random_test() {
+    $filename = system::tempnam(TMPPATH, "file", ".ext");
+    $this->assert_true(file_exists($filename), "File not created");
+    unlink($filename);
+  }
+
+  public function tempnam_collision_test() {
+    require_once('Mock_Built_In.php');
+    $existing = TMPPATH . "/file1.ext";
+    $available = TMPPATH . "/file2.ext";
+    touch($existing);
+    $filename = system::_tempnam(TMPPATH, "file", ".ext",
+                                 array(new Mock_Built_In("1", "2"), "_tempnam"));
+    unlink($existing);
+    $this->assert_true(file_exists($filename), "File not created");
+    unlink($filename);
+    $this->assert_equal($available, $filename, "Incorrect filename created");
+  }
+
+  public function tempnam_abort_test() {
+    require_once('Mock_Built_In.php');
+    $filename = system::_tempnam(TMPPATH, "file", ".ext",
+                                 array(new Mock_Built_In(), "_tempnam"));
+    if ($filename) {
+      @unlink($filename);
+    }
+    $this->assert_false($filename, "Operation not aborted");
+  }
+}
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 83dfcc68..ba4a3621 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -28,7 +28,7 @@
         uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
         script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
         scriptData: <?= json_encode($script_data) ?>,
-        fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
+        fileExt: "<?= implode(";", $extensions) ?>",
         fileDesc: <?= t("Photos and movies")->for_js() ?>,
         cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
         simUploadLimit: <?= $simultaneous_upload_limit ?>,
-- 
cgit v1.2.3


From 5c9a3b3f39f6ff0d5c84c2cf283d27eaebe2e66e Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Sat, 23 Apr 2011 21:19:47 -0600
Subject: Create a tempnam substitute that safely creates files with a given
 extension.

---
 modules/gallery/controllers/quick.php        |  4 +--
 modules/gallery/helpers/system.php           | 25 ++++++++++++++
 modules/gallery/tests/Mock_Built_In.php      | 39 ++++++++++++++++++++++
 modules/gallery/tests/System_Helper_Test.php | 49 ++++++++++++++++++++++++++++
 4 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 modules/gallery/tests/Mock_Built_In.php
 create mode 100644 modules/gallery/tests/System_Helper_Test.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index da4768fd..ce52cb8d 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,8 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      $tmpfile = tempnam(TMPPATH, "rotate") . "." .
-        pathinfo($item->file_path(), PATHINFO_EXTENSION);
+      $tmpfile = system::tempnam(TMPPATH, "rotate",
+        "." . pathinfo($item->file_path(), PATHINFO_EXTENSION));
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
       $item->set_data_file($tmpfile);
       $item->save();
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index c39c7227..31ecafa7 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -40,4 +40,29 @@ class system_Core {
     }
     return null;
   }
+
+  /**
+   * Create a file with a unique file name.
+   * This helper is similar to the built-in tempnam, except that it supports an optional postfix.
+   */
+  static function tempnam($dir = TMPPATH, $prefix = "", $postfix = "") {
+    return self::_tempnam($dir, $prefix, $postfix, "tempnam");
+  }
+
+  // This helper provides a dependency-injected implementation of tempnam.
+  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+    $success = false;
+    do {
+      $basename = call_user_func($builtin, $dir, $prefix);
+      if (!$basename) {
+        return false;
+      }
+      $filename = $basename . $postfix;
+      $success = !file_exists($filename) && @rename($basename, $filename);
+      if (!$success) {
+        @unlink($basename);
+      }
+    } while (!$success);
+    return $filename;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/tests/Mock_Built_In.php b/modules/gallery/tests/Mock_Built_In.php
new file mode 100644
index 00000000..b02e5ecf
--- /dev/null
+++ b/modules/gallery/tests/Mock_Built_In.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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.
+ */
+/**
+ * Deterministic replacement for the built-in tempnam function.
+ * This is useful in unit tests where a dependency on tempnam needs to be mocked.
+ */
+class Mock_Built_In {
+  private $nonces;
+
+  function __construct() {
+    $this->nonces = func_get_args();
+  }
+
+  function _tempnam($dir, $prefix) {
+    if (empty($this->nonces))
+      return false;
+    $filename = "$dir/$prefix" . array_shift($this->nonces);
+    if (!touch($filename))
+      return false;
+    return $filename;
+  }
+}
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
new file mode 100644
index 00000000..734f98ac
--- /dev/null
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -0,0 +1,49 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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_Helper_Test extends Gallery_Unit_Test_Case {
+  public function tempnam_random_test() {
+    $filename = system::tempnam(TMPPATH, "file", ".ext");
+    $this->assert_true(file_exists($filename), "File not created");
+    unlink($filename);
+  }
+
+  public function tempnam_collision_test() {
+    require_once('Mock_Built_In.php');
+    $existing = TMPPATH . "/file1.ext";
+    $available = TMPPATH . "/file2.ext";
+    touch($existing);
+    $filename = system::_tempnam(TMPPATH, "file", ".ext",
+                                 array(new Mock_Built_In("1", "2"), "_tempnam"));
+    unlink($existing);
+    $this->assert_true(file_exists($filename), "File not created");
+    unlink($filename);
+    $this->assert_equal($available, $filename, "Incorrect filename created");
+  }
+
+  public function tempnam_abort_test() {
+    require_once('Mock_Built_In.php');
+    $filename = system::_tempnam(TMPPATH, "file", ".ext",
+                                 array(new Mock_Built_In(), "_tempnam"));
+    if ($filename) {
+      @unlink($filename);
+    }
+    $this->assert_false($filename, "Operation not aborted");
+  }
+}
-- 
cgit v1.2.3


From 0e844766baf3b3875cbb2d84579626e05e879420 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Sat, 30 Apr 2011 16:40:55 -0600
Subject: Change the signature of system::tempnam to something more appropriate
 for Gallery.

---
 modules/gallery/controllers/quick.php        |  4 ++--
 modules/gallery/helpers/system.php           | 13 ++++++++-----
 modules/gallery/tests/System_Helper_Test.php |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index ce52cb8d..b6576ec0 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,8 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      $tmpfile = system::tempnam(TMPPATH, "rotate",
-        "." . pathinfo($item->file_path(), PATHINFO_EXTENSION));
+      $tmpfile = system::temp_filename("rotate",
+        pathinfo($item->file_path(), PATHINFO_EXTENSION));
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
       $item->set_data_file($tmpfile);
       $item->save();
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 31ecafa7..9815d588 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -43,15 +43,18 @@ class system_Core {
 
   /**
    * Create a file with a unique file name.
-   * This helper is similar to the built-in tempnam, except that it supports an optional postfix.
+   * This helper is similar to the built-in tempnam.
+   * It allows the caller to specify a prefix and an extension.
+   * It always places the file in TMPPATH.
    */
-  static function tempnam($dir = TMPPATH, $prefix = "", $postfix = "") {
-    return self::_tempnam($dir, $prefix, $postfix, "tempnam");
+  static function temp_filename($prefix = "", $extension = "") {
+    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
   }
 
-  // This helper provides a dependency-injected implementation of tempnam.
+  /**
+   * This helper provides a dependency-injected implementation of tempnam.
+   */
   static function _tempnam($dir, $prefix, $postfix, $builtin) {
-    $success = false;
     do {
       $basename = call_user_func($builtin, $dir, $prefix);
       if (!$basename) {
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index 734f98ac..dfe5d9ab 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,10 +18,11 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
-  public function tempnam_random_test() {
-    $filename = system::tempnam(TMPPATH, "file", ".ext");
+  public function temp_filename_random_test() {
+    $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
+    $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
 
   public function tempnam_collision_test() {
-- 
cgit v1.2.3


From d2d37fe3f2e550dff0c62afa9faa3100f305df0e Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Sat, 30 Apr 2011 21:33:20 -0600
Subject: Results from a round of feedback with Bharat.

Squashed commit of the following:

commit 13dbd3515bfb5324cfbcb3bbeafc179771b54f75
Merge: f0f094c 97400b7
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:33:02 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit f0f094c3f79b09536f58083681c28f73271c506d
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:22:49 2011 -0600

    Explain the conditional rename in item::save() with a comment.

commit 1b3a6b85c156e4777d2aa8205b130984f55dc66d
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:29:34 2011 -0600

    Improve the comment explaining why the data_file extension is important.

commit c3e8c1e3b5e3cb1046acd4c923bb0ae9dbcd603a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:12:56 2011 -0600

    The data_file field is public, so we don't need to supply an accessor method.

commit 2375a02e2cdbd1ccaf7dc4d3db9d85119972e3a9
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:40:55 2011 -0600

    Change the signature of system::tempnam to something more appropriate for Gallery.

commit a8ca9dcf9edd54633c0c78b3af76aa974d38fc64
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:10:06 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 7e61a01a96f5eab7212dba754ac64fdfb4d9e8ab
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:08:49 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 4c2b2ebd3f2052898fbfb175650ed4cf49c8006e
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e5279d6cca9a7385066514ff18a2455
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48c392bbbb0370f67cb1bd6fcc00c2a4
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03236f0f70a75959e1d3002025f4e15e
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f12850f59bdeb47a2963f6968b99b5a201
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175bb9eeff36d9c294e97ace9374ef0f3
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70c7e48bea1145eec1b13fb5683e023f
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc4f38f450db9e18da47a5e2ad826af8
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238a1f8eaddfc68580f2d636dd8255795
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f571413e4d57db3515b2070c48d3e9b55
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea946f4c45a04b7e4c7c33929fa8b9f3
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa08c370bb5baf8454afc5b04bc9e49b4
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b793141ca36866a6dd349cd2eac5af68e
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
---
 modules/gallery/controllers/quick.php        |  4 +--
 modules/gallery/controllers/uploader.php     |  2 +-
 modules/gallery/helpers/legal_file.php       | 39 ++++++++++++++++++++++++++++
 modules/gallery/helpers/system.php           | 13 ++++++----
 modules/gallery/libraries/Form_Uploadify.php |  2 +-
 modules/gallery/models/item.php              | 18 ++++++++++---
 modules/gallery/tests/System_Helper_Test.php |  5 ++--
 7 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 modules/gallery/helpers/legal_file.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index ce52cb8d..b6576ec0 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,8 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      $tmpfile = system::tempnam(TMPPATH, "rotate",
-        "." . pathinfo($item->file_path(), PATHINFO_EXTENSION));
+      $tmpfile = system::temp_filename("rotate",
+        pathinfo($item->file_path(), PATHINFO_EXTENSION));
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
       $item->set_data_file($tmpfile);
       $item->save();
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 5f3e9ca4..9c2bf7d7 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -51,7 +51,7 @@ class Uploader_Controller extends Controller {
     $file_validation = new Validation($_FILES);
     $file_validation->add_rules(
       "Filedata", "upload::valid",  "upload::required",
-      "upload::type[" . implode(",", extensions::get_upload_extensions()) . "]");
+      "upload::type[" . implode(",", legal_file::get_extensions()) . "]");
 
     if ($form->validate() && $file_validation->validate()) {
       $temp_filename = upload::save("Filedata");
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
new file mode 100644
index 00000000..2cb0fb25
--- /dev/null
+++ b/modules/gallery/helpers/legal_file.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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 legal_file_Core {
+  static function get_extensions() {
+    // Create a default list of allowed extensions and then let modules modify it.
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    if (movie::find_ffmpeg()) {
+      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
+    }
+    module::event("legal_file_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_filters() {
+    $filters = array();
+    foreach (self::get_extensions() as $extension) {
+      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
+    }
+    return $filters;
+  }
+}
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 31ecafa7..9815d588 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -43,15 +43,18 @@ class system_Core {
 
   /**
    * Create a file with a unique file name.
-   * This helper is similar to the built-in tempnam, except that it supports an optional postfix.
+   * This helper is similar to the built-in tempnam.
+   * It allows the caller to specify a prefix and an extension.
+   * It always places the file in TMPPATH.
    */
-  static function tempnam($dir = TMPPATH, $prefix = "", $postfix = "") {
-    return self::_tempnam($dir, $prefix, $postfix, "tempnam");
+  static function temp_filename($prefix = "", $extension = "") {
+    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
   }
 
-  // This helper provides a dependency-injected implementation of tempnam.
+  /**
+   * This helper provides a dependency-injected implementation of tempnam.
+   */
   static function _tempnam($dir, $prefix, $postfix, $builtin) {
-    $success = false;
     do {
       $basename = call_user_func($builtin, $dir, $prefix);
       if (!$basename) {
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index 884653e2..450320b3 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -47,7 +47,7 @@ class Form_Uploadify_Core extends Form_Input {
     $v->script_data = $this->data["script_data"];
     $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit");
     $v->movies_allowed = (bool) movie::find_ffmpeg();
-    $v->extensions = extensions::get_upload_filters();
+    $v->extensions = legal_file::get_filters();
     $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt");
 
     list ($toolkit_max_filesize_bytes, $toolkit_max_filesize) = graphics::max_filesize();
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 5ccbe75c..6eb93cfa 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -418,7 +418,11 @@ class Item_Model_Core extends ORM_MPTT {
         // keep it around.
         $original = ORM::factory("item", $this->id);
 
-        // Preserve the extension of the data file.
+        // Preserve the extension of the data file. Many helpers, (e.g. ImageMagick), assume
+        // the MIME type from the extension. So when we adopt the new data file, it's important
+        // to adopt the new extension. That ensures that the item's extension is always
+        // appropriate for its data. We don't try to preserve the name of the data file, though,
+        // because the name is typically a temporary randomly-generated name.
         if (isset($this->data_file)) {
           $extension = pathinfo($this->data_file, PATHINFO_EXTENSION);
           $new_name = pathinfo($this->name, PATHINFO_FILENAME) . ".$extension";
@@ -448,11 +452,19 @@ class Item_Model_Core extends ORM_MPTT {
         }
 
         if ($original->parent_id != $this->parent_id || $original->name != $this->name) {
-          // Move all of the items associated data files
           $this->_build_relative_caches();
+          // If there is a data file, then we want to preserve both the old data and the new data.
+          // (Third-party event handlers would like access to both). The old data file will be
+          // accessible via the $original item, and the new one via $this item. But in that case,
+          // we don't want to rename the original as below, because the old data would end up being
+          // clobbered by the new data file. Also, the rename isn't necessary, because the new item
+          // data is coming from the data file anyway. So we only perform the rename if there isn't
+          // a data file. Another way to solve this would be to copy the original file rather than
+          // conditionally rename it, but a copy would cost far more than the rename.
           if (!isset($this->data_file)) {
             @rename($original->file_path(), $this->file_path());
           }
+          // Move all of the items associated data files
           if ($this->is_album()) {
             @rename(dirname($original->resize_path()), dirname($this->resize_path()));
             @rename(dirname($original->thumb_path()), dirname($this->thumb_path()));
@@ -804,7 +816,7 @@ class Item_Model_Core extends ORM_MPTT {
         if (($this->is_movie() || $this->is_photo()) &&
             !preg_match("/^(" .
                         implode("|", array_map("preg_quote",
-                                               extensions::get_upload_extensions())) .
+                                               legal_file::get_extensions())) .
                         ")\$/i", $ext)) {
           $v->add_error("name", "illegal_data_file_extension");
         }
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index 734f98ac..dfe5d9ab 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,10 +18,11 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
-  public function tempnam_random_test() {
-    $filename = system::tempnam(TMPPATH, "file", ".ext");
+  public function temp_filename_random_test() {
+    $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
+    $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
 
   public function tempnam_collision_test() {
-- 
cgit v1.2.3


From d2331bf43457a8d33491921f106879f087438171 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 4 May 2011 17:48:25 -0600
Subject: Simplified the temp_filename implementation and removed the mocks.

---
 modules/gallery/helpers/system.php           | 15 +++--------
 modules/gallery/tests/Mock_Built_In.php      | 39 ----------------------------
 modules/gallery/tests/System_Helper_Test.php | 25 +-----------------
 3 files changed, 5 insertions(+), 74 deletions(-)
 delete mode 100644 modules/gallery/tests/Mock_Built_In.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 9815d588..e7e58a70 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -47,20 +47,13 @@ class system_Core {
    * It allows the caller to specify a prefix and an extension.
    * It always places the file in TMPPATH.
    */
-  static function temp_filename($prefix = "", $extension = "") {
-    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
-  }
-
-  /**
-   * This helper provides a dependency-injected implementation of tempnam.
-   */
-  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+  static function temp_filename($prefix="", $extension="") {
     do {
-      $basename = call_user_func($builtin, $dir, $prefix);
+      $basename = tempnam(TMPPATH, $prefix);
       if (!$basename) {
         return false;
       }
-      $filename = $basename . $postfix;
+      $filename = "$basename.$extension";
       $success = !file_exists($filename) && @rename($basename, $filename);
       if (!$success) {
         @unlink($basename);
@@ -68,4 +61,4 @@ class system_Core {
     } while (!$success);
     return $filename;
   }
-}
\ No newline at end of file
+}
diff --git a/modules/gallery/tests/Mock_Built_In.php b/modules/gallery/tests/Mock_Built_In.php
deleted file mode 100644
index b02e5ecf..00000000
--- a/modules/gallery/tests/Mock_Built_In.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2011 Chad Parry
- *
- * 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.
- */
-/**
- * Deterministic replacement for the built-in tempnam function.
- * This is useful in unit tests where a dependency on tempnam needs to be mocked.
- */
-class Mock_Built_In {
-  private $nonces;
-
-  function __construct() {
-    $this->nonces = func_get_args();
-  }
-
-  function _tempnam($dir, $prefix) {
-    if (empty($this->nonces))
-      return false;
-    $filename = "$dir/$prefix" . array_shift($this->nonces);
-    if (!touch($filename))
-      return false;
-    return $filename;
-  }
-}
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index dfe5d9ab..3d56c516 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,33 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
-  public function temp_filename_random_test() {
+  public function temp_filename_test() {
     $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
     $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
-
-  public function tempnam_collision_test() {
-    require_once('Mock_Built_In.php');
-    $existing = TMPPATH . "/file1.ext";
-    $available = TMPPATH . "/file2.ext";
-    touch($existing);
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In("1", "2"), "_tempnam"));
-    unlink($existing);
-    $this->assert_true(file_exists($filename), "File not created");
-    unlink($filename);
-    $this->assert_equal($available, $filename, "Incorrect filename created");
-  }
-
-  public function tempnam_abort_test() {
-    require_once('Mock_Built_In.php');
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In(), "_tempnam"));
-    if ($filename) {
-      @unlink($filename);
-    }
-    $this->assert_false($filename, "Operation not aborted");
-  }
 }
-- 
cgit v1.2.3


From 46da011bf69bbc4e45757feda8f0d28e91e7fb6a Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 4 May 2011 17:51:00 -0600
Subject: Remove a newline I accidentally introduced.

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index e7e58a70..4110b4ed 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -61,4 +61,4 @@ class system_Core {
     } while (!$success);
     return $filename;
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 97c3ded2bae24fa18801c94548d1cfd97e19cf2a Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 18 May 2011 22:01:51 -0600
Subject: Better validation for uploaded files, especially where third-party
 modules might make a mistake.

Squashed commit of the following:

commit f2336a5aaa0eb797f252388ecd7b93a82f9646fd
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 21:56:10 2011 -0600

    Behave reasonably if the image cannot be resized.

commit e06b20738d0e0bdb80bae68b7fec2b3746192f6e
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 21:10:08 2011 -0600

    Adding an image representing a broken thumbnail.
    This image was derived from the equivalent Gallery2 icon. It uses the same washed-out gray color scheme as the Gallery3 missing_movie icon.

commit 4e3964527b66d8ccd76fb261d549cd9861a7a780
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 20:30:28 2011 -0600

    Initialize legal file arrays correctly.

commit e9862d8fbc4d6fd06abf157f48dce671a7283993
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 20:20:19 2011 -0600

    Correction for the merge conflict markers I accidentally committed.

commit 5e62d327a8dc477d3edea99826183548aca3e7f3
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 20:17:36 2011 -0600

    Expand the legal_file events to include separate photo and movie events, and to support MIME types.

commit f0bfd1fef0b6d17da9a491f7c724ae53491926a2
Merge: 72f3fc4 db73413
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 18 19:49:25 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

    Conflicts:
    	modules/gallery/helpers/system.php
    	modules/gallery/tests/System_Helper_Test.php

commit db734130c5fe10408040b2326b28b102f3131271
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon May 16 21:38:07 2011 -0700

    Automated update of .build_number to 153 for branch master
    Last update: 9aeb824aa1d15bd94bd7cef0a322c4e8a667e67b (1 commits ago)

commit 8549ba30ca5045211d2efcf8e1c4f98f8a1e9f25
Author: Chad Kieffer <ckieffer@gmail.com>
Date:   Mon May 16 22:37:09 2011 -0600

    Stop IE 9 album grid craziness. Thanks floridave. Fixes #1430.

commit 9aeb824aa1d15bd94bd7cef0a322c4e8a667e67b
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Sun May 8 11:43:38 2011 -0700

    Automated update of .build_number to 152 for branch master
    Last update: 7c80e6ef84b460dcade80c4dd5a65b41b0523505 (1 commits ago)

commit 57f7e42a128848d73ad2a7ac0bf9df2fee6ba8b8
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Sun May 8 11:42:40 2011 -0700

    Add the item id to the print_proxy line so that we have a little more info
    about what the original was, and extend the timeout to 90 days from 10.
    Fixes #1733.

commit 7c80e6ef84b460dcade80c4dd5a65b41b0523505
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Fri May 6 11:48:43 2011 -0700

    Automated update of .build_number to 151 for branch master
    Last update: 5d09cbff048fc2f457c8b19adb2177a12445890a (1 commits ago)

commit 80dda6f64fd26f373cc138a199652099accceb26
Merge: 5d09cbf 46da011
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Fri May 6 11:48:13 2011 -0700

    Merge pull request #52 from chadparry/tempnam

    Fixes #1732

commit 5d09cbff048fc2f457c8b19adb2177a12445890a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Thu May 5 21:53:39 2011 -0700

    Automated update of .build_number to 150 for branch master
    Last update: 011eaa6480cbee8d328a31c9ac5c8e0ddc1f8a84 (1 commits ago)

commit d5a31ceedee5841531f57342266746bb62d7d923
Author: Tim Almdal <tnalmdal@shaw.ca>
Date:   Thu May 5 21:53:10 2011 -0700

    Fix for ticket 1275. Do the same checking as Kohana uses and don't worry about calling the utf8_encode routine.
    Corrected the error messages and also added a check to insure the XML Parser extension is loaded as we still need the utf8_encode function from it.

commit 011eaa6480cbee8d328a31c9ac5c8e0ddc1f8a84
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Thu May 5 14:53:06 2011 -0700

    Automated update of .build_number to 149 for branch master
    Last update: 05ecfda36b7acee7f8d36df8391ba960097178a8 (1 commits ago)

commit 5bae21864f54a03b557ab349cf97ba5f1d4276dc
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Thu May 5 14:52:47 2011 -0700

    Follow-on to 6f916e49d5b431c2c1961a13d1a61fef8c02d628 -- don't make
    database calls if Gallery isn't installed, else we fail to bounce the
    user to the installer on fresh packages.  #1637.

commit 46da011bf69bbc4e45757feda8f0d28e91e7fb6a
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 4 17:51:00 2011 -0600

    Remove a newline I accidentally introduced.

commit 5c6c71ffcdea354b5b9b30aaea2c1f92c8860d42
Merge: d2331bf 05ecfda
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 4 17:49:42 2011 -0600

    Merge branch 'master' into tempnam

commit d2331bf43457a8d33491921f106879f087438171
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 4 17:48:25 2011 -0600

    Simplified the temp_filename implementation and removed the mocks.

commit 72f3fc46f6c7c9043e730063051ecfd88bf314c8
Author: Chad Parry <github@chad.parry.org>
Date:   Wed May 4 17:22:15 2011 -0600

    Avoid "self::" because Kohana can't override it.

commit 05ecfda36b7acee7f8d36df8391ba960097178a8
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon May 2 21:38:50 2011 -0700

    Automated update of .build_number to 148 for branch master
    Last update: 97400b78153620262120868b37545170416413c9 (2 commits ago)

commit 229bfc5c7c760c53d1357503fd61bf9a165acf6e
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon May 2 21:37:04 2011 -0700

    Track and redirect core.DownloadItem requests properly.  This can
    happen if the G2 was imported with rewrite on, so the g2_url in the
    g2_map table has a shortened url, but then rewrite is disabled and the
    .htaccess mod_rewrite rules are sending over a &g2_view=core.DownloadItem
    request.  Fixes #1728.

commit 68370b92f5f6fa68744655f8c68b4b0ca59bf4fd
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon May 2 21:36:17 2011 -0700

    Map the G2 album highlight thumbnail derivative id to the G3 album's
    thumbnail.  Fixes #1729.

commit 13dbd3515bfb5324cfbcb3bbeafc179771b54f75
Merge: f0f094c 97400b7
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:33:02 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit f0f094c3f79b09536f58083681c28f73271c506d
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 20:22:49 2011 -0600

    Explain the conditional rename in item::save() with a comment.

commit 1b3a6b85c156e4777d2aa8205b130984f55dc66d
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:29:34 2011 -0600

    Improve the comment explaining why the data_file extension is important.

commit c3e8c1e3b5e3cb1046acd4c923bb0ae9dbcd603a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 18:12:56 2011 -0600

    The data_file field is public, so we don't need to supply an accessor method.

commit 0e844766baf3b3875cbb2d84579626e05e879420
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:40:55 2011 -0600

    Change the signature of system::tempnam to something more appropriate for Gallery.

commit 5c9a3b3f39f6ff0d5c84c2cf283d27eaebe2e66e
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit 2375a02e2cdbd1ccaf7dc4d3db9d85119972e3a9
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:40:55 2011 -0600

    Change the signature of system::tempnam to something more appropriate for Gallery.

commit a8ca9dcf9edd54633c0c78b3af76aa974d38fc64
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:10:06 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 7e61a01a96f5eab7212dba754ac64fdfb4d9e8ab
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 30 16:08:49 2011 -0600

    Change the name of the extensions helper to legal_file.

commit 4c2b2ebd3f2052898fbfb175650ed4cf49c8006e
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:52:35 2011 -0600

    Remove a newline at the end of the file that I accidentally introduced.

commit 6d564f185e5279d6cca9a7385066514ff18a2455
Merge: 7ff485f 4060640
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:35:58 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 7ff485fa48c392bbbb0370f67cb1bd6fcc00c2a4
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Apr 27 20:29:06 2011 -0600

    Move the extensions helpers out of the Kohana system directory and into their own Gallery Extensions class.

commit 26585fed03236f0f70a75959e1d3002025f4e15e
Merge: 809567f c8f90e8
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:28:39 2011 -0600

    Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

commit 809567f12850f59bdeb47a2963f6968b99b5a201
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 08:10:04 2011 -0600

    Expose the data file field.

commit fcb06bf175bb9eeff36d9c294e97ace9374ef0f3
Author: Chad Parry <github@chad.parry.org>
Date:   Sun Apr 24 00:45:12 2011 -0600

    Don't assign to the item->name field if the name is unchanged, because the save method will crash.

commit c6ef706d70c7e48bea1145eec1b13fb5683e023f
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 22:55:59 2011 -0600

    Preserve old data files long enough for them to be available to event handlers.

commit 0d6a3a3cfc4f38f450db9e18da47a5e2ad826af8
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 21:19:47 2011 -0600

    Create a tempnam substitute that safely creates files with a given extension.

commit e149cf7238a1f8eaddfc68580f2d636dd8255795
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:39:25 2011 -0600

    Support data files that change their extension and MIME type.

commit 6702104f571413e4d57db3515b2070c48d3e9b55
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Apr 23 16:35:00 2011 -0600

    Resolve an infinite recursion that happens when the path caches are updated during saving.

commit 944cb72eea946f4c45a04b7e4c7c33929fa8b9f3
Merge: 567522b 5af74d4
Author: Chad Parry <github@chad.parry.org>
Date:   Fri Apr 22 14:10:42 2011 -0600

    Merge remote branch 'origin/master' into rawphoto

commit 567522bfa08c370bb5baf8454afc5b04bc9e49b4
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 20:12:32 2011 -0600

    Add an event for when a new graphics toolkit is chosen.

commit 31ba081b793141ca36866a6dd349cd2eac5af68e
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Apr 21 02:06:53 2011 -0600

    Add an event that will collect all valid filename extensions.
---
 .build_number                                |   2 +-
 installer/installer.php                      |  10 +++++--
 modules/digibug/controllers/digibug.php      |   6 ++---
 modules/g2_import/controllers/g2.php         |   4 ++-
 modules/g2_import/helpers/g2_import.php      |   7 ++++-
 modules/gallery/config/locale.php            |   7 ++++-
 modules/gallery/helpers/graphics.php         |  22 ++++++++++++---
 modules/gallery/helpers/legal_file.php       |  39 +++++++++++++++++++++++----
 modules/gallery/helpers/system.php           |  13 +++------
 modules/gallery/images/missing_photo.png     | Bin 0 -> 1570 bytes
 modules/gallery/models/item.php              |  15 ++++++-----
 modules/gallery/tests/System_Helper_Test.php |  25 +----------------
 themes/wind/js/ui.init.js                    |   2 +-
 13 files changed, 93 insertions(+), 59 deletions(-)
 create mode 100644 modules/gallery/images/missing_photo.png

(limited to 'modules/gallery/helpers')

diff --git a/.build_number b/.build_number
index 1bdd507d..190e1781 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=147
+build_number=153
diff --git a/installer/installer.php b/installer/installer.php
index c23d918f..0bef57ae 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -191,8 +191,10 @@ class installer {
       $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the <a href=\"http://php.net/mysql\">MySQL</a> or the  <a href=\"http://php.net/mysqli\">MySQLi</a> extension.";
     }
 
-    if (!@preg_match("/^.$/u", utf8_encode("\xF1"))) {
-      $errors[] = "PHP is missing <a href=\"http://php.net/pcre\">Perl-Compatible Regular Expression</a> support.";
+    if (!preg_match("/^.$/u", "ñ")) {
+      $errors[] = "PHP is missing <a href=\"http://php.net/pcre\">Perl-Compatible Regular Expression</a> with UTF-8 support.";
+    } else if (!preg_match("/^\pL$/u", "ñ")) {
+      $errors[] = "PHP is missing <a href=\"http://php.net/pcre\">Perl-Compatible Regular Expression</a> with Unicode support.";
     }
 
     if (!(function_exists("spl_autoload_register"))) {
@@ -211,6 +213,10 @@ class installer {
       $errors[] = "PHP is missing the <a href=\"http://php.net/iconv\">iconv extension</a>";
     }
 
+    if (!(extension_loaded("xml"))) {
+      $errors[] = "PHP is missing the <a href=\"http://php.net/xml\">XML Parser extension</a>";
+    }
+
     if (!(extension_loaded("simplexml"))) {
       $errors[] = "PHP is missing the <a href=\"http://php.net/simplexml\">SimpleXML extension</a>";
     }
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 4acb6513..672afe57 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -33,8 +33,8 @@ class Digibug_Controller extends Controller {
       $proxy->uuid = random::hash();
       $proxy->item_id = $item->id;
       $proxy->save();
-      $full_url = url::abs_site("digibug/print_proxy/full/$proxy->uuid");
-      $thumb_url = url::abs_site("digibug/print_proxy/thumb/$proxy->uuid");
+      $full_url = url::abs_site("digibug/print_proxy/full/$proxy->uuid/$item->id");
+      $thumb_url = url::abs_site("digibug/print_proxy/thumb/$proxy->uuid/$item->id");
     }
 
     $v = new View("digibug_form.html");
@@ -114,7 +114,7 @@ class Digibug_Controller extends Controller {
   private function _clean_expired() {
     db::build()
       ->delete("digibug_proxies")
-      ->where("request_date", "<=", db::expr("(CURDATE() - INTERVAL 10 DAY)"))
+      ->where("request_date", "<=", db::expr("(CURDATE() - INTERVAL 90 DAY)"))
       ->limit(20)
       ->execute();
   }
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 6e60bed0..90984e84 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -41,7 +41,9 @@ class G2_Controller extends Controller {
         // (bbcode, embedding) people are using the id style URLs although URL rewriting is enabled.
         $where = array(array("g2_id", "=", $id));
         $view = $input->get("g2_view");
-        if ($view) {
+        if ($view == "core.DownloadItem") {
+          $where[] = array("resource_type", "IN", array("file", "resize", "thumbnail", "full"));
+        } else if ($view) {
           $where[] = array("g2_url", "like", "%g2_view=$view%");
         } // else: Assuming that the first search hit is sufficiently good.
       } else if ($path) {
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 3606c7ef..c79a8d36 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -560,7 +560,7 @@ class g2_import_Core {
     $table = g2(GalleryCoreApi::fetchThumbnailsByItemIds(array($g2_album_id)));
     if (isset($table[$g2_album_id])) {
       // Backtrack the source id to an item
-      $g2_source = $table[$g2_album_id];
+      $orig_g2_source = $g2_source = $table[$g2_album_id];
       while (GalleryUtilities::isA($g2_source, "GalleryDerivative")) {
         $g2_source = g2(GalleryCoreApi::loadEntitiesById($g2_source->getDerivativeSourceId()));
       }
@@ -584,6 +584,11 @@ class g2_import_Core {
                 array("name" => $g3_album->name)),
               $e);
         }
+
+        self::set_map(
+          $orig_g2_source->getId(), $g3_album->id,
+          "thumbnail",
+          self::g2_url(array("view" => "core.DownloadItem", "itemId" => $orig_g2_source->getId())));
       }
     }
   }
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 13de9098..bce7fb49 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -32,7 +32,12 @@ $config['language'] = array('en_US', 'English_United States');
  * Locale timezone.  Set in 'Advanced' settings, falling back to the server's zone.
  * @see http://php.net/timezones
  */
-$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
+if (file_exists(VARPATH . "database.php")) {
+  $config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
+} else {
+  // Gallery3 is not installed yet -- don't make module::get_var() calls.
+  $config['timezone'] = date_default_timezone_get();
+}
 
 // i18n settings
 
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index acb11bfb..3b9769de 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -170,23 +170,37 @@ class graphics_Core {
 
         foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args), $item);
-          call_user_func_array($rule->operation, $args);
-          $working_file = $output_file;
+          try {
+            call_user_func_array($rule->operation, $args);
+            $working_file = $output_file;
+          } catch (Exception $e) {
+            // Ignore this filter and move on.
+            Kohana_Log::add("error", "Caught exception filtering image: {$item->title}\n" .
+                            $e->getMessage() . "\n" . $e->getTraceAsString());
+          }
         }
       }
 
       if (!empty($ops["thumb"])) {
+        if (file_exists($item->thumb_path())) {
+          $item->thumb_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->thumb_path());
+        }
         $dims = getimagesize($item->thumb_path());
         $item->thumb_width = $dims[0];
         $item->thumb_height = $dims[1];
-        $item->thumb_dirty = 0;
       }
 
       if (!empty($ops["resize"]))  {
+        if (file_exists($item->resize_path())) {
+          $item->resize_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->resize_path());
+        }
         $dims = getimagesize($item->resize_path());
         $item->resize_width = $dims[0];
         $item->resize_height = $dims[1];
-        $item->resize_dirty = 0;
       }
       $item->save();
     } catch (Exception $e) {
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index 2cb0fb25..0d3e9728 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -18,22 +18,51 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class legal_file_Core {
-  static function get_extensions() {
+  static function get_photo_extensions() {
     // Create a default list of allowed extensions and then let modules modify it.
     $extensions_wrapper = new stdClass();
     $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    module::event("legal_photo_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_movie_extensions() {
+    // Create a default list of allowed extensions and then let modules modify it.
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("flv", "mp4", "m4v");
+    module::event("legal_movie_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_extensions() {
+    $extensions = legal_file::get_photo_extensions();
     if (movie::find_ffmpeg()) {
-      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
+      $extensions = array_merge($extensions, legal_file::get_movie_extensions());
     }
-    module::event("legal_file_extensions", $extensions_wrapper);
-    return $extensions_wrapper->extensions;
+    return $extensions;
   }
 
   static function get_filters() {
     $filters = array();
-    foreach (self::get_extensions() as $extension) {
+    foreach (legal_file::get_extensions() as $extension) {
       array_push($filters, "*." . $extension, "*." . strtoupper($extension));
     }
     return $filters;
   }
+
+  static function get_photo_types() {
+    // Create a default list of allowed types and then let modules modify it.
+    $types_wrapper = new stdClass();
+    $types_wrapper->types = array("image/jpeg", "image/gif", "image/png");
+    module::event("legal_photo_types", $types_wrapper);
+    return $types_wrapper->types;
+  }
+
+  static function get_movie_types() {
+    // Create a default list of allowed types and then let modules modify it.
+    $types_wrapper = new stdClass();
+    $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4");
+    module::event("legal_movie_types", $types_wrapper);
+    return $types_wrapper->types;
+  }
 }
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 9815d588..4110b4ed 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -47,20 +47,13 @@ class system_Core {
    * It allows the caller to specify a prefix and an extension.
    * It always places the file in TMPPATH.
    */
-  static function temp_filename($prefix = "", $extension = "") {
-    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
-  }
-
-  /**
-   * This helper provides a dependency-injected implementation of tempnam.
-   */
-  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+  static function temp_filename($prefix="", $extension="") {
     do {
-      $basename = call_user_func($builtin, $dir, $prefix);
+      $basename = tempnam(TMPPATH, $prefix);
       if (!$basename) {
         return false;
       }
-      $filename = $basename . $postfix;
+      $filename = "$basename.$extension";
       $success = !file_exists($filename) && @rename($basename, $filename);
       if (!$success) {
         @unlink($basename);
diff --git a/modules/gallery/images/missing_photo.png b/modules/gallery/images/missing_photo.png
new file mode 100644
index 00000000..67786275
Binary files /dev/null and b/modules/gallery/images/missing_photo.png differ
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 6eb93cfa..4a0c8e38 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -813,10 +813,13 @@ class Item_Model_Core extends ORM_MPTT {
           return;
         }
 
-        if (($this->is_movie() || $this->is_photo()) &&
+        if ($this->is_photo() &&
             !preg_match("/^(" .
-                        implode("|", array_map("preg_quote",
-                                               legal_file::get_extensions())) .
+                        implode("|", array_map("preg_quote", legal_file::get_photo_extensions())) .
+                        ")\$/i", $ext) ||
+            $this->is_movie() &&
+            !preg_match("/^(" .
+                        implode("|", array_map("preg_quote", legal_file::get_movie_extensions())) .
                         ")\$/i", $ext)) {
           $v->add_error("name", "illegal_data_file_extension");
         }
@@ -896,9 +899,9 @@ class Item_Model_Core extends ORM_MPTT {
     switch($field) {
     case "mime_type":
       if ($this->is_movie()) {
-        $legal_values = array("video/flv", "video/x-flv", "video/mp4");
-      } if ($this->is_photo()) {
-        $legal_values = array("image/jpeg", "image/gif", "image/png", "image/tiff");
+        $legal_values = legal_file::get_movie_types();
+      } else if ($this->is_photo()) {
+        $legal_values = legal_file::get_photo_types();
       }
       break;
 
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index dfe5d9ab..3d56c516 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,33 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
-  public function temp_filename_random_test() {
+  public function temp_filename_test() {
     $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
     $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
-
-  public function tempnam_collision_test() {
-    require_once('Mock_Built_In.php');
-    $existing = TMPPATH . "/file1.ext";
-    $available = TMPPATH . "/file2.ext";
-    touch($existing);
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In("1", "2"), "_tempnam"));
-    unlink($existing);
-    $this->assert_true(file_exists($filename), "File not created");
-    unlink($filename);
-    $this->assert_equal($available, $filename, "Incorrect filename created");
-  }
-
-  public function tempnam_abort_test() {
-    require_once('Mock_Built_In.php');
-    $filename = system::_tempnam(TMPPATH, "file", ".ext",
-                                 array(new Mock_Built_In(), "_tempnam"));
-    if ($filename) {
-      @unlink($filename);
-    }
-    $this->assert_false($filename, "Operation not aborted");
-  }
 }
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 2c67bf3a..3ee3e32e 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -82,7 +82,7 @@ $(document).ready(function() {
         } else {
           var sib_height = $(this).prev().height();
         }
-        if ($.browser.msie && $.browser.version >= 8) {
+        if ($.browser.msie && $.browser.version <= 8) {
           sib_height = sib_height + 1;
         }
         $(this).css("height", sib_height);
-- 
cgit v1.2.3


From 1807e10a56be504b11900f3ffe3cfb28b7bca5ed Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 18 May 2011 22:05:40 -0600
Subject: Merging some changes from rawphoto

---
 modules/gallery/helpers/extensions.php | 39 ----------------------------------
 modules/gallery/models/item.php        |  9 --------
 2 files changed, 48 deletions(-)
 delete mode 100644 modules/gallery/helpers/extensions.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/extensions.php b/modules/gallery/helpers/extensions.php
deleted file mode 100644
index bccbfc41..00000000
--- a/modules/gallery/helpers/extensions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2011 Chad Parry
- *
- * 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 extensions_Core {
-  static function get_upload_extensions() {
-    // Create a default list of allowed extensions and then let modules modify it.
-    $extensions_wrapper = new stdClass();
-    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
-    if (movie::find_ffmpeg()) {
-      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
-    }
-    module::event("upload_extensions", $extensions_wrapper);
-    return $extensions_wrapper->extensions;
-  }
-
-  static function get_upload_filters() {
-    $filters = array();
-    foreach (self::get_upload_extensions() as $extension) {
-      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
-    }
-    return $filters;
-  }
-}
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4a0c8e38..1dd9b00b 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -127,15 +127,6 @@ class Item_Model_Core extends ORM_MPTT {
     return $this;
   }
 
-  /**
-   * Get the path to the data file associated with this item.
-   * This data file field is only set until you call save().
-   * After that, you can get the path using get_file_path().
-   */
-  public function get_data_file() {
-    return $this->data_file;
-  }
-
   /**
    * Return the server-relative url to this item, eg:
    *   /gallery3/index.php/BobsWedding?page=2
-- 
cgit v1.2.3


From 61691fdf713950f704427640bc30776990768d98 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 5 Jun 2011 17:16:07 -0700
Subject: Use the strict form of mb_detect_encoding for best results. Thanks to
 guthy in
 https://github.com/gallery/gallery3/commit/fa6f233603267505c216abc4f12663d245cd23e7#commitcomment-403145
  Fixes #1745.

---
 modules/gallery/helpers/encoding.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/encoding.php b/modules/gallery/helpers/encoding.php
index c5928634..7d5add34 100644
--- a/modules/gallery/helpers/encoding.php
+++ b/modules/gallery/helpers/encoding.php
@@ -19,13 +19,16 @@
  */
 class encoding_Core {
   static function convert_to_utf8($value) {
-    if (function_exists("mb_detect_encoding") &&
-        function_exists("mb_convert_encoding") &&
-        mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-      $value = mb_convert_encoding($value, "UTF-8", mb_detect_encoding($value));
-    } else if (function_exists("mb_detect_encoding") &&
-               mb_detect_encoding($value, "ISO-8859-1, UTF-8") != "UTF-8") {
-      $value = utf8_encode($value);
+    if (function_exists("mb_detect_encoding")) {
+      // Rely on mb_detect_encoding()'s strict mode
+      $src_encoding = mb_detect_encoding($value, mb_detect_order(), true);
+      if ($src_encoding != "UTF-8") {
+        if (function_exists("mb_convert_encoding") && $src_encoding) {
+          $value = mb_convert_encoding($value, "UTF-8", $src_encoding);
+        } else {
+          $value = utf8_encode($value);
+        }
+      }
     }
     return $value;
   }
-- 
cgit v1.2.3


From c76c4e654880a6e03d70522ed8427154d53c1590 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 15 Jun 2011 20:15:20 -0600
Subject: Refer to "rules" not "filters"

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 3b9769de..39c87fbd 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -174,8 +174,8 @@ class graphics_Core {
             call_user_func_array($rule->operation, $args);
             $working_file = $output_file;
           } catch (Exception $e) {
-            // Ignore this filter and move on.
-            Kohana_Log::add("error", "Caught exception filtering image: {$item->title}\n" .
+            // Ignore this rule and move on.
+            Kohana_Log::add("error", "Caught exception processing image: {$item->title}\n" .
                             $e->getMessage() . "\n" . $e->getTraceAsString());
           }
         }
-- 
cgit v1.2.3


From 20d7bfd6b904053c2bc27b69d32c71a321e0dae9 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 15 Jun 2011 20:21:06 -0600
Subject: Write more PHP docs

---
 modules/gallery/helpers/legal_file.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index 0d3e9728..d78efdda 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -18,22 +18,29 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class legal_file_Core {
+  /**
+   * Create a default list of allowed photo extensions and then let modules modify it.
+   */
   static function get_photo_extensions() {
-    // Create a default list of allowed extensions and then let modules modify it.
     $extensions_wrapper = new stdClass();
     $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
     module::event("legal_photo_extensions", $extensions_wrapper);
     return $extensions_wrapper->extensions;
   }
 
+  /**
+   * Create a default list of allowed movie extensions and then let modules modify it.
+   */
   static function get_movie_extensions() {
-    // Create a default list of allowed extensions and then let modules modify it.
     $extensions_wrapper = new stdClass();
     $extensions_wrapper->extensions = array("flv", "mp4", "m4v");
     module::event("legal_movie_extensions", $extensions_wrapper);
     return $extensions_wrapper->extensions;
   }
 
+  /**
+   * Create a merged list of all allowed photo and movie extensions.
+   */
   static function get_extensions() {
     $extensions = legal_file::get_photo_extensions();
     if (movie::find_ffmpeg()) {
@@ -42,6 +49,10 @@ class legal_file_Core {
     return $extensions;
   }
 
+  /**
+   * Create a merged list of all photo and movie filename filters,
+   * (e.g. "*.gif"), based on allowed extensions.
+   */
   static function get_filters() {
     $filters = array();
     foreach (legal_file::get_extensions() as $extension) {
@@ -50,16 +61,20 @@ class legal_file_Core {
     return $filters;
   }
 
+  /**
+   * Create a default list of allowed photo MIME types and then let modules modify it.
+   */
   static function get_photo_types() {
-    // Create a default list of allowed types and then let modules modify it.
     $types_wrapper = new stdClass();
     $types_wrapper->types = array("image/jpeg", "image/gif", "image/png");
     module::event("legal_photo_types", $types_wrapper);
     return $types_wrapper->types;
   }
 
+  /**
+   * Create a default list of allowed movie MIME types and then let modules modify it.
+   */
   static function get_movie_types() {
-    // Create a default list of allowed types and then let modules modify it.
     $types_wrapper = new stdClass();
     $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4");
     module::event("legal_movie_types", $types_wrapper);
-- 
cgit v1.2.3


From 142088a6353dfd051e0dc72e1e30fa51fb6d7f2b Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Wed, 15 Jun 2011 20:46:23 -0600
Subject: Gracefully handle rule failures with a broken image icon. This will
 be especially useful as third-party modules start supporting a larger variety
 of image types, and as errors creep into their image processing.

---
 modules/gallery/helpers/graphics.php     |  22 ++++++++++++++++++----
 modules/gallery/images/missing_photo.png | Bin 0 -> 1570 bytes
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 modules/gallery/images/missing_photo.png

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index acb11bfb..39c87fbd 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -170,23 +170,37 @@ class graphics_Core {
 
         foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args), $item);
-          call_user_func_array($rule->operation, $args);
-          $working_file = $output_file;
+          try {
+            call_user_func_array($rule->operation, $args);
+            $working_file = $output_file;
+          } catch (Exception $e) {
+            // Ignore this rule and move on.
+            Kohana_Log::add("error", "Caught exception processing image: {$item->title}\n" .
+                            $e->getMessage() . "\n" . $e->getTraceAsString());
+          }
         }
       }
 
       if (!empty($ops["thumb"])) {
+        if (file_exists($item->thumb_path())) {
+          $item->thumb_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->thumb_path());
+        }
         $dims = getimagesize($item->thumb_path());
         $item->thumb_width = $dims[0];
         $item->thumb_height = $dims[1];
-        $item->thumb_dirty = 0;
       }
 
       if (!empty($ops["resize"]))  {
+        if (file_exists($item->resize_path())) {
+          $item->resize_dirty = 0;
+        } else {
+          copy(MODPATH . "gallery/images/missing_photo.png", $item->resize_path());
+        }
         $dims = getimagesize($item->resize_path());
         $item->resize_width = $dims[0];
         $item->resize_height = $dims[1];
-        $item->resize_dirty = 0;
       }
       $item->save();
     } catch (Exception $e) {
diff --git a/modules/gallery/images/missing_photo.png b/modules/gallery/images/missing_photo.png
new file mode 100644
index 00000000..67786275
Binary files /dev/null and b/modules/gallery/images/missing_photo.png differ
-- 
cgit v1.2.3


From 44b624f6fbc34cbc638afa1c2a1f6cb0ae154a03 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Thu, 21 Jul 2011 00:11:52 -0600
Subject: Squashed commit of the following:

commit 41d379c2b777ae7b3a11f528971228e234f8976f
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:10:10 2011 -0600

    Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion.

commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426
Merge: 8f7904a 403f64b
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jul 20 21:02:56 2011 -0600

    Merge branch 'master' into rawphoto

commit 403f64bf2a91fe3ac2496a0a6a6180ece26afd82
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Tue Jul 12 21:44:14 2011 -0700

    Automated update of .build_number to 163 for branch master
    Last update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago)

commit 51726f9e4b8372c40b27f843fca7b783e6db9623
Author: Tim Almdal <tnalmdal@shaw.ca>
Date:   Tue Jul 12 21:44:40 2011 -0700

    Fix for ticket #1752.  Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album.

commit e8382b960a3c19bb28140833e348e6c9c9db8a8a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:27:04 2011 -0700

    Automated update of .build_number to 162 for branch master
    Last update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago)

commit 1afbcafe0e556ac571a5282f8b481fb90f5fb05a
Merge: 40cda7f fc6c139
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:26:41 2011 -0700

    Merge pull request #56 from alindeman/alindeman/1758

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date:   Mon Jun 27 22:25:54 2011 -0700

    Automated update of .build_number to 161 for branch master
    Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago)

commit aa08df7f0a839c95d268853cd745f622c98cadd0
Merge: 771de0a 784c429
Author: Bharat Mediratta <bharat@menalto.com>
Date:   Mon Jun 27 22:25:46 2011 -0700

    Merge pull request #55 from alindeman/alindeman/1757

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit fc6c1390d3d5f3d99d75b04acf208ae3729c11ce
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 08:25:50 2011 -0400

    [Fixes #1758] Link to themes codex page instead of modules codex page

commit 784c429070db54e183feb3e0ea6f2726b6507081
Author: Andy Lindeman <alindeman@gmail.com>
Date:   Mon Jun 27 07:24:37 2011 -0400

    [Fixes #1757] Redirect to root album if path comes in as main.php or index.php

commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1
Merge: e950573 771de0a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Jun 25 14:12:39 2011 -0600

    Merge branches 'master' and 'rawphoto' into rawphoto

commit e95057337996351e49915d9f85d007d50103a4be
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jun 15 20:24:18 2011 -0600

    Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
---
 .build_number                               | 2 +-
 modules/g2_import/controllers/g2.php        | 2 +-
 modules/gallery/helpers/gallery_rss.php     | 8 ++++++++
 modules/gallery/models/item.php             | 8 ++------
 modules/gallery/views/admin_themes.html.php | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/.build_number b/.build_number
index e627526e..a10819e7 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=160
+build_number=163
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 90984e84..1252014f 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -34,7 +34,7 @@ class G2_Controller extends Controller {
     $path = $input->get("path");
     $id = $input->get("g2_itemId");
 
-    if ($path || $id) {
+    if (($path && $path != 'index.php' && $path != 'main.php') || $id) {
       if ($id) {
         // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
         // Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 612872e6..9af67118 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -21,6 +21,14 @@
 class gallery_rss_Core {
   static function available_feeds($item, $tag) {
     $feeds["gallery/latest"] = t("Latest photos and movies");
+
+    if ($item) {
+      $feed_item = $item -> is_album() ? $item : $item->parent();
+
+      $feeds["gallery/album/{$feed_item->id}"] =
+          t("%title photos and movies", array("title" => $feed_item->title));
+    }
+
     return $feeds;
   }
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 1dd9b00b..cccb7074 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -805,13 +805,9 @@ class Item_Model_Core extends ORM_MPTT {
         }
 
         if ($this->is_photo() &&
-            !preg_match("/^(" .
-                        implode("|", array_map("preg_quote", legal_file::get_photo_extensions())) .
-                        ")\$/i", $ext) ||
+            !in_array(strtolower($ext), array_map("strtolower", legal_file::get_photo_extensions())) ||
             $this->is_movie() &&
-            !preg_match("/^(" .
-                        implode("|", array_map("preg_quote", legal_file::get_movie_extensions())) .
-                        ")\$/i", $ext)) {
+            !in_array(strtolower($ext), array_map("strtolower", legal_file::get_movie_extensions()))) {
           $v->add_error("name", "illegal_data_file_extension");
         }
       }
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index 7d947b28..9d53779f 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -48,7 +48,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
@@ -88,7 +88,7 @@
 
         <? if (!$count): ?>
         <p>
-          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?>
+          <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?>
         </p>
         <? endif ?>
       </div>
-- 
cgit v1.2.3


From 0672c8f83f068c546454bacefac123b5acb508cc Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Thu, 21 Jul 2011 01:12:26 -0600
Subject: Polishing the rawphoto changes, including adding some tests.

Squashed commit of the following:

commit 945316a8c220b12adb687c896bcc5e86f99f46a4
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 01:11:13 2011 -0600

    Add a test for the sunny-day scenario where a rule changes a data file's MIME type.

commit 4ee1ee000c8f4d8ebaae66f637bc71080486fd73
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:49:47 2011 -0600

    Ensure that a third-party cannot swap out a legitimate photo with an unsafe file type.

commit 7dd0105bfc59c150e5640e693778f51bbaa44eab
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:48:19 2011 -0600

    Update the MIME type and other meta-data when a new data file is provided.

commit 5a8844c7947b21cf658f22cc61f20ffa9e8f07f2
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:30:01 2011 -0600

    Remove a unit test that no longer applies. Replacement data files are allowed to have different MIME types.

commit 0de9c6283ce4f5773cad8e92b6785d6a1f7b5e46
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:27:45 2011 -0600

    If one rule fails, then abort processing, rather than trying to proceed to subsequent rules.

commit 41d379c2b777ae7b3a11f528971228e234f8976f
Author: Chad Parry <github@chad.parry.org>
Date:   Thu Jul 21 00:10:10 2011 -0600

    Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion.

commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426
Merge: 8f7904a 403f64b
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jul 20 21:02:56 2011 -0600

    Merge branch 'master' into rawphoto

commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1
Merge: e950573 771de0a
Author: Chad Parry <github@chad.parry.org>
Date:   Sat Jun 25 14:12:39 2011 -0600

    Merge branches 'master' and 'rawphoto' into rawphoto

commit e95057337996351e49915d9f85d007d50103a4be
Author: Chad Parry <github@chad.parry.org>
Date:   Wed Jun 15 20:24:18 2011 -0600

    Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
---
 modules/gallery/helpers/graphics.php      | 10 ++--------
 modules/gallery/models/item.php           |  7 +++++++
 modules/gallery/tests/Item_Model_Test.php | 23 +++++++++++++++++++++--
 3 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 39c87fbd..3548faa1 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -170,14 +170,8 @@ class graphics_Core {
 
         foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args), $item);
-          try {
-            call_user_func_array($rule->operation, $args);
-            $working_file = $output_file;
-          } catch (Exception $e) {
-            // Ignore this rule and move on.
-            Kohana_Log::add("error", "Caught exception processing image: {$item->title}\n" .
-                            $e->getMessage() . "\n" . $e->getTraceAsString());
-          }
+          call_user_func_array($rule->operation, $args);
+          $working_file = $output_file;
         }
       }
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index cccb7074..93e97af6 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -420,6 +420,13 @@ class Item_Model_Core extends ORM_MPTT {
           if (!empty($extension) && strcmp($this->name, $new_name)) {
             $this->name = $new_name;
           }
+          if ($this->is_photo()) {
+            list ($this->width, $this->height, $this->mime_type, $extension) =
+              photo::get_file_metadata($this->data_file);
+          } else if ($this->is_movie()) {
+            list ($this->width, $this->height, $this->mime_type, $extension) =
+              movie::get_file_metadata($this->data_file);
+          }
         }
 
         if (array_intersect($this->changed, array("parent_id", "name", "slug"))) {
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 968d7510..19ab8ec4 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -394,15 +394,34 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $this->assert_equal(20337, filesize($photo->file_path()));
   }
 
-  public function replacement_data_file_must_be_same_mime_type_test() {
+  public function replace_data_file_type_test() {
     // Random photo is modules/gallery/tests/test.jpg
     $photo = test::random_photo();
+    $this->assert_equal(1024, $photo->width);
+    $this->assert_equal(768, $photo->height);
+    $this->assert_equal(6232, filesize($photo->file_path()));
+    $this->assert_equal("image/jpeg", $photo->mime_type);
+    $orig_name = $photo->name;
+
+    // Random photo is gallery/images/graphicsmagick.png is 104x76 and 1486 bytes
     $photo->set_data_file(MODPATH . "gallery/images/graphicsmagick.png");
+    $photo->save();
+
+    $this->assert_equal(104, $photo->width);
+    $this->assert_equal(76, $photo->height);
+    $this->assert_equal(1486, filesize($photo->file_path()));
+    $this->assert_equal("image/png", $photo->mime_type);
+    $this->assert_equal("png", pathinfo($photo->name, PATHINFO_EXTENSION));
+    $this->assert_equal(pathinfo($orig_name, PATHINFO_FILENAME), pathinfo($photo->name, PATHINFO_FILENAME));
+  }
 
+  public function unsafe_data_file_replacement_test() {
     try {
+      $photo = test::random_photo();
+      $photo->set_data_file(MODPATH . "gallery/tests/Item_Model_Test.php");
       $photo->save();
     } catch (ORM_Validation_Exception $e) {
-      $this->assert_same(array("name" => "cant_change_mime_type"), $e->validation->errors());
+      $this->assert_same(array("mime_type" => "invalid"), $e->validation->errors());
       return;  // pass
     }
     $this->assert_true(false, "Shouldn't get here");
-- 
cgit v1.2.3


From 458c6316e7810cb430b5e00b22808175f3134bc2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 24 Jul 2011 08:31:39 -0700
Subject: Assign copyright to Bharat Mediratta as trustee for Gallery, per
 https://github.com/gallery/gallery3/pull/51/files

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

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index d78efdda..6f66c85c 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2011 Chad Parry
+ * Copyright (C) 2000-2011 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
-- 
cgit v1.2.3


From ce43f29e2ceaac3d638061f81dc6037b5e0018d3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Aug 2011 11:18:07 -0700
Subject: Refactor the display context code a bit: 1) Move the display context
 code into the controller themselves so that it's    more logically a
 continuation callback from the original controller    rendering code. 2)
 Simplify the display context set/get code and put it in the item helper,   
 it's just a couple of lines of code now. 3) Add more descriptive breadcrumb
 strings

---
 modules/gallery/controllers/albums.php             | 24 ++++++--
 modules/gallery/controllers/movies.php             | 10 ++-
 modules/gallery/controllers/photos.php             | 10 ++-
 modules/gallery/helpers/item.php                   | 17 ++++++
 modules/gallery/libraries/Display_Context.php      | 71 ----------------------
 modules/gallery/libraries/Item_Display_Context.php | 44 --------------
 modules/search/controllers/search.php              | 36 ++++++++---
 .../search/libraries/Search_Display_Context.php    | 52 ----------------
 modules/tag/controllers/tag.php                    | 34 +++++++++--
 modules/tag/libraries/Tag_Display_Context.php      | 49 ---------------
 10 files changed, 102 insertions(+), 245 deletions(-)
 delete mode 100644 modules/gallery/libraries/Display_Context.php
 delete mode 100644 modules/gallery/libraries/Item_Display_Context.php
 delete mode 100644 modules/search/libraries/Search_Display_Context.php
 delete mode 100644 modules/tag/libraries/Tag_Display_Context.php

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9bf7b9bf..8aa3bb35 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -60,9 +60,6 @@ class Albums_Controller extends Items_Controller {
       url::redirect($album->abs_url("page=$max_pages"));
     }
 
-    Display_Context::factory("item")
-      ->save();
-
     $template = new Theme_View("page.html", "collection", "album");
     $template->set_global(
       array("page" => $page,
@@ -75,10 +72,29 @@ class Albums_Controller extends Items_Controller {
             "breadcrumbs" => Breadcrumb::array_from_item_parents($album),
             "children_count" => $children_count));
     $template->content = new View("album.html");
-
     $album->increment_view_count();
 
     print $template;
+    item::set_display_context_callback("Albums_Controller::get_display_context");
+  }
+
+  static function get_display_context($item) {
+    $where = array(array("type", "!=", "album"));
+    $position = item::get_position($item, $where);
+    if ($position > 1) {
+      list ($previous_item, $ignore, $next_item) =
+        $item->parent()->viewable()->children(3, $position - 2, $where);
+    } else {
+      $previous_item = null;
+      list ($next_item) = $item->parent()->viewable()->children(1, $position, $where);
+    }
+
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $item->parent()->viewable()->children_count($where),
+                 "parents" => $item->parents()->as_array(),
+                 "breadcrumbs" => Breadcrumb::array_from_item_parents($item));
   }
 
   public function create($parent_id) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index bbf89f17..76263dc0 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -28,12 +28,10 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $movie);
 
     $template = new Theme_View("page.html", "item", "movie");
-    $template->set_global(
-      array_merge(array("item" => $movie,
-                        "children" => array(),
-                        "children_count" => 0),
-            Display_Context::factory()->display_context($movie)));
-
+    $template->set_global(array("item" => $movie,
+                                "children" => array(),
+                                "children_count" => 0));
+    $template->set_global(item::get_display_context($movie));
     $template->content = new View("movie.html");
 
     $movie->increment_view_count();
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 49bb5a25..7e78b205 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -28,12 +28,10 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
 
     $template = new Theme_View("page.html", "item", "photo");
-    $template->set_global(
-      array_merge(array("item" => $photo,
-                        "children" => array(),
-                        "children_count" => 0),
-                  Display_Context::factory()->display_context($photo)));
-
+    $template->set_global(array("item" => $photo,
+                                "children" => array(),
+                                "children_count" => 0));
+    $template->set_global(item::get_display_context($photo));
     $template->content = new View("photo.html");
 
     $photo->increment_view_count();
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 7e779544..494c6db4 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -402,4 +402,21 @@ class item_Core {
 
     return $position;
   }
+
+  /**
+   * Set the display context callback for any future item renders.
+   */
+  static function set_display_context_callback() {
+    Cache::instance()->set("display_context_" . $sid = Session::instance()->id(), func_get_args());
+  }
+
+  /**
+   * Call the display context callback for the given item
+   */
+  static function get_display_context($item) {
+    $args = Cache::instance()->get("display_context_" . $sid = Session::instance()->id());
+    $callback = $args[0];
+    $args[0] = $item;
+    return call_user_func_array($callback, $args);
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Display_Context.php b/modules/gallery/libraries/Display_Context.php
deleted file mode 100644
index 5054cffb..00000000
--- a/modules/gallery/libraries/Display_Context.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 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.
- */
-
-abstract class Display_Context_Core {
-  private $_display_context_name;
-  private $_data;
-
-  static function factory($display_context_name=null) {
-    if (empty($display_context_name)) {
-      $display_context_id = Session::instance()->get("display_context_id", "");
-      $context = Cache::instance()->get($display_context_id, null);
-      $context = empty($context) ? new Item_Display_Context() : unserialize($context);
-    } else {
-      $class_prefix = ucfirst(strtolower($display_context_name));
-      $class_name = "{$class_prefix}_Display_Context";
-      $context = new $class_name();
-    }
-
-    return $context;
-  }
-
-  protected function __construct($display_context_name) {
-    // $this->reset($display_context_name);
-    $this->_data = array();
-    $this->_display_context_name = $display_context_name;
-  }
-
-  final function get($key) {
-    return empty($this->_data[$key]) ? null : $this->_data[$key];
-  }
-
-  final function set($key, $value=null) {
-    if (is_array($key)) {
-      if ((array)$key == $key) {
-        $this->_data = array_merge($this->_data, $key);
-      } else {
-        $this->_data = array_merge($this->_data, array_fill_keys($key, $value));
-      }
-    } else {
-      $this->_data[$key] = $value;
-    }
-    return $this;
-  }
-
-  final function save() {
-    $context_data = serialize($this);
-    $display_context_id = "display_context_" . md5($context_data);
-    Session::instance()->set("display_context_id", $display_context_id);
-    Cache::instance()->set($display_context_id, $context_data);
-    return $this;
-  }
-
-  abstract function display_context($item);
-}
diff --git a/modules/gallery/libraries/Item_Display_Context.php b/modules/gallery/libraries/Item_Display_Context.php
deleted file mode 100644
index d0562790..00000000
--- a/modules/gallery/libraries/Item_Display_Context.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 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 Item_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("item");
-  }
-
-  function display_context($item) {
-    $where = array(array("type", "!=", "album"));
-    $position = item::get_position($item, $where);
-    if ($position > 1) {
-      list ($previous_item, $ignore, $next_item) =
-        $item->parent()->viewable()->children(3, $position - 2, $where);
-    } else {
-      $previous_item = null;
-      list ($next_item) = $item->parent()->viewable()->children(1, $position, $where);
-   }
-
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => $item->parent()->viewable()->children_count($where),
-                 "parents" => $item->parents()->as_array(),
-                 "breadcrumbs" => Breadcrumb::array_from_item_parents($item));
-  }
-}
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 1d5a55bf..e4ac6702 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -29,7 +29,7 @@ class Search_Controller extends Controller {
       $index = search::get_position($child, $q_with_more_terms);
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect( url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
+        url::redirect(url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
       }
     }
 
@@ -48,12 +48,6 @@ class Search_Controller extends Controller {
 
     $max_pages = max(ceil($count / $page_size), 1);
 
-    Display_Context::factory("search")
-      ->set(array("title" => $title,
-                  "query_terms" => $q_with_more_terms,
-                  "q" => $q))
-      ->save();
-
     $template = new Theme_View("page.html", "collection", "search");
     $root = item::root();
     $template->set_global(
@@ -71,5 +65,33 @@ class Search_Controller extends Controller {
     $template->content->q = $q;
 
     print $template;
+
+    item::set_display_context_callback(
+      "Search_Controller::get_display_context", $title, $q_with_more_terms, $q);
+  }
+
+  static function get_display_context($item, $title, $query_terms, $q) {
+    $position = search::get_position($item, $query_terms);
+
+    if ($position > 1) {
+      list ($count, $result_data) = search::search($query_terms, 3, $position - 2);
+      list ($previous_item, $ignore, $next_item) = $result_data;
+    } else {
+      $previous_item = null;
+      list ($count, $result_data) = search::search($query_terms, 1, $position);
+      list ($next_item) = $result_data;
+    }
+
+    $search_url = url::abs_site("search?q=" . urlencode($q) . "&show={$item->id}");
+    $root = item::root();
+
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $count,
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, "/", $root->id)->set_first(),
+                   Breadcrumb::instance(t("Search: %q", array("q" => $q)), $search_url),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 }
diff --git a/modules/search/libraries/Search_Display_Context.php b/modules/search/libraries/Search_Display_Context.php
deleted file mode 100644
index aed3a125..00000000
--- a/modules/search/libraries/Search_Display_Context.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 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 Search_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("search");
-  }
-
-  function display_context($item) {
-    $position = search::get_position($item, $this->get("query_terms"));
-
-    if ($position > 1) {
-      list ($count, $result_data) =
-        search::search($this->get("query_terms"), 3, $position - 2);
-      list ($previous_item, $ignore, $next_item) = $result_data;
-    } else {
-      $previous_item = null;
-      list ($count, $result_data) = search::search($this->get("query_terms"), 1, $position);
-      list ($next_item) = $result_data;
-    }
-
-    $q = $this->get("q");
-    $search_url = url::abs_site("search?q=" . urlencode($q) . "&show={$item->id}");
-    $root = item::root();
-
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => $count,
-                 "breadcrumbs" => array(
-                                  Breadcrumb::instance($root->title, "/", $root->id),
-                                  Breadcrumb::instance($q, $search_url),
-                                  Breadcrumb::instance($item->title, $item->url())));
-  }
-}
diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 1628f0ac..559e2a5a 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -50,10 +50,6 @@ class Tag_Controller extends Controller {
     }
 
     $root = item::root();
-    Display_Context::factory("tag")
-      ->set(array("tag" => $tag))
-      ->save();
-
     $template = new Theme_View("page.html", "collection", "tag");
     $template->set_global(
       array("page" => $page,
@@ -63,11 +59,37 @@ class Tag_Controller extends Controller {
             "children" => $tag->items($page_size, $offset),
             "breadcrumbs" => array(
               Breadcrumb::instance($root->title, $root->url())->set_first(),
-              Breadcrumb::instance($tag->name, $tag->url())->set_last()),
+              Breadcrumb::instance(t("Tag: %tag_name", array("tag_name" => $tag->name)),
+                                   $tag->url())->set_last()),
             "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));
-
     print $template;
+
+    item::set_display_context_callback("Tag_Controller::get_display_context", $tag->id);
+  }
+
+  static function get_display_context($item, $tag_id) {
+    $tag = ORM::factory("tag", $tag_id);
+    $where = array(array("type", "!=", "album"));
+
+    $position = tag::get_position($tag, $item, $where);
+    if ($position > 1) {
+      list ($previous_item, $ignore, $next_item) = $tag->items(3, $position - 2, $where);
+    } else {
+      $previous_item = null;
+      list ($next_item) = $tag->items(1, $position, $where);
+    }
+
+    $root = item::root();
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $tag->items_count($where),
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, $root->url())->set_first(),
+                   Breadcrumb::instance(t("Tag: %tag_name", array("tag_name" => $tag->name)),
+                                        $tag->url("show={$item->id}")),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 }
diff --git a/modules/tag/libraries/Tag_Display_Context.php b/modules/tag/libraries/Tag_Display_Context.php
deleted file mode 100644
index 47c79088..00000000
--- a/modules/tag/libraries/Tag_Display_Context.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 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 Tag_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("tag");
-  }
-
-  function display_context($item) {
-    $tag = $this->get("tag");
-
-    $where = array(array("type", "!=", "album"));
-
-    $position = tag::get_position($tag, $item, $where);
-    if ($position > 1) {
-      list ($previous_item, $ignore, $next_item) = $tag->items(3, $position - 2, $where);
-    } else {
-      $previous_item = null;
-      list ($next_item) = $tag->items(1, $position, $where);
-    }
-
-    $root = item::root();
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => $tag->items_count($where),
-                 "breadcrumbs" => array(
-                   Breadcrumb::instance($root->title, $root->url())->set_first(),
-                   Breadcrumb::instance($tag->name, $tag->url("show={$item->id}")),
-                   Breadcrumb::instance($item->title, $item->url())->set_last()));
-  }
-}
-- 
cgit v1.2.3