From 790bf4e871b1a1555dc32287ab222b6694d402a2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 22 Sep 2010 21:35:49 -0700
Subject: Prioritize using the value in graphics_toolkit_path over the standard
 path so that if you change that value in Admin > Settings > Advanced we
 prefer it over other paths (which may be restricted by open_basedir).  Fixes
 #1395.

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

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index ca8c92c9..3cf0eacd 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -140,4 +140,17 @@ class gallery_Core {
     return $file_name;
   }
 
+  /**
+   * Set the PATH environment variable to the paths specified.
+   * @param  array   Array of paths.  Each array entry can contain a colon separated list of paths.
+   */
+  static function set_path_env($paths) {
+    $path_env = array();
+    foreach ($paths as $path) {
+      if ($path) {
+        array_push($path_env, $path);
+      }
+    }
+    putenv("PATH=" .  implode(":", $path_env));
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From c0022dc3c35024ecfc101171bdccfc3b07227ebb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Oct 2010 21:17:08 -0700
Subject: Fix a bug in the way we set the mime type for protected image
 renders. Also whitelist the digibug controller so that it's accessible when
 the gallery is private, and don't expire old proxies right away since Digibug
 may request the full size multiple times for different preview operations.

Fixes ticket #1410.
---
 modules/digibug/controllers/digibug.php | 7 +------
 modules/gallery/helpers/gallery.php     | 8 ++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 3c2bb115..88d1ace0 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -95,16 +95,11 @@ class Digibug_Controller extends Controller {
 
     if (!TEST_MODE) {
       // Dump out the image
-      header("Content-Type: $proxy->item->mime_type");
+      header("Content-Type: {$proxy->item->mime_type}");
       Kohana::close_buffers(false);
       $fd = fopen($file, "rb");
       fpassthru($fd);
       fclose($fd);
-
-      // If the request was for the image and not the thumb, then delete the proxy.
-      if ($type == "full") {
-        $proxy->delete();
-      }
     }
 
     $this->_clean_expired();
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 3cf0eacd..d7d3d9ad 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -25,6 +25,10 @@ class gallery_Core {
    * down for maintenance" page.
    */
   static function maintenance_mode() {
+    // @todo: we need a mechanism here to identify controllers that are still legally accessible
+    // when the entire Gallery is in maintenance mode.  Perhaps a controller class function or
+    // method?
+    // https://sourceforge.net/apps/trac/gallery/ticket/1411
     if (Router::$controller != "login" &&
         Router::$controller != "combined" &&
         module::get_var("gallery", "maintenance_mode", 0) &&
@@ -41,8 +45,12 @@ class gallery_Core {
    * the login page.
    */
   static function private_gallery() {
+    // @todo: we need a mechanism here to identify controllers that are still legally accessible
+    // when the entire Gallery is private.  Perhaps a controller class function or method?
+    // https://sourceforge.net/apps/trac/gallery/ticket/1411
     if (Router::$controller != "login" &&
         Router::$controller != "combined" &&
+        Router::$controller != "digibug" &&
         identity::active_user()->guest &&
         !access::user_can(identity::guest(), "view", item::root()) &&
         php_sapi_name() != "cli") {
-- 
cgit v1.2.3


From 4b4a2f8d8d170e2c42b202865bc4050ac92694cd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 4 Oct 2010 23:55:19 -0700
Subject: Set the version to 3.0 final (woot!).

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

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index d7d3d9ad..b016f436 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_Core {
-  const VERSION = "3.0 RC2 (Santa Fe)";
+  const VERSION = "3.0 (Santa Fe)";
 
   /**
    * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is
-- 
cgit v1.2.3