From fbefdd55564d2c14e0a4602784abcc51f0279edf Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 17 Jun 2009 06:14:36 -0700
Subject: Fix for ticket #366 1) Stored the menu element type in the menu
 element 2) Scanned the menu before display removing any empty sub menus. Went
 with the removal approach because there will more users than developers

---
 modules/gallery/libraries/Theme_View.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 31c2faa7..904a3c07 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -103,11 +103,25 @@ class Theme_View_Core extends View {
           call_user_func_array(array($class, "site"), array(&$menu, $this));
         }
       }
+
+      $this->_remove_empty_items($menu);
     }
 
     print $menu;
   }
 
+  private function _remove_empty_items($menu) {
+    foreach ($menu->elements as $target_id => $element) {
+      if ($element->type == "submenu") {
+        if (empty($element->elements)) {
+          $menu->remove($target_id);
+        } else {
+          $this->_remove_empty_items($element);
+        }
+      }
+    }
+  }
+
   public function album_menu() {
     $this->_menu("album");
   }
-- 
cgit v1.2.3


From a6a9b256ae7ac686ed1f53c05275ae702fb37aad Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 17 Jun 2009 13:34:18 -0700
Subject: Correct the "inappropriate intimacy" smell that bharat's refined
 senses pick up

---
 modules/gallery/libraries/Admin_View.php | 15 +--------------
 modules/gallery/libraries/Menu.php       | 12 ++++++++++++
 modules/gallery/libraries/Theme_View.php | 15 +--------------
 3 files changed, 14 insertions(+), 28 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 11a96d75..7a7396eb 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -69,23 +69,10 @@ class Admin_View_Core extends View {
       }
     }
 
-    $this->_remove_empty_items($menu);
+    $menu->compact();
     print $menu;
   }
 
-  private function _remove_empty_items($menu) {
-    foreach ($menu->elements as $target_id => $element) {
-      if ($element->type == "submenu") {
-        if (empty($element->elements)) {
-          $menu->remove($target_id);
-        } else {
-          $this->_remove_empty_items($element);
-        }
-      }
-    }
-  }
-
-
   /**
    * Print out any site wide status information.
    */
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 79274057..6d0881ce 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -146,6 +146,18 @@ class Menu_Core extends Menu_Element {
     }
   }
 
+  public function compact() {
+    foreach ($this->elements as $target_id => $element) {
+      if ($element->type == "submenu") {
+        if (empty($element->elements)) {
+          $this->remove($target_id);
+        } else {
+          $element->compact();
+        }
+      }
+    }
+  }
+
   public function __construct($type) {
     parent::__construct($type);
     $this->elements = array();
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 904a3c07..7b2ca840 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -103,25 +103,12 @@ class Theme_View_Core extends View {
           call_user_func_array(array($class, "site"), array(&$menu, $this));
         }
       }
-
-      $this->_remove_empty_items($menu);
     }
 
+    $menu->compact();
     print $menu;
   }
 
-  private function _remove_empty_items($menu) {
-    foreach ($menu->elements as $target_id => $element) {
-      if ($element->type == "submenu") {
-        if (empty($element->elements)) {
-          $menu->remove($target_id);
-        } else {
-          $this->_remove_empty_items($element);
-        }
-      }
-    }
-  }
-
   public function album_menu() {
     $this->_menu("album");
   }
-- 
cgit v1.2.3


From 42a5bd20a550a9edb5ec84625037b9d85889ff63 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 26 Jun 2009 07:51:29 -0700
Subject: 1) Move the generation of script tags to gallery_theme::head and
 gallery_theme::admin_head. This allows us to potentially manage the scripts
 like we do in g2 (single file and compressed) 2) Change Theme_View::_call to
 always call the gallery_theme::$function first.

---
 modules/gallery/helpers/gallery_theme.php | 20 ++++++++++++++++++++
 modules/gallery/libraries/Theme_View.php  | 25 +++++++++++++++++++++++--
 themes/admin_default/views/admin.html.php | 10 +---------
 themes/default/views/page.html.php        | 12 ------------
 4 files changed, 44 insertions(+), 23 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index a96c8f5b..24f4129b 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,6 +21,18 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
+    $buf .= html::script("lib/jquery.js");
+    $buf .= html::script("lib/jquery.form.js");
+    $buf .= html::script("lib/jquery-ui.js");
+    $buf .= html::script("lib/gallery.common.js");
+    $buf .= html::script("lib/gallery.dialog.js");
+    $buf .= html::script("lib/gallery.form.js");
+    $buf .= html::script("lib/superfish/js/superfish.js");
+    if ($theme->page_type == 'photo') {
+      $buf .= html::script("lib/jquery.scrollTo.js");
+      $buf .= html::script("lib/jquery.localscroll.js");
+    }
+    $buf .= html::script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -79,6 +91,14 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
+    $buf .= html::script("lib/jquery.js");
+    $buf .= html::script("lib/jquery.form.js");
+    $buf .= html::script("lib/jquery-ui.js");
+    $buf .= html::script("lib/gallery.common.js");
+    $buf .= html::script("lib/gallery.dialog.js");
+    $buf .= html::script("lib/superfish/js/superfish.js");
+    $buf .= html::script($theme->url("js/jquery.dropshadow.js", false, true));
+    $buf .= html::script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7b2ca840..5235fabb 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -68,9 +68,9 @@ class Theme_View_Core extends View {
     return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
-  public function url($path, $absolute_url=false) {
+  public function url($path, $absolute_url=false, $no_root=false) {
     $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : url::file($arg);
+    return $absolute_url ? url::abs_file($arg) : $no_root ? $arg : url::file($arg);
   }
 
   public function item() {
@@ -192,7 +192,28 @@ class Theme_View_Core extends View {
     case "thumb_info":
     case "thumb_top":
       $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 (method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index b7cfaa40..dfbafe31 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -20,15 +20,7 @@
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.dropshadow.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <?= $theme->admin_head() ?>
+   <?= $theme->admin_head() ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index f6286f95..c74d4097 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,18 +49,6 @@
     </style>
       <? endif ?>
     <? endif ?>
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <? if ($theme->page_type == 'photo'): ?>
-    <script src="<?= url::file("lib/jquery.scrollTo.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.localscroll.js") ?>" type="text/javascript"></script>
-    <? endif ?>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
   </head>
 
-- 
cgit v1.2.3


From 4cec0201637d21f8e88c264bb1befff4e891ce3e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 26 Jun 2009 14:37:15 -0700
Subject: Create a theme_view function script which allows modules in the head
 or admin_head functions to specify javascript files that are required for
 this page. In this commit, these script files are expressed at the end of the
 head or admin_head calls and appended to the beginning of the block stack. 
 In a future commit these will be combined and gzipped for download.

---
 modules/comment/helpers/comment_theme.php |  4 +--
 modules/gallery/helpers/gallery_theme.php | 50 +++++++++++++++----------------
 modules/gallery/libraries/Theme_View.php  | 19 ++++++++++++
 3 files changed, 46 insertions(+), 27 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index d9f1acf4..89b2f57c 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,8 +19,8 @@
  */
 class comment_theme_Core {
   static function head($theme) {
-    $url = url::file("modules/comment/js/comment.js");
-    return "<script src=\"$url\" type=\"text/javascript\"></script>\n";
+    $theme->script("modules/comment/js/comment.js");
+    return "";
   }
 
   static function photo_bottom($theme) {
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 0679087e..b6b24b27 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,22 +21,22 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $buf .= html::script("lib/jquery.js");
-    $buf .= html::script("lib/jquery.form.js");
-    $buf .= html::script("lib/jquery-ui.js");
-    $buf .= html::script("lib/gallery.common.js");
-    $buf .= html::script("lib/gallery.dialog.js");
-    $buf .= html::script("lib/gallery.form.js");
-    $buf .= html::script("lib/superfish/js/superfish.js");
+    $theme->script("lib/jquery.js");
+    $theme->script("lib/jquery.form.js");
+    $theme->script("lib/jquery-ui.js");
+    $theme->script("lib/gallery.common.js");
+    $theme->script("lib/gallery.dialog.js");
+    $theme->script("lib/gallery.form.js");
+    $theme->script("lib/superfish/js/superfish.js");
     if ($theme->page_type == 'photo') {
-      $buf .= html::script("lib/jquery.scrollTo.js");
-      $buf .= html::script("lib/jquery.localscroll.js");
-      $buf .= html::script("lib/gallery.show_full_size.js");
+      $theme->script("lib/jquery.scrollTo.js");
+      $theme->script("lib/jquery.localscroll.js");
+      $theme->script("lib/gallery.show_full_size.js");
     }
     if ($theme->page_type == 'movie') {
-      $buf .= html::script("lib/flowplayer.js");
+      $theme->script("lib/flowplayer.js");
     }
-    $buf .= html::script($theme->url("js/ui.init.js", false, true));
+    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -45,7 +45,7 @@ class gallery_theme_Core {
         && access::can("edit", $theme->item())) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/quick.css") . "\" />";
-      $buf .= html::script("modules/gallery/js/quick.js");
+      $theme->script("modules/gallery/js/quick.js");
     }
 
     if (module::is_active("rss")) {
@@ -59,8 +59,8 @@ class gallery_theme_Core {
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/l10n_client.css") . "\" />";
-      $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("modules/gallery/js/l10n_client.js");
+      $theme->script("lib/jquery.cookie.js");
+      $theme->script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;
@@ -95,14 +95,14 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
-    $buf .= html::script("lib/jquery.js");
-    $buf .= html::script("lib/jquery.form.js");
-    $buf .= html::script("lib/jquery-ui.js");
-    $buf .= html::script("lib/gallery.common.js");
-    $buf .= html::script("lib/gallery.dialog.js");
-    $buf .= html::script("lib/superfish/js/superfish.js");
-    $buf .= html::script($theme->url("js/jquery.dropshadow.js", false, true));
-    $buf .= html::script($theme->url("js/ui.init.js", false, true));
+    $theme->script("lib/jquery.js");
+    $theme->script("lib/jquery.form.js");
+    $theme->script("lib/jquery-ui.js");
+    $theme->script("lib/gallery.common.js");
+    $theme->script("lib/gallery.dialog.js");
+    $theme->script("lib/superfish/js/superfish.js");
+    $theme->script($theme->url("js/jquery.dropshadow.js", false, true));
+    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -111,8 +111,8 @@ class gallery_theme_Core {
     if ($session->get("l10n_mode", false)) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/l10n_client.css") . "\" />";
-      $buf .= html::script("lib/jquery.cookie.js");
-      $buf .= html::script("modules/gallery/js/l10n_client.js");
+      $theme->script("lib/jquery.cookie.js");
+      $theme->script("modules/gallery/js/l10n_client.js");
     }
 
     return $buf;
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 5235fabb..7696f3b0 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -19,6 +19,7 @@
  */
 class Theme_View_Core extends View {
   private $theme_name = null;
+  private $scripts = array();
 
   /**
    * Attempts to load a view and pre-load view data.
@@ -163,6 +164,19 @@ class Theme_View_Core extends View {
     return message::get();
   }
 
+  public function script($file) {
+    $this->scripts[$file] = 1;
+  }
+
+  private function _combine_script() {
+    $links = array();
+    Kohana::log("error", Kohana::debug($this->scripts));
+    foreach (array_keys($this->scripts) as $file) {
+      $links[] = html::script($file);
+    }
+    return empty($links) ? "" : implode("\n", $links);
+  }
+
   /**
    * Handle all theme functions that insert module content.
    */
@@ -221,6 +235,11 @@ class Theme_View_Core extends View {
             array_merge(array($this), $args));
         }
       }
+
+      if ($function == "head" || $function == "admin_head") {
+        array_unshift($blocks, $this->_combine_script());
+      }
+
       if (Session::instance()->get("debug")) {
         if ($function != "head") {
           array_unshift(
-- 
cgit v1.2.3


From 11f08ee4399c62cc1d2c36457a214c6db693db06 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 26 Jun 2009 21:42:02 -0700
Subject: Implement the combined javascript controller.

---
 modules/gallery/controllers/javascript.php | 64 ++++++++++++++++++++++++++++++
 modules/gallery/libraries/Theme_View.php   | 29 ++++++++++++--
 2 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 modules/gallery/controllers/javascript.php

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/javascript.php
new file mode 100644
index 00000000..d3c0ded5
--- /dev/null
+++ b/modules/gallery/controllers/javascript.php
@@ -0,0 +1,64 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Javascript_Controller extends Controller {
+  public function combined($key) {
+    if (preg_match('/[^0-9a-f]/', $key)) {
+      /* The key can't contain non-hex, so just terminate early */
+      Kohana::show_404();
+    }
+
+    // We don't need to save the session for this request
+    Session::abort_save();
+
+    Kohana::log("error", Kohana::debug($_SERVER));
+    // Dump out the javascript file
+    $ext = strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ? "_gzip" : "";
+    $file = VARPATH . "tmp/CombinedJavascript_$key{$ext}";
+
+    if (!file_exists($file)) {
+      Kohana::show_404();
+    }
+
+    $stats = stat($file);
+    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"]) &&
+        $stats[9] <= $_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
+      header("HTTP/1.0 304 Not Modified");
+      return;
+    }
+
+    Kohana::log("error", Kohana::debug($_SERVER));
+    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
+      header("Content-Encoding: gzip");
+      header("Cache-Control: private, x-gzip-ok=\"public\"");
+    }
+
+    header("Content-Type: text/javascript; charset=UTF-8");
+
+    header("Expires: " . gmdate(21474383647));
+    header("Last-Modified: " . gmdate($stats[9]));
+
+    Kohana::close_buffers(false);
+
+    $fd = fopen($file, "rb");
+    fpassthru($fd);
+    fclose($fd);
+  }
+}
+
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7696f3b0..1746f1d2 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -170,11 +170,34 @@ class Theme_View_Core extends View {
 
   private function _combine_script() {
     $links = array();
-    Kohana::log("error", Kohana::debug($this->scripts));
+    $key = "";
     foreach (array_keys($this->scripts) as $file) {
-      $links[] = html::script($file);
+      $path = DOCROOT . $file;
+      if (file_exists($path)) {
+        $stats = stat($path);
+        $links[] = $path;
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key = "{$key}$file $stats[7] $stats[9],";
+      } else {
+        Kohana::log("warn", "Javascript file missing: " . $file);
+      }
+    }
+
+    $key = md5($key);
+    $file = "tmp/CombinedJavascript_$key";
+    if (!file_exists(VARPATH . $file)) {
+      $contents = '';
+      foreach ($links as $link) {
+        $contents .= file_get_contents($link);
+      }
+      file_put_contents(VARPATH . $file, $contents);
+      if (function_exists("gzencode")) {
+        file_put_contents(VARPATH . "{$file}_gzip", gzencode($contents, 9, FORCE_GZIP));
+      }
     }
-    return empty($links) ? "" : implode("\n", $links);
+
+    return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") .
+      "\"></script>";
   }
 
   /**
-- 
cgit v1.2.3


From aad0dd357f44c75703e4d6368a1869a83e7ee8a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Jun 2009 16:27:06 -0700
Subject: Create a new thumb_menu() and convert Digibug over to use it.

1) Eliminate digibug_album.html

2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
   digibug_popup() then just make direct calls to digibug_popup() in the
   menu urls.
---
 modules/digibug/helpers/digibug_menu.php     | 26 +++++++++++++++++++-------
 modules/digibug/helpers/digibug_theme.php    | 11 -----------
 modules/digibug/js/digibug.js                | 15 +++------------
 modules/digibug/views/digibug_album.html.php |  8 --------
 modules/gallery/helpers/gallery_menu.php     |  3 +++
 modules/gallery/libraries/Theme_View.php     | 10 +++++++---
 themes/default/views/album.html.php          |  1 +
 7 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 modules/digibug/views/digibug_album.html.php

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 6d127d72..4b8db5a2 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -28,12 +28,24 @@ class digibug_menu {
 
   static function photo($menu, $theme) {
     $item = $theme->item();
-    $csrf = access::csrf_token();
-    $menu
-      ->append(Menu::factory("link")
-               ->id("digibug")
-               ->label(t("Print with Digibug"))
-               ->url(url::site("digibug/print_photo/$item->id?csrf=$csrf"))
-               ->css_id("gDigibugLink"));
+    $menu->append(
+      Menu::factory("link")
+      ->id("digibug")
+      ->label(t("Print with Digibug"))
+      ->url("javascript:digibug_popup('" .
+            url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+      ->css_id("gDigibugLink"));
+  }
+
+  static function thumb($menu, $theme, $item) {
+    if ($item->type == "photo" && access::can("view_full", $item)) {
+      $menu->append(
+        Menu::factory("link")
+        ->id("digibug")
+        ->label(t("Print with Digibug"))
+        ->url("javascript:digibug_popup('" .
+              url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+        ->css_id("gDigibugLink"));
+    }
   }
 }
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index a8e7e5b2..3b5be3b3 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -21,15 +21,4 @@ class digibug_theme_Core {
   static function head($theme) {
     return html::script("modules/digibug/js/digibug.js");
   }
-
-  static function thumb_bottom($theme, $child) {
-    if ($theme->page_type() == "album" && $child->type == "photo" &&
-        access::can("view_full", $child)) {
-      $v = new View("digibug_album.html");
-      $v->id = $child->id;
-      $v->title = t("Print photo with Digibug");
-      return $v->render();
-    }
-    return "";
-  }
 }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 456dfecb..78ca8cf3 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,17 +1,8 @@
-$(document).ready(function() {
-  $(".gDigibugPrintButton a").click(function(e) {
-    e.preventDefault();
-    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-  $("#gDigibugLink").click(function(e) {
-    e.preventDefault();
-    return popUp(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-});
-
-function popUp(url, options) {
+function digibug_popup(url, options) {
   options = $.extend({
     /* default options */
+    width:      '800',
+    height:     '600',
     target:     'dbPopWin',
     scrollbars: 'yes',
     resizable:  'no',
diff --git a/modules/digibug/views/digibug_album.html.php b/modules/digibug/views/digibug_album.html.php
deleted file mode 100644
index 2fd8803b..00000000
--- a/modules/digibug/views/digibug_album.html.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gDigibugPrintButton">
-  <a class="gButtonLink ui-corner-all ui-state-default ui-icon-left"
-     href="<?= url::site("digibug/print_photo/$id?csrf=$csrf") ?>"
-     title="<?= p::clean($title) ?>">
-    <span class="ui-icon ui-icon-print"><?= p::clean($title) ?></span>
-  </a>
-</div>
diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php
index a25832fe..1f1e1ce2 100644
--- a/modules/gallery/helpers/gallery_menu.php
+++ b/modules/gallery/helpers/gallery_menu.php
@@ -94,6 +94,9 @@ class gallery_menu_Core {
   static function tag($menu, $theme) {
   }
 
+  static function thumb($menu, $theme, $item) {
+  }
+
   static function photo($menu, $theme) {
     if (access::can("view_full", $theme->item())) {
       $menu->append(Menu::factory("link")
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7b2ca840..4612a74b 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -121,16 +121,20 @@ class Theme_View_Core extends View {
     $this->_menu("photo");
   }
 
-  private function _menu($type) {
+  public function thumb_menu($item) {
+    $this->_menu("thumb", $item);
+  }
+
+  private function _menu($type, $item=null) {
     $menu = Menu::factory("root");
-    call_user_func_array(array("gallery_menu", $type), array(&$menu, $this));
+    call_user_func_array(array("gallery_menu", $type), array(&$menu, $this, $item));
     foreach (module::active() as $module) {
       if ($module->name == "gallery") {
         continue;
       }
       $class = "{$module->name}_menu";
       if (method_exists($class, $type)) {
-        call_user_func_array(array($class, $type), array(&$menu, $this));
+        call_user_func_array(array($class, $type), array(&$menu, $this, $item));
       }
     }
 
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 7e6913df..46b0d29a 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,6 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
+    <?= $theme->thumb_menu($child) ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
-- 
cgit v1.2.3


From bf26ca727e615e61a8f61a2bbf1a83572cfa5c20 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 28 Jun 2009 15:30:13 -0700
Subject: Change the combined javascript to use the new caching functionality
 and respect the HTTP_IF_MODIFIED_SINCE header request.

---
 modules/gallery/controllers/javascript.php | 37 +++++++++++++++++-------------
 modules/gallery/libraries/Theme_View.php   | 11 +++++----
 2 files changed, 28 insertions(+), 20 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/javascript.php
index d3c0ded5..bc231e0a 100644
--- a/modules/gallery/controllers/javascript.php
+++ b/modules/gallery/controllers/javascript.php
@@ -20,30 +20,35 @@
 class Javascript_Controller extends Controller {
   public function combined($key) {
     if (preg_match('/[^0-9a-f]/', $key)) {
-      /* The key can't contain non-hex, so just terminate early */
+      // The key can't contain non-hex, so just terminate early
       Kohana::show_404();
     }
 
     // We don't need to save the session for this request
     Session::abort_save();
 
-    Kohana::log("error", Kohana::debug($_SERVER));
     // Dump out the javascript file
-    $ext = strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ? "_gzip" : "";
-    $file = VARPATH . "tmp/CombinedJavascript_$key{$ext}";
+    $cache = Cache::instance();
 
-    if (!file_exists($file)) {
-      Kohana::show_404();
+    $modified = $cache->get("{$key}_modified");
+    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && !empty($modified)) {
+      header('HTTP/1.0 304 Not Modified');
+      return;
     }
 
-    $stats = stat($file);
-    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"]) &&
-        $stats[9] <= $_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
-      header("HTTP/1.0 304 Not Modified");
-      return;
+    $content = "";
+    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
+      $content = $cache->get("{$key}_gz");
+    }
+
+    if (empty($content)) {
+      $content = $cache->get($key);
+    }
+
+    if (empty($content)) {
+      Kohana::show_404();
     }
 
-    Kohana::log("error", Kohana::debug($_SERVER));
     if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
       header("Content-Encoding: gzip");
       header("Cache-Control: private, x-gzip-ok=\"public\"");
@@ -52,13 +57,13 @@ class Javascript_Controller extends Controller {
     header("Content-Type: text/javascript; charset=UTF-8");
 
     header("Expires: " . gmdate(21474383647));
-    header("Last-Modified: " . gmdate($stats[9]));
+    header("Last-Modified: " . $modified);
 
     Kohana::close_buffers(false);
 
-    $fd = fopen($file, "rb");
-    fpassthru($fd);
-    fclose($fd);
+    $handle = fopen("php://output", "wb");
+    fwrite($handle, $content);
+    fclose($handle);
   }
 }
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 167f8a8d..f55cb55a 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -188,18 +188,21 @@ class Theme_View_Core extends View {
     }
 
     $key = md5($key);
-    $file = "tmp/CombinedJavascript_$key";
-    if (!file_exists(VARPATH . $file)) {
+    $contents = Cache::instance()->get($key);
+    if (empty($contents)) {
       $contents = '';
       foreach ($links as $link) {
         $contents .= file_get_contents($link);
       }
-      file_put_contents(VARPATH . $file, $contents);
+      Cache::instance()->set($key, $contents, array("javascript"), 84600);
       if (function_exists("gzencode")) {
-        file_put_contents(VARPATH . "{$file}_gzip", gzencode($contents, 9, FORCE_GZIP));
+        Cache::instance()->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                               array("javascript", "gzip"), 84600);
       }
+      Cache::instance()->set("{$key}_modified", time(), array("javascript", "modified"), 84600);
     }
 
+    // Handcraft the script link because html::script will add a .js extenstion
     return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") .
       "\"></script>";
   }
-- 
cgit v1.2.3


From aa31e1f0090522c3cfb3a44b947ad8c33a275979 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 16:24:51 -0700
Subject: Tweak the cache implementation 1) Drop the *_modified key, we don't
 really need it.  The modification date is not    relevant to our browser
 caching strategy. 2) Fix multiple issues with the Expires header and just
 hardcode it to the biggest    possibly value for code clarity. 3) print the
 $content out directly instead of using fwrite 4) Minor cleanups in the
 installer.

---
 modules/gallery/controllers/javascript.php    | 21 ++++++------------
 modules/gallery/helpers/gallery_installer.php | 32 +++++++++++++--------------
 modules/gallery/libraries/Theme_View.php      | 16 +++++++++-----
 3 files changed, 33 insertions(+), 36 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/javascript.php
index bc231e0a..ba5cbf4b 100644
--- a/modules/gallery/controllers/javascript.php
+++ b/modules/gallery/controllers/javascript.php
@@ -27,16 +27,13 @@ class Javascript_Controller extends Controller {
     // We don't need to save the session for this request
     Session::abort_save();
 
-    // Dump out the javascript file
-    $cache = Cache::instance();
-
-    $modified = $cache->get("{$key}_modified");
-    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && !empty($modified)) {
+    // Our data is immutable, so if they already have a copy then it needs no updating.
+    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
       header('HTTP/1.0 304 Not Modified');
       return;
     }
 
-    $content = "";
+    $cache = Cache::instance();
     if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
       $content = $cache->get("{$key}_gz");
     }
@@ -51,19 +48,15 @@ class Javascript_Controller extends Controller {
 
     if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
       header("Content-Encoding: gzip");
-      header("Cache-Control: private, x-gzip-ok=\"public\"");
+      header("Cache-Control: public");
     }
 
     header("Content-Type: text/javascript; charset=UTF-8");
-
-    header("Expires: " . gmdate(21474383647));
-    header("Last-Modified: " . $modified);
+    header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
 
     Kohana::close_buffers(false);
-
-    $handle = fopen("php://output", "wb");
-    fwrite($handle, $content);
-    fclose($handle);
+    print $content;
   }
 }
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 8ccbd51b..d0bfa629 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -32,6 +32,15 @@ class gallery_installer {
                  PRIMARY KEY (`id`))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
+    $db->query("CREATE TABLE {caches} (
+                `id` varchar(255) NOT NULL,
+                `tags` varchar(255),
+                `expiration` int(9) NOT NULL,
+                `cache` longblob,
+                PRIMARY KEY (`id`),
+                KEY (`tags`))
+                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
     $db->query("CREATE TABLE {graphics_rules} (
                  `id` int(9) NOT NULL auto_increment,
                  `active` BOOLEAN default 0,
@@ -181,15 +190,6 @@ class gallery_installer {
                 UNIQUE KEY(`module_name`, `name`))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-    $db->query("CREATE TABLE {caches} (
-                `id` varchar(255) NOT NULL,
-                `tags` varchar(255),
-                `expiration` int(9) NOT NULL,
-                `cache` longblob,
-                PRIMARY KEY (`id`),
-                KEY (`tags`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-
     foreach (array("albums", "logs", "modules", "resizes", "thumbs", "tmp", "uploads") as $dir) {
       @mkdir(VARPATH . $dir);
     }
@@ -278,13 +278,13 @@ class gallery_installer {
 
     if ($version == 3) {
       $db->query("CREATE TABLE {caches} (
-                `id` varchar(255) NOT NULL,
-                `tags` varchar(255),
-                `expiration` int(9) NOT NULL,
-                `cache` text,
-                PRIMARY KEY (`id`),
-                KEY (`tags`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                 `id` varchar(255) NOT NULL,
+                 `tags` varchar(255),
+                 `expiration` int(9) NOT NULL,
+                 `cache` text,
+                 PRIMARY KEY (`id`),
+                 KEY (`tags`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
       module::set_version("gallery", $version = 4);
     }
     if ($version == 4) {
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index f55cb55a..c3acfeb3 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -172,6 +172,10 @@ class Theme_View_Core extends View {
     $this->scripts[$file] = 1;
   }
 
+  /**
+   * Combine a series of Javascript files into a single one and cache it in the database, then
+   * return a single <script> element to refer to it.
+   */
   private function _combine_script() {
     $links = array();
     $key = "";
@@ -188,18 +192,18 @@ class Theme_View_Core extends View {
     }
 
     $key = md5($key);
-    $contents = Cache::instance()->get($key);
+    $cache = Cache::instance();
+    $contents = $cache->get($key);
     if (empty($contents)) {
-      $contents = '';
+      $contents = "";
       foreach ($links as $link) {
         $contents .= file_get_contents($link);
       }
-      Cache::instance()->set($key, $contents, array("javascript"), 84600);
+      $cache->set($key, $contents, array("javascript"), 30 * 84600);
       if (function_exists("gzencode")) {
-        Cache::instance()->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
-                               array("javascript", "gzip"), 84600);
+        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                    array("javascript", "gzip"), 30 * 84600);
       }
-      Cache::instance()->set("{$key}_modified", time(), array("javascript", "modified"), 84600);
     }
 
     // Handcraft the script link because html::script will add a .js extenstion
-- 
cgit v1.2.3


From d90e30c37881d4e715b2c798046830242e382d1c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 28 Jun 2009 17:07:12 -0700
Subject: Rename the combined javascript controller from javascript/combined to
 combined/javascript.

---
 modules/gallery/controllers/combined.php   | 62 ++++++++++++++++++++++++++++++
 modules/gallery/controllers/javascript.php | 62 ------------------------------
 modules/gallery/libraries/Theme_View.php   |  2 +-
 3 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 modules/gallery/controllers/combined.php
 delete mode 100644 modules/gallery/controllers/javascript.php

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
new file mode 100644
index 00000000..510482db
--- /dev/null
+++ b/modules/gallery/controllers/combined.php
@@ -0,0 +1,62 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Combined_Controller extends Controller {
+  public function javascript($key) {
+    if (preg_match('/[^0-9a-f]/', $key)) {
+      // The key can't contain non-hex, so just terminate early
+      Kohana::show_404();
+    }
+
+    // We don't need to save the session for this request
+    Session::abort_save();
+
+    // Our data is immutable, so if they already have a copy then it needs no updating.
+    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
+      header('HTTP/1.0 304 Not Modified');
+      return;
+    }
+
+    $cache = Cache::instance();
+    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
+      $content = $cache->get("{$key}_gz");
+    }
+
+    if (empty($content)) {
+      $content = $cache->get($key);
+    }
+
+    if (empty($content)) {
+      Kohana::show_404();
+    }
+
+    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
+      header("Content-Encoding: gzip");
+      header("Cache-Control: public");
+    }
+
+    header("Content-Type: text/javascript; charset=UTF-8");
+    header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
+
+    Kohana::close_buffers(false);
+    print $content;
+  }
+}
+
diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/javascript.php
deleted file mode 100644
index ba5cbf4b..00000000
--- a/modules/gallery/controllers/javascript.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Javascript_Controller extends Controller {
-  public function combined($key) {
-    if (preg_match('/[^0-9a-f]/', $key)) {
-      // The key can't contain non-hex, so just terminate early
-      Kohana::show_404();
-    }
-
-    // We don't need to save the session for this request
-    Session::abort_save();
-
-    // Our data is immutable, so if they already have a copy then it needs no updating.
-    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
-      header('HTTP/1.0 304 Not Modified');
-      return;
-    }
-
-    $cache = Cache::instance();
-    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
-      $content = $cache->get("{$key}_gz");
-    }
-
-    if (empty($content)) {
-      $content = $cache->get($key);
-    }
-
-    if (empty($content)) {
-      Kohana::show_404();
-    }
-
-    if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
-      header("Content-Encoding: gzip");
-      header("Cache-Control: public");
-    }
-
-    header("Content-Type: text/javascript; charset=UTF-8");
-    header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
-    header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
-
-    Kohana::close_buffers(false);
-    print $content;
-  }
-}
-
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index c3acfeb3..25818821 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -207,7 +207,7 @@ class Theme_View_Core extends View {
     }
 
     // Handcraft the script link because html::script will add a .js extenstion
-    return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") .
+    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
       "\"></script>";
   }
 
-- 
cgit v1.2.3


From c4f991bb7d7e90f8c55897f89888d9196c7e438f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 19:45:11 -0700
Subject: Clean up the combined javascript change and refactor out the
 Gallery_View base class from Theme_View and Admin_View.

1) Move all the theme specific jquery stuff from gallery_theme::head()
and admin_head() into the theme files.  Use $theme->script() as
appropriate.

2) Get rid of the extra boolean on $theme->url() that we were using so
that we could call $theme->script($theme->url(...)) -- add
$theme->theme_script() instead (poorly named, but still clearer than
what we had before)

3) Fix the bug that combined scripts didn't work at all in the admin
theme.

4) Get rid of $theme->display() in favor of new View(...)
---
 modules/gallery/helpers/gallery_theme.php  | 24 --------
 modules/gallery/libraries/Admin_View.php   | 17 ++----
 modules/gallery/libraries/Gallery_View.php | 89 ++++++++++++++++++++++++++++++
 modules/gallery/libraries/Theme_View.php   | 61 +-------------------
 themes/admin_default/views/admin.html.php  | 10 ++++
 themes/default/views/page.html.php         | 24 +++++++-
 6 files changed, 128 insertions(+), 97 deletions(-)
 create mode 100644 modules/gallery/libraries/Gallery_View.php

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index b6b24b27..cffecb12 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,22 +21,6 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->script("lib/jquery.js");
-    $theme->script("lib/jquery.form.js");
-    $theme->script("lib/jquery-ui.js");
-    $theme->script("lib/gallery.common.js");
-    $theme->script("lib/gallery.dialog.js");
-    $theme->script("lib/gallery.form.js");
-    $theme->script("lib/superfish/js/superfish.js");
-    if ($theme->page_type == 'photo') {
-      $theme->script("lib/jquery.scrollTo.js");
-      $theme->script("lib/jquery.localscroll.js");
-      $theme->script("lib/gallery.show_full_size.js");
-    }
-    if ($theme->page_type == 'movie') {
-      $theme->script("lib/flowplayer.js");
-    }
-    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
@@ -95,14 +79,6 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->script("lib/jquery.js");
-    $theme->script("lib/jquery.form.js");
-    $theme->script("lib/jquery-ui.js");
-    $theme->script("lib/gallery.common.js");
-    $theme->script("lib/gallery.dialog.js");
-    $theme->script("lib/superfish/js/superfish.js");
-    $theme->script($theme->url("js/jquery.dropshadow.js", false, true));
-    $theme->script($theme->url("js/ui.init.js", false, true));
     if ($session->get("debug")) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
         url::file("modules/gallery/css/debug.css") . "\" />";
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 7a7396eb..01496c0d 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Admin_View_Core extends View {
-  private $theme_name = null;
-
+class Admin_View_Core extends Gallery_View {
   /**
    * Attempts to load a view and pre-load view data.
    *
@@ -46,15 +44,6 @@ class Admin_View_Core extends View {
     $this->set_global("user", user::active());
   }
 
-  public function url($path, $absolute_url=false) {
-    $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : url::file($arg);
-  }
-
-  public function display($page_name, $view_class="View") {
-    return new $view_class($page_name);
-  }
-
   public function admin_menu() {
     $menu = Menu::factory("root");
     gallery_menu::admin($menu, $this);
@@ -109,6 +98,10 @@ class Admin_View_Core extends View {
         }
       }
 
+      if ($function == "admin_head") {
+        array_unshift($blocks, $this->combine_script());
+      }
+
       if (Session::instance()->get("debug")) {
         if ($function != "admin_head") {
           array_unshift(
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
new file mode 100644
index 00000000..f2298b7d
--- /dev/null
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -0,0 +1,89 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Gallery_View_Core extends View {
+  protected $theme_name = null;
+  protected $scripts = array();
+
+  /**
+   * Add a script to the combined scripts list.
+   * @param $file  the relative path to a script from the gallery3 directory
+   */
+  public function script($file, $theme_relative=false) {
+    $this->scripts[$file] = 1;
+  }
+
+  /**
+   * Add a script to the combined scripts list.
+   * @param $file  the relative path to a script from the base of the active theme
+   * @param
+   */
+  public function theme_script($file) {
+    $file = "themes/{$this->theme_name}/$file";
+    $this->scripts[$file] = 1;
+  }
+
+  /**
+   * Provide a url to a resource within the current theme.  This allows us to refer to theme
+   * resources without naming the theme itself which makes themes easier to copy.
+   */
+  public function url($path, $absolute_url=false) {
+    $arg = "themes/{$this->theme_name}/$path";
+    return $absolute_url ? url::abs_file($arg) : url::file($arg);
+  }
+
+  /**
+   * Combine a series of Javascript files into a single one and cache it in the database, then
+   * return a single <script> element to refer to it.
+   */
+  protected function combine_script() {
+    $links = array();
+    $key = "";
+    foreach (array_keys($this->scripts) as $file) {
+      $path = DOCROOT . $file;
+      if (file_exists($path)) {
+        $stats = stat($path);
+        $links[] = $path;
+        // 7 == size, 9 == mtime, see http://php.net/stat
+        $key = "{$key}$file $stats[7] $stats[9],";
+      } else {
+        Kohana::log("alert", "Javascript file missing: " . $file);
+      }
+    }
+
+    $key = md5($key);
+    $cache = Cache::instance();
+    $contents = $cache->get($key);
+    if (empty($contents)) {
+      $contents = "";
+      foreach ($links as $link) {
+        $contents .= file_get_contents($link);
+      }
+      $cache->set($key, $contents, array("javascript"), 30 * 84600);
+      if (function_exists("gzencode")) {
+        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                    array("javascript", "gzip"), 30 * 84600);
+      }
+    }
+
+    // Handcraft the script link because html::script will add a .js extenstion
+    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
+      "\"></script>";
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 25818821..8e320f44 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -17,10 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Theme_View_Core extends View {
-  private $theme_name = null;
-  private $scripts = array();
-
+class Theme_View_Core extends Gallery_View {
   /**
    * Attempts to load a view and pre-load view data.
    *
@@ -69,11 +66,6 @@ class Theme_View_Core extends View {
     return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
-  public function url($path, $absolute_url=false, $no_root=false) {
-    $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : $no_root ? $arg : url::file($arg);
-  }
-
   public function item() {
     return $this->item;
   }
@@ -86,10 +78,6 @@ class Theme_View_Core extends View {
     return $this->page_type;
   }
 
-  public function display($page_name, $view_class="View") {
-    return new $view_class($page_name);
-  }
-
   public function site_menu() {
     $menu = Menu::factory("root");
     if ($this->page_type != "login") {
@@ -168,49 +156,6 @@ class Theme_View_Core extends View {
     return message::get();
   }
 
-  public function script($file) {
-    $this->scripts[$file] = 1;
-  }
-
-  /**
-   * Combine a series of Javascript files into a single one and cache it in the database, then
-   * return a single <script> element to refer to it.
-   */
-  private function _combine_script() {
-    $links = array();
-    $key = "";
-    foreach (array_keys($this->scripts) as $file) {
-      $path = DOCROOT . $file;
-      if (file_exists($path)) {
-        $stats = stat($path);
-        $links[] = $path;
-        // 7 == size, 9 == mtime, see http://php.net/stat
-        $key = "{$key}$file $stats[7] $stats[9],";
-      } else {
-        Kohana::log("warn", "Javascript file missing: " . $file);
-      }
-    }
-
-    $key = md5($key);
-    $cache = Cache::instance();
-    $contents = $cache->get($key);
-    if (empty($contents)) {
-      $contents = "";
-      foreach ($links as $link) {
-        $contents .= file_get_contents($link);
-      }
-      $cache->set($key, $contents, array("javascript"), 30 * 84600);
-      if (function_exists("gzencode")) {
-        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
-                    array("javascript", "gzip"), 30 * 84600);
-      }
-    }
-
-    // Handcraft the script link because html::script will add a .js extenstion
-    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
-      "\"></script>";
-  }
-
   /**
    * Handle all theme functions that insert module content.
    */
@@ -270,8 +215,8 @@ class Theme_View_Core extends View {
         }
       }
 
-      if ($function == "head" || $function == "admin_head") {
-        array_unshift($blocks, $this->_combine_script());
+      if ($function == "head") {
+        array_unshift($blocks, $this->combine_script());
       }
 
       if (Session::instance()->get("debug")) {
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index dfbafe31..2a91a76c 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -20,6 +20,16 @@
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
         media="screen,print,projection" />
    <![endif]-->
+
+   <?= $theme->script("lib/jquery.js") ?>
+   <?= $theme->script("lib/jquery.form.js") ?>
+   <?= $theme->script("lib/jquery-ui.js") ?>
+   <?= $theme->script("lib/gallery.common.js") ?>
+   <?= $theme->script("lib/gallery.dialog.js") ?>
+   <?= $theme->script("lib/superfish/js/superfish.js") ?>
+   <?= $theme->theme_script("js/jquery.dropshadow.js") ?>
+   <?= $theme->theme_script("js/ui.init.js") ?>
+
    <?= $theme->admin_head() ?>
   </head>
 
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index c74d4097..8b9466ac 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,6 +49,24 @@
     </style>
       <? endif ?>
     <? endif ?>
+    <?= $theme->script("lib/jquery.js") ?>
+    <?= $theme->script("lib/jquery.form.js") ?>
+    <?= $theme->script("lib/jquery-ui.js") ?>
+    <?= $theme->script("lib/gallery.common.js") ?>
+    <?= $theme->script("lib/gallery.dialog.js") ?>
+    <?= $theme->script("lib/gallery.form.js") ?>
+    <?= $theme->script("lib/superfish/js/superfish.js") ?>
+    <?= $theme->script("lib/jquery.localscroll.js") ?>
+    <?= $theme->theme_script("js/ui.init.js") ?>
+
+    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+    <? if ($theme->page_type == "photo"): ?>
+    <?= $theme->script("lib/jquery.scrollTo.js") ?>
+    <?= $theme->script("lib/gallery.show_full_size.js") ?>
+    <? elseif ($theme->page_type == "movie"): ?>
+    <?= $theme->script("lib/flowplayer.js") ?>
+    <? endif ?>
+
     <?= $theme->head() ?>
   </head>
 
@@ -57,7 +75,7 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= $theme->display("header.html") ?>
+        <?= new View("header.html") ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -70,12 +88,12 @@
         </div>
         <div id="gSidebar" class="yui-b">
           <? if ($theme->page_type != "login"): ?>
-          <?= $theme->display("sidebar.html") ?>
+          <?= new View("sidebar.html") ?>
           <? endif ?>
         </div>
       </div>
       <div id="gFooter">
-        <?= $theme->display("footer.html") ?>
+        <?= new View("footer.html") ?>
       </div>
     </div>
     <?= $theme->page_bottom() ?>
-- 
cgit v1.2.3