From ab920ae360d5cca446784675bb0401349c50d9fb Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 18 Feb 2013 19:12:45 +0100
Subject: #1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
 - added MY_Kohana to provide wrapper for auto_load(), which loads dummy class
 when none found. - revised Bootstrap to load MY_Kohana.

This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
---
 modules/gallery/libraries/MY_Kohana.php | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 modules/gallery/libraries/MY_Kohana.php

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/MY_Kohana.php b/modules/gallery/libraries/MY_Kohana.php
new file mode 100644
index 00000000..d344c8ed
--- /dev/null
+++ b/modules/gallery/libraries/MY_Kohana.php
@@ -0,0 +1,45 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2013 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.
+ */
+final class Kohana extends Kohana_Core {
+  /**
+   * Wrapper function for Kohana::auto_load that provides compatibility with Zend Guard Loader's
+   * code obfuscation.  Zend Guard is enabled by default on many PHP 5.3+ installations and can
+   * cause problems with Kohana 2.4.  When a class is not found, Zend Guard Loader may continue to
+   * try and load the class, eventually leading to a seg fault.
+   *
+   * Instead, if we can't find the class and we can see that code obfuscation is at level 3+, let's
+   * load a dummy class.  This does not change the return value, so Kohana still knows that
+   * there is no class.
+   *
+   * This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
+   */
+  public static function auto_load($class) {
+    $found = parent::auto_load($class);
+
+    if (!$found && function_exists("zend_current_obfuscation_level") &&
+        (zend_current_obfuscation_level() >= 3)) {
+      // Load a dummy class instead.
+      eval("class $class {}");
+    }
+
+    // Return the same result.
+    return $found;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9b9f1a7b07daecf2251770e4f49838f22cb58a2a Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 2 Mar 2013 13:25:10 +0100
Subject: #2031 - Add class_exists() before method_exists() if class existence
 is unknown. - fixed all instances of this in core code - deleted previous
 Zend Guard Loader workaround in MY_Kohana.php - updated Bootstrap.php to
 reflect deleted MY_Kohana.php

---
 application/Bootstrap.php                      |  2 +-
 modules/gallery/controllers/admin.php          |  2 +-
 modules/gallery/helpers/block_manager.php      | 10 +++---
 modules/gallery/helpers/module.php             | 18 +++++------
 modules/gallery/helpers/task.php               |  2 +-
 modules/gallery/libraries/Admin_View.php       |  2 +-
 modules/gallery/libraries/IdentityProvider.php |  3 +-
 modules/gallery/libraries/MY_Kohana.php        | 45 --------------------------
 modules/gallery/libraries/SafeString.php       |  2 +-
 modules/gallery/libraries/Theme_View.php       |  4 +--
 modules/gallery/tests/Html_Helper_Test.php     |  2 +-
 modules/gallery/tests/SafeString_Test.php      |  4 +--
 modules/rest/controllers/rest.php              |  2 +-
 modules/rest/helpers/rest.php                  |  6 ++--
 modules/rss/controllers/rss.php                |  2 +-
 modules/rss/helpers/rss_block.php              |  2 +-
 16 files changed, 32 insertions(+), 76 deletions(-)
 delete mode 100644 modules/gallery/libraries/MY_Kohana.php

(limited to 'modules/gallery/libraries')

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index a79ccba4..93353b47 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -35,7 +35,7 @@ require SYSPATH.'core/Event'.EXT;
 final class Event extends Event_Core {}
 
 require SYSPATH.'core/Kohana'.EXT;
-require MODPATH.'gallery/libraries/MY_Kohana'.EXT;
+final class Kohana extends Kohana_Core {}
 
 require SYSPATH.'core/Kohana_Exception'.EXT;
 require MODPATH.'gallery/libraries/MY_Kohana_Exception'.EXT;
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index c9d944cc..b35a9299 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -55,7 +55,7 @@ class Admin_Controller extends Controller {
       $method = "index";
     }
 
-    if (!method_exists($controller_name, $method)) {
+    if (!class_exists($controller_name) || !method_exists($controller_name, $method)) {
       throw new Kohana_404_Exception();
     }
 
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index bd6ca1c8..a2279468 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -35,7 +35,7 @@ class block_manager_Core {
 
   static function activate_blocks($module_name) {
     $block_class = "{$module_name}_block";
-    if (method_exists($block_class, "get_site_list")) {
+    if (class_exists($block_class) && method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach (array_keys($blocks) as $block_id) {
         block_manager::add("site_sidebar", $module_name, $block_id);
@@ -61,14 +61,14 @@ class block_manager_Core {
 
   static function deactivate_blocks($module_name) {
     $block_class = "{$module_name}_block";
-    if (method_exists($block_class, "get_site_list")) {
+    if (class_exists($block_class) && method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach  (array_keys($blocks) as $block_id) {
         block_manager::remove_blocks_for_module("site_sidebar", $module_name);
       }
     }
 
-    if (method_exists($block_class, "get_admin_list")) {
+    if (class_exists($block_class) && method_exists($block_class, "get_admin_list")) {
       $blocks = call_user_func(array($block_class, "get_admin_list"));
       foreach (array("dashboard_sidebar", "dashboard_center") as $location) {
         block_manager::remove_blocks_for_module($location, $module_name);
@@ -89,7 +89,7 @@ class block_manager_Core {
 
     foreach (module::active() as $module) {
       $class_name = "{$module->name}_block";
-      if (method_exists($class_name, $function)) {
+      if (class_exists($class_name) && method_exists($class_name, $function)) {
         foreach (call_user_func(array($class_name, $function)) as $id => $title) {
           $blocks["{$module->name}:$id"] = $title;
         }
@@ -102,7 +102,7 @@ class block_manager_Core {
     $active = block_manager::get_active($location);
     $result = "";
     foreach ($active as $id => $desc) {
-      if (method_exists("$desc[0]_block", "get")) {
+      if (class_exists("$desc[0]_block") && method_exists("$desc[0]_block", "get")) {
         $block = call_user_func(array("$desc[0]_block", "get"), $desc[1], $theme);
         if (!empty($block)) {
           $block->id = $id;
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index d7429121..da201d20 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -141,7 +141,7 @@ class module_Core {
     $messages = array();
 
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "can_activate")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "can_activate")) {
       $messages = call_user_func(array($installer_class, "can_activate"));
     }
 
@@ -173,7 +173,7 @@ class module_Core {
     module::_add_to_path($module_name);
 
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "install")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "install")) {
       call_user_func_array(array($installer_class, "install"), array());
     }
     module::set_version($module_name, module::available()->$module_name->code_version);
@@ -226,7 +226,7 @@ class module_Core {
     $version_before = module::get_version($module_name);
     $installer_class = "{$module_name}_installer";
     $available = module::available();
-    if (method_exists($installer_class, "upgrade")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "upgrade")) {
       call_user_func_array(array($installer_class, "upgrade"), array($version_before));
     } else {
       if (isset($available->$module_name->code_version)) {
@@ -261,7 +261,7 @@ class module_Core {
     module::_add_to_path($module_name);
 
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "activate")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "activate")) {
       call_user_func_array(array($installer_class, "activate"), array());
     }
 
@@ -288,7 +288,7 @@ class module_Core {
    */
   static function deactivate($module_name) {
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "deactivate")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "deactivate")) {
       call_user_func_array(array($installer_class, "deactivate"), array());
     }
 
@@ -314,7 +314,7 @@ class module_Core {
    */
   static function uninstall($module_name) {
     $installer_class = "{$module_name}_installer";
-    if (method_exists($installer_class, "uninstall")) {
+    if (class_exists($installer_class) && method_exists($installer_class, "uninstall")) {
       call_user_func(array($installer_class, "uninstall"));
     }
 
@@ -403,7 +403,7 @@ class module_Core {
         continue;
       }
       $class = "{$module->name}_event";
-      if (method_exists($class, $function)) {
+      if (class_exists($class) && method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);
       }
     }
@@ -411,7 +411,7 @@ class module_Core {
     // Give the admin theme a chance to respond, if we're in admin mode.
     if (theme::$is_admin) {
       $class = theme::$admin_theme_name . "_event";
-      if (method_exists($class, $function)) {
+      if (class_exists($class) && method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);
       }
     }
@@ -419,7 +419,7 @@ class module_Core {
     // Give the site theme a chance to respond as well.  It gets a chance even in admin mode, as
     // long as the theme has an admin subdir.
     $class = theme::$site_theme_name . "_event";
-    if (method_exists($class, $function)) {
+    if (class_exists($class) && method_exists($class, $function)) {
       call_user_func_array(array($class, $function), $args);
     }
   }
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 32fd9739..5638faf4 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -25,7 +25,7 @@ class task_Core {
     $tasks = array();
     foreach (module::active() as $module) {
       $class_name = "{$module->name}_task";
-      if (method_exists($class_name, "available_tasks")) {
+      if (class_exists($class_name) && method_exists($class_name, "available_tasks")) {
         foreach (call_user_func(array($class_name, "available_tasks")) as $task) {
           $tasks[$task->callback] = $task;
         }
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 83163868..62645d18 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -95,7 +95,7 @@ class Admin_View_Core extends Gallery_View {
       $blocks = array();
       foreach (module::active() as $module) {
         $helper_class = "{$module->name}_theme";
-        if (method_exists($helper_class, $function)) {
+        if (class_exists($helper_class) && method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
             array($helper_class, $function),
             array_merge(array($this), $args));
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 23368a6a..525e1695 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -81,7 +81,8 @@ class IdentityProvider_Core {
 
       module::set_var("gallery", "identity_provider", $new_provider);
 
-      if (method_exists("{$new_provider}_installer", "initialize")) {
+      if (class_exists("{$new_provider}_installer") &&
+          method_exists("{$new_provider}_installer", "initialize")) {
         call_user_func("{$new_provider}_installer::initialize");
       }
 
diff --git a/modules/gallery/libraries/MY_Kohana.php b/modules/gallery/libraries/MY_Kohana.php
deleted file mode 100644
index d344c8ed..00000000
--- a/modules/gallery/libraries/MY_Kohana.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2013 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.
- */
-final class Kohana extends Kohana_Core {
-  /**
-   * Wrapper function for Kohana::auto_load that provides compatibility with Zend Guard Loader's
-   * code obfuscation.  Zend Guard is enabled by default on many PHP 5.3+ installations and can
-   * cause problems with Kohana 2.4.  When a class is not found, Zend Guard Loader may continue to
-   * try and load the class, eventually leading to a seg fault.
-   *
-   * Instead, if we can't find the class and we can see that code obfuscation is at level 3+, let's
-   * load a dummy class.  This does not change the return value, so Kohana still knows that
-   * there is no class.
-   *
-   * This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
-   */
-  public static function auto_load($class) {
-    $found = parent::auto_load($class);
-
-    if (!$found && function_exists("zend_current_obfuscation_level") &&
-        (zend_current_obfuscation_level() >= 3)) {
-      // Load a dummy class instead.
-      eval("class $class {}");
-    }
-
-    // Return the same result.
-    return $found;
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/libraries/SafeString.php b/modules/gallery/libraries/SafeString.php
index 31e9d31b..179cbd41 100644
--- a/modules/gallery/libraries/SafeString.php
+++ b/modules/gallery/libraries/SafeString.php
@@ -153,7 +153,7 @@ class SafeString_Core {
    * Purify the string, removing any potentially malicious or unsafe HTML / JavaScript.
    */
   private static function _purify_for_html($dirty_html) {
-    if (method_exists("purifier", "purify")) {
+    if (class_exists("purifier") && method_exists("purifier", "purify")) {
       return purifier::purify($dirty_html);
     } else {
       return self::_escape_for_html($dirty_html);
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 986fc8a2..0a4c96e1 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -239,7 +239,7 @@ class Theme_View_Core extends Gallery_View {
           continue;
         }
         $helper_class = "{$module->name}_theme";
-        if (method_exists($helper_class, $function)) {
+        if (class_exists($helper_class) && method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
             array($helper_class, $function),
             array_merge(array($this), $args));
@@ -247,7 +247,7 @@ class Theme_View_Core extends Gallery_View {
       }
 
       $helper_class = theme::$site_theme_name . "_theme";
-      if (method_exists($helper_class, $function)) {
+      if (class_exists($helper_class) && method_exists($helper_class, $function)) {
         $blocks[] = call_user_func_array(
           array($helper_class, $function),
           array_merge(array($this), $args));
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index 476faa5a..4643e6fd 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -27,7 +27,7 @@ class Html_Helper_Test extends Gallery_Unit_Test_Case {
 
   public function purify_test() {
     $safe_string = html::purify("hello <p  >world</p>");
-    $expected = method_exists("purifier", "purify")
+    $expected = (class_exists("purifier") && method_exists("purifier", "purify"))
       ? "hello <p>world</p>"
       : "hello &lt;p  &gt;world&lt;/p&gt;";
     $this->assert_equal($expected, $safe_string->unescaped());
diff --git a/modules/gallery/tests/SafeString_Test.php b/modules/gallery/tests/SafeString_Test.php
index 946410d4..dab7d7df 100644
--- a/modules/gallery/tests/SafeString_Test.php
+++ b/modules/gallery/tests/SafeString_Test.php
@@ -91,7 +91,7 @@ class SafeString_Test extends Gallery_Unit_Test_Case {
 
   public function purify_test() {
     $safe_string = SafeString::purify("hello <p  >world</p>");
-    $expected = method_exists("purifier", "purify")
+    $expected = (class_exists("purifier") && method_exists("purifier", "purify"))
       ? "hello <p>world</p>"
       : "hello &lt;p  &gt;world&lt;/p&gt;";
     $this->assert_equal($expected, $safe_string);
@@ -100,7 +100,7 @@ class SafeString_Test extends Gallery_Unit_Test_Case {
   public function purify_twice_test() {
     $safe_string = SafeString::purify("hello <p  >world</p>");
     $safe_string_2 = SafeString::purify($safe_string);
-    $expected = method_exists("purifier", "purify")
+    $expected = (class_exists("purifier") && method_exists("purifier", "purify"))
       ? "hello <p>world</p>"
       : "hello &lt;p  &gt;world&lt;/p&gt;";
     $this->assert_equal($expected, $safe_string_2);
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 54ca6fe9..b3d59e0f 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -98,7 +98,7 @@ class Rest_Controller extends Controller {
       $handler_class = "{$function}_rest";
       $handler_method = $request->method;
 
-      if (!method_exists($handler_class, $handler_method)) {
+      if (!class_exists($handler_class) || !method_exists($handler_class, $handler_method)) {
         throw new Rest_Exception("Bad Request", 400);
       }
 
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 9b367feb..c6be1e1d 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -141,7 +141,7 @@ class rest_Core {
     }
 
     $class = "$components[1]_rest";
-    if (!method_exists($class, "resolve")) {
+    if (!class_exists($class) || !method_exists($class, "resolve")) {
       throw new Kohana_404_Exception($url);
     }
 
@@ -158,7 +158,7 @@ class rest_Core {
     $resource_type = array_shift($args);
 
     $class = "{$resource_type}_rest";
-    if (!method_exists($class, "url")) {
+    if (!class_exists($class) || !method_exists($class, "url")) {
       throw new Rest_Exception("Bad Request", 400);
     }
 
@@ -178,7 +178,7 @@ class rest_Core {
     foreach (module::active() as $module) {
       foreach (glob(MODPATH . "{$module->name}/helpers/*_rest.php") as $filename) {
         $class = str_replace(".php", "", basename($filename));
-        if (method_exists($class, "relationships")) {
+        if (class_exists($class) && method_exists($class, "relationships")) {
           if ($tmp = call_user_func(array($class, "relationships"), $resource_type, $resource)) {
             $results = array_merge($results, $tmp);
           }
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 12461325..571995b3 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -32,7 +32,7 @@ class Rss_Controller extends Controller {
     // Run the appropriate feed callback
     if (module::is_active($module_id)) {
       $class_name = "{$module_id}_rss";
-      if (method_exists($class_name, "feed")) {
+      if (class_exists($class_name) && method_exists($class_name, "feed")) {
         $feed = call_user_func(
           array($class_name, "feed"), $feed_id,
           ($page - 1) * $page_size, $page_size, $id);
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
index 74334e93..9a77b05d 100644
--- a/modules/rss/helpers/rss_block.php
+++ b/modules/rss/helpers/rss_block.php
@@ -29,7 +29,7 @@ class rss_block_Core {
       $feeds = array();
       foreach (module::active() as $module) {
         $class_name = "{$module->name}_rss";
-        if (method_exists($class_name, "available_feeds")) {
+        if (class_exists($class_name) && method_exists($class_name, "available_feeds")) {
           $feeds = array_merge($feeds,
             call_user_func(array($class_name, "available_feeds"), $theme->item(), $theme->tag()));
         }
-- 
cgit v1.2.3


From c137740e267bdcb6af58c839d0790399d625f41b Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 11 Mar 2013 11:40:15 +0100
Subject: #2050 - Update Admin_View to handle events like Theme_View. - changed
 Admin_View event handling to reflect that of Theme_View (gallery_theme gets
 called first, admin theme gets called last, debug mode isn't called for
 body_attributes and gets g-clear-fix)

---
 modules/gallery/libraries/Admin_View.php | 34 +++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 62645d18..ba348d7a 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -93,7 +93,28 @@ class Admin_View_Core extends Gallery_View {
     case "body_attributes":
     case "html_attributes":
       $blocks = array();
+      if (method_exists("gallery_theme", $function)) {
+        switch (count($args)) {
+        case 0:
+          $blocks[] = gallery_theme::$function($this);
+          break;
+        case 1:
+          $blocks[] = gallery_theme::$function($this, $args[0]);
+          break;
+        case 2:
+          $blocks[] = gallery_theme::$function($this, $args[0], $args[1]);
+          break;
+        default:
+          $blocks[] = call_user_func_array(
+            array("gallery_theme", $function),
+            array_merge(array($this), $args));
+        }
+      }
+
       foreach (module::active() as $module) {
+        if ($module->name == "gallery") {
+          continue;
+        }
         $helper_class = "{$module->name}_theme";
         if (class_exists($helper_class) && method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
@@ -102,15 +123,22 @@ class Admin_View_Core extends Gallery_View {
         }
       }
 
+      $helper_class = theme::$admin_theme_name . "_theme";
+      if (class_exists($helper_class) && method_exists($helper_class, $function)) {
+        $blocks[] = call_user_func_array(
+          array($helper_class, $function),
+          array_merge(array($this), $args));
+      }
+
       if (Session::instance()->get("debug")) {
-        if ($function != "admin_head") {
+        if ($function != "admin_head" && $function != "body_attributes") {
           array_unshift(
-            $blocks, "<div class=\"g-annotated-theme-block g-annotated-theme-block_$function\">" .
+            $blocks,
+            "<div class=\"g-annotated-theme-block g-annotated-theme-block_$function g-clear-fix\">" .
             "<div class=\"title\">$function</div>");
           $blocks[] = "</div>";
         }
       }
-
       return implode("\n", $blocks);
 
     default:
-- 
cgit v1.2.3


From bae14a76e52524e2157948bf30cfe3340d1e9a94 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 14:42:43 +0100
Subject: Themes can set minimum thumbnail size when calculating proportions.

This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 5 +++--
 themes/wind/views/page.html.php          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 0a4c96e1..16c57794 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -60,9 +60,10 @@ class Theme_View_Core extends Gallery_View {
   /**
    * Proportion of the current thumb_size's to default
    * @param object Item_Model (optional) check the proportions for this item
+   * @param int               (optional) minimum thumbnail width
    * @return int
    */
-  public function thumb_proportion($item=null) {
+  public function thumb_proportion($item=null, $minimum_size=0) {
     // If the item is an album with children, grab the first item in that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
@@ -74,7 +75,7 @@ class Theme_View_Core extends Gallery_View {
     // proportion based on the global thumbnail size, but since modules can override that, we
     // return the actual proportions when we have them.
     if ($item && $item->has_thumb()) {
-      return max($item->thumb_width, $item->thumb_height) / 200;
+      return max($item->thumb_width, $item->thumb_height, $minimum_size) / 200;
     } else {
       // @TODO change the 200 to a theme supplied value when and if we come up with an
       // API to allow the theme to set defaults.
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1bb329df..1dbb31c0 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed"
           href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
-    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item())) != 1): ?>
+    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100)) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
-- 
cgit v1.2.3


From 3c47deb9ef3fd35b1602c822af2b752c6733bed3 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 15:59:00 +0100
Subject: Themes can choose child thumbnail when asking for proportion.

This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 21 +++++++++++++++++----
 themes/wind/views/page.html.php          |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 16c57794..da1e8ce8 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -58,17 +58,30 @@ class Theme_View_Core extends Gallery_View {
   }
 
   /**
-   * Proportion of the current thumb_size's to default
+   * Proportion of the current thumb_size's to default.
+   *
+   * Themes can optionally use the $dimension parameter to choose which of the album's
+   * children will be used to determine the proportion.  If set, the proportion will be
+   * calculated based on the child item with the largest width or height.
+   *
    * @param object Item_Model (optional) check the proportions for this item
    * @param int               (optional) minimum thumbnail width
+   * @param string            (optional) "width" or "height"
    * @return int
    */
-  public function thumb_proportion($item=null, $minimum_size=0) {
-    // If the item is an album with children, grab the first item in that album instead.  We're
+  public function thumb_proportion($item=null, $minimum_size=0, $dimension=null) {
+    if (!in_array($dimension, array("height", "width"))) {
+      $dimension = null;
+    }
+
+    // If the item is an album with children, grab an item from that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
     if ($item && $item->is_album() && $item->children_count()) {
-      $item = $item->children(1)->current();
+      $orderBy = (is_null($dimension)) ? array()
+                                       : array("thumb_".$dimension => "desc");
+
+      $item = $item->children(1, null, array(), $orderBy)->current();
     }
 
     // By default we have a globally fixed thumbnail size In core code, we just return a fixed
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1dbb31c0..0ae41ea7 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed"
           href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
-    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100)) != 1): ?>
+    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100, "width")) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
-- 
cgit v1.2.3


From b6dc597c6613df10f1b833f8bd1ea85602afceed Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 11 Mar 2013 23:10:27 +0100
Subject: Fix Theme_View::siblings bug - limit and offset reversed in
 sibling_callback. I wonder if this could be causing some random issues I see
 on the forums...

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

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 0a4c96e1..91183753 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -89,7 +89,7 @@ class Theme_View_Core extends Gallery_View {
   public function siblings($limit=null, $offset=null) {
     return call_user_func_array(
       $this->siblings_callback[0],
-      array_merge($this->siblings_callback[1], array($offset, $limit)));
+      array_merge($this->siblings_callback[1], array($limit, $offset)));
   }
 
   public function tag() {
-- 
cgit v1.2.3


From a1b5cf2e8daa2b0205d58c5355bf57edcdd3821f Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Tue, 12 Mar 2013 15:00:59 +0100
Subject: #2051 - Revise how Gallery_View returns combined JS and CSS. Changed
 Gallery_View's JS and CSS combining to: - have get_combined() combine all
 groups if called without arguments. - ensure the "core" group is combined
 first. - always put links where get_combined() is called, even if combining
 is disabled (otherwise the order isn't preserved). - add key as cache buster
 when combining is disabled. - make "LOOKING FOR YOUR CSS/JAVASCRIPT..."
 comments in get_combined(), not in the theme itself. Also, revised
 xss_data.txt golden file (line number changes only).

---
 modules/gallery/libraries/Gallery_View.php | 130 +++++++++++++++++------------
 modules/gallery/tests/xss_data.txt         |  48 +++++------
 themes/admin_wind/views/admin.html.php     |   3 -
 themes/wind/views/page.html.php            |   5 +-
 4 files changed, 101 insertions(+), 85 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 8f02b53c..3f59db6a 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -82,10 +82,9 @@ class Gallery_View_Core extends View {
    * @param $types  a comma separated list of types to combine, eg "script,css"
    */
   public function start_combining($types) {
-    if (gallery::allow_css_and_js_combining()) {
-      foreach (explode(",", $types) as $type) {
-        $this->combine_queue[$type] = array();
-      }
+    foreach (explode(",", $types) as $type) {
+      // Initialize the core group so it gets included first.
+      $this->combine_queue[$type] = array("core" => array());
     }
   }
 
@@ -135,70 +134,93 @@ class Gallery_View_Core extends View {
   /**
    * Combine a series of files into a single one and cache it in the database.
    * @param $type  the data type (script or css)
-   * @param $group the group of scripts or css we want
+   * @param $group the group of scripts or css we want (null will combine all groups)
    */
-  public function get_combined($type, $group="core") {
-    $links = array();
-
-    if (empty($this->combine_queue[$type][$group])) {
-      return;
+  public function get_combined($type, $group=null) {
+    if (is_null($group)) {
+      $groups = array_keys($this->combine_queue[$type]);
+    } else {
+      $groups = array($group);
     }
 
-    // Include the url in the cache key so that if the Gallery moves, we don't use old cached
-    // entries.
-    $key = array(url::abs_file(""));
+    $buf = "";
+    foreach ($groups as $group) {
+      if (empty($this->combine_queue[$type][$group])) {
+        continue;
+      }
 
-    foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
-      $stats = stat($path);
-      // 7 == size, 9 == mtime, see http://php.net/stat
-      $key[] = "$path $stats[7] $stats[9]";
-    }
+      // Include the url in the cache key so that if the Gallery moves, we don't use old cached
+      // entries.
+      $key = array(url::abs_file(""));
+      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+        $stats = stat($path);
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key[] = "$path $stats[7] $stats[9]";
+      }
+      $key = md5(join(" ", $key));
 
-    $key = md5(join(" ", $key));
-    $cache = Cache::instance();
-    $contents = $cache->get($key);
+      if (gallery::allow_css_and_js_combining()) {
+        // Combine enabled - if we're at the start of the buffer, add a comment.
+        if (!$buf) {
+          $type_text = ($type == "css") ? "CSS" : "JS";
+          $buf .= "<!-- LOOKING FOR YOUR $type_text? It's all been combined into the link(s) below -->\n";
+        }
 
-    if (empty($contents)) {
-      $combine_data = new stdClass();
-      $combine_data->type = $type;
-      $combine_data->contents = $this->combine_queue[$type][$group];
-      module::event("before_combine", $combine_data);
+        $cache = Cache::instance();
+        $contents = $cache->get($key);
 
-      $contents = "";
-      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
-        if ($type == "css") {
-          $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
-        } else {
-          $contents .= "/* $path */\n" . file_get_contents($path) . "\n";
-        }
-      }
+        if (empty($contents)) {
+          $combine_data = new stdClass();
+          $combine_data->type = $type;
+          $combine_data->contents = $this->combine_queue[$type][$group];
+          module::event("before_combine", $combine_data);
 
-      $combine_data = new stdClass();
-      $combine_data->type = $type;
-      $combine_data->contents = $contents;
-      module::event("after_combine", $combine_data);
+          $contents = "";
+          foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+            if ($type == "css") {
+              $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
+            } else {
+              $contents .= "/* $path */\n" . file_get_contents($path) . "\n";
+            }
+          }
 
-      $cache->set($key, $combine_data->contents, array($type), 30 * 84600);
+          $combine_data = new stdClass();
+          $combine_data->type = $type;
+          $combine_data->contents = $contents;
+          module::event("after_combine", $combine_data);
 
-      $use_gzip = function_exists("gzencode") &&
-        (int) ini_get("zlib.output_compression") === 0;
-      if ($use_gzip) {
-        $cache->set("{$key}_gz", gzencode($combine_data->contents, 9, FORCE_GZIP),
-                    array($type, "gzip"), 30 * 84600);
-      }
+          $cache->set($key, $combine_data->contents, array($type), 30 * 84600);
 
-    }
+          $use_gzip = function_exists("gzencode") &&
+            (int) ini_get("zlib.output_compression") === 0;
+          if ($use_gzip) {
+            $cache->set("{$key}_gz", gzencode($combine_data->contents, 9, FORCE_GZIP),
+                        array($type, "gzip"), 30 * 84600);
+          }
+        }
 
-    unset($this->combine_queue[$type][$group]);
-    if (empty($this->combine_queue[$type])) {
-      unset($this->combine_queue[$type]);
-    }
+        if ($type == "css") {
+          $buf .= html::stylesheet("combined/css/$key", "screen,print,projection", true);
+        } else {
+          $buf .= html::script("combined/javascript/$key", true);
+        }
+      } else {
+        // Don't combine - just return the CSS and JS links (with the key as a cache buster).
+        foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
+          if ($type == "css") {
+            $buf .= html::stylesheet("$path?m=$key", "screen,print,projection", false);
+          } else {
+            $buf .= html::script("$path?m=$key", false);
+          }
+        }
+      }
 
-    if ($type == "css") {
-      return html::stylesheet("combined/css/$key", "screen,print,projection", true);
-    } else {
-      return html::script("combined/javascript/$key", true);
+      unset($this->combine_queue[$type][$group]);
+      if (empty($this->combine_queue[$type])) {
+        unset($this->combine_queue[$type]);
+      }
     }
+    return $buf;
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 5daaa371..2152858a 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -388,19 +388,19 @@ modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $url
 themes/admin_wind/views/admin.html.php                       4   DIRTY    $theme->html_attributes()
 themes/admin_wind/views/admin.html.php                       34  DIRTY    $theme->admin_head()
 themes/admin_wind/views/admin.html.php                       46  DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php                       51  DIRTY    $theme->get_combined("css")
-themes/admin_wind/views/admin.html.php                       54  DIRTY    $theme->get_combined("script")
-themes/admin_wind/views/admin.html.php                       58  DIRTY    $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php                       66  DIRTY    $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php                       67  DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php                       70  DIRTY    $theme->user_menu()
-themes/admin_wind/views/admin.html.php                       73  DIRTY    $theme->admin_menu()
-themes/admin_wind/views/admin.html.php                       76  DIRTY    $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php                       83  DIRTY    $content
-themes/admin_wind/views/admin.html.php                       89  DIRTY    $sidebar
-themes/admin_wind/views/admin.html.php                       94  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       97  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       102 DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       50  DIRTY    $theme->get_combined("css")
+themes/admin_wind/views/admin.html.php                       51  DIRTY    $theme->get_combined("script")
+themes/admin_wind/views/admin.html.php                       55  DIRTY    $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php                       63  DIRTY    $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php                       64  DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php                       67  DIRTY    $theme->user_menu()
+themes/admin_wind/views/admin.html.php                       70  DIRTY    $theme->admin_menu()
+themes/admin_wind/views/admin.html.php                       73  DIRTY    $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php                       80  DIRTY    $content
+themes/admin_wind/views/admin.html.php                       86  DIRTY    $sidebar
+themes/admin_wind/views/admin.html.php                       91  DIRTY    $theme->admin_footer()
+themes/admin_wind/views/admin.html.php                       94  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       99  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id
@@ -436,17 +436,17 @@ themes/wind/views/page.html.php                              32  DIRTY    $new_w
 themes/wind/views/page.html.php                              33  DIRTY    $new_height
 themes/wind/views/page.html.php                              34  DIRTY    $thumb_proportion
 themes/wind/views/page.html.php                              68  DIRTY_JS $theme->url()
-themes/wind/views/page.html.php                              73  DIRTY    $theme->get_combined("css")
-themes/wind/views/page.html.php                              76  DIRTY    $theme->get_combined("script")
-themes/wind/views/page.html.php                              86  DIRTY    $header_text
-themes/wind/views/page.html.php                              88  DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php                              92  DIRTY    $theme->user_menu()
-themes/wind/views/page.html.php                              107 DIRTY_ATTR $breadcrumb->last?"g-active":""
-themes/wind/views/page.html.php                              108 DIRTY_ATTR $breadcrumb->first?"g-first":""
-themes/wind/views/page.html.php                              109 DIRTY_JS $breadcrumb->url
-themes/wind/views/page.html.php                              122 DIRTY    $content
-themes/wind/views/page.html.php                              128 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              135 DIRTY    $footer_text
+themes/wind/views/page.html.php                              72  DIRTY    $theme->get_combined("css")
+themes/wind/views/page.html.php                              73  DIRTY    $theme->get_combined("script")
+themes/wind/views/page.html.php                              83  DIRTY    $header_text
+themes/wind/views/page.html.php                              85  DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php                              89  DIRTY    $theme->user_menu()
+themes/wind/views/page.html.php                              104 DIRTY_ATTR $breadcrumb->last?"g-active":""
+themes/wind/views/page.html.php                              105 DIRTY_ATTR $breadcrumb->first?"g-first":""
+themes/wind/views/page.html.php                              106 DIRTY_JS $breadcrumb->url
+themes/wind/views/page.html.php                              119 DIRTY    $content
+themes/wind/views/page.html.php                              125 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              132 DIRTY    $footer_text
 themes/wind/views/paginator.html.php                         33  DIRTY_JS $first_page_url
 themes/wind/views/paginator.html.php                         42  DIRTY_JS $previous_page_url
 themes/wind/views/paginator.html.php                         70  DIRTY_JS $next_page_url
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 9a149149..ea7542f2 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -47,10 +47,7 @@
           media="screen,print,projection" />
     <![endif]-->
 
-    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
     <?= $theme->get_combined("css") ?>
-
-    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
     <?= $theme->get_combined("script") ?>
   </head>
 
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 0ae41ea7..e2fc516a 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed"
           href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
-    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100, "width")) != 1): ?>
+      <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100, "width")) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
@@ -69,10 +69,7 @@
           media="screen,print,projection" />
     <![endif]-->
 
-    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
     <?= $theme->get_combined("css") ?>
-
-    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
     <?= $theme->get_combined("script") ?>
   </head>
 
-- 
cgit v1.2.3