From 1f621d9827040d9730946a5804dd3d7269198ccc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 1 Sep 2010 21:24:41 -0700
Subject: Refine the patch for #1216. If the admin user changes their email
 address update the sendmail from and reply_to fields in advanced settings. 
 Also change this if the identity provider has changed.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index df5394c9..66b250e9 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -63,6 +63,8 @@ class gallery_event_Core {
       ->update("logs")
       ->set("user_id", $admin->id)
       ->execute();
+    module::set_var("gallery", "email_from", $admin->email);
+    module::set_var("gallery", "email_reply_to", $admin->email);
   }
 
   static function group_created($group) {
@@ -547,4 +549,11 @@ class gallery_event_Core {
     $data->content[] = (object) array("title" => t("User information"), "view" => $v);
 
   }
+
+  static function user_change_email_form_completed($user, $form) {
+    if ($user->admin) {
+      module::set_var("gallery", "email_from", $user->email);
+      module::set_var("gallery", "email_reply_to", $user->email);
+    }
+  }
 }
-- 
cgit v1.2.3


From 80e9fcaf47af6a041db385f18b0be00c15708da7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Sep 2010 22:00:26 -0700
Subject: Don't use $.remove() to get rid of items from the uploadify queue;
 that breaks uploadify and causes it to be unable to upload any new items. 
 Fixes ticket #1324.

---
 modules/gallery/views/form_uploadify.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 36f5f284..893bb3b9 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -60,7 +60,7 @@
           $("#g-add-photos-status ul").append(
             "<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " +
             <?= t("Completed")->for_js() ?> + "</li>");
-          setTimeout(function() { $("#q" + queueID).slideUp("slow") }, 5000);
+          setTimeout(function() { $("#q" + queueID).slideUp("slow").remove() }, 5000);
           success_count++;
           update_status();
           return true;
@@ -87,8 +87,8 @@
               .replace("__TYPE__", errorObj.type));
           }
           $("#g-add-photos-status ul").append(
-            "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
-          $("#g-uploadify" + queueID).remove();
+            "<li id=\"q" + queueID + "\" class=\"g-error\">" + fileObj.name + msg + "</li>");
+          $("#g-uploadify").uploadifyCancel(queueID);
           error_count++;
           update_status();
         },
-- 
cgit v1.2.3


From 70c8572ea1b421458241b9b3b1cc85cb6bf35057 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Sep 2010 22:19:44 -0700
Subject: Make RENAME TABLE operations idempotent so that in case there's a
 failure of some kind we can restart the upgrade and it'll continue. Fixes
 ticket #1325.

---
 modules/gallery/helpers/gallery_installer.php | 4 +++-
 modules/rest/helpers/rest_installer.php       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index d5264fcc..fa5113bf 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -550,7 +550,9 @@ class gallery_installer {
     }
 
     if ($version == 26) {
-      $db->query("RENAME TABLE {failed_logins} TO {failed_auths}");
+      if (in_array("failed_logins", Database::instance()->list_tables())) {
+        $db->query("RENAME TABLE {failed_logins} TO {failed_auths}");
+      }
       module::set_version("gallery", $version = 27);
     }
 
diff --git a/modules/rest/helpers/rest_installer.php b/modules/rest/helpers/rest_installer.php
index c2694a29..3c7fea4b 100644
--- a/modules/rest/helpers/rest_installer.php
+++ b/modules/rest/helpers/rest_installer.php
@@ -35,7 +35,9 @@ class rest_installer {
   static function upgrade($version) {
     $db = Database::instance();
     if ($version == 1) {
-      $db->query("RENAME TABLE {user_access_tokens} TO {user_access_keys}");
+      if (in_array("user_access_tokens", Database::instance()->list_tables())) {
+        $db->query("RENAME TABLE {user_access_tokens} TO {user_access_keys}");
+      }
       module::set_version("rest", $version = 2);
     }
 
-- 
cgit v1.2.3


From 04f6646b0637d9cb221159b4931b184449a4dc1d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 1 Sep 2010 23:19:43 -0700
Subject: Hopefully the third and final patch for #1216. Set the default from
 and reply-to addresses to an empty string.  The first time the user model is
 saved, set the sendmail from and reply-to addresses. Requires an update to
 gallery version 38.

---
 modules/gallery/helpers/gallery_event.php     | 11 +++++++----
 modules/gallery/helpers/gallery_installer.php | 20 +++++++++++++++++---
 modules/gallery/libraries/Sendmail.php        |  7 +++----
 modules/gallery/module.info                   |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 66b250e9..8344c11c 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -550,10 +550,13 @@ class gallery_event_Core {
 
   }
 
-  static function user_change_email_form_completed($user, $form) {
-    if ($user->admin) {
-      module::set_var("gallery", "email_from", $user->email);
-      module::set_var("gallery", "email_reply_to", $user->email);
+  static function user_updated($original_user, $updated_user) {
+    if ($updated_user->admin) {
+      $email = module::get_var("gallery", "email_from", "");
+      if (empty($email)) {
+        module::set_var("gallery", "email_from", $updated_user->email);
+        module::set_var("gallery", "email_reply_to", $updated_user->email);
+      }
     }
   }
 }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index d5264fcc..c6f19ad0 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -304,12 +304,12 @@ class gallery_installer {
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
 
     // Sendmail configuration
-    module::set_var("gallery", "email_from", "admin@example.com");
-    module::set_var("gallery", "email_reply_to", "public@example.com");
+    module::set_var("gallery", "email_from", "");
+    module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
     module::set_var("gallery", "email_header_separator", serialize("\n"));
 
-    module::set_version("gallery", 37);
+    module::set_version("gallery", 38);
   }
 
   static function upgrade($version) {
@@ -611,6 +611,20 @@ class gallery_installer {
       module::set_var("gallery", "email_header_separator", serialize("\n"));
       module::set_version("gallery", $version = 37);
     }
+
+    // Changed our minds and decided that the initial value should be empty
+    // But don't just reset it blindly, only do it if the value is version 37 default
+    if ($version == 37) {
+      $email = module::get_var("gallery", "email_from", "");
+      if ($email == "admin@example.com") {
+        module::set_var("gallery", "email_from", "");
+      }
+      $email = module::get_var("gallery", "email_reply_to", "");
+      if ($email == "admin@example.com") {
+        module::set_var("gallery", "email_reply_to", "");
+      }
+      module::set_version("gallery", $version = 38);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 0fa554b4..a93be736 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -35,12 +35,11 @@ class Sendmail_Core {
 
   public function __construct() {
     $this->headers = array();
-    $domain = Input::instance()->server("HTTP_HOST");
-    $this->from(module::get_var("gallery", "email_from", "admin@$domain"));
-    $this->reply_to(module::get_var("gallery", "email_reply_to", "public@$domain"));
+    $this->from(module::get_var("gallery", "email_from", ""));
+    $this->reply_to(module::get_var("gallery", "email_reply_to", ""));
     $this->line_length(module::get_var("gallery", "email_line_length", 70));
     $separator = module::get_var("gallery", "email_header_separator", null);
-    $this->header_separator(empty($separator) ? "\n" : deserialize($separator));
+    $this->header_separator(empty($separator) ? "\n" : unserialize($separator));
   }
 
   public function __get($key) {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 901158b5..cc3b2723 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 37
+version = 38
-- 
cgit v1.2.3


From 4a7fc1a9815099d64b17133da238ef4470071328 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 1 Sep 2010 23:21:56 -0700
Subject: Fix up the test so it works with the changes for ticket #1216. Also
 note the name change to the first test.  Form a php reflection point of view
 Sendmail_Test (class name) == sendmail_test (method name) so the method gets
 treated as a constructor instead of a test method.

---
 modules/gallery/tests/Sendmail_Test.php | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index 92974e5c..aee6abf5 100644
--- a/modules/gallery/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
@@ -19,24 +19,18 @@
  */
 class Sendmail_Test extends Gallery_Unit_Test_Case {
   public function setup() {
-    Kohana_Config::instance()->set("sendmail.from", "from@gallery3.com");
+    module::set_var("gallery", "email_from", "from@gallery3.com");
+    module::set_var("gallery", "email_reply_to", "reply_to@gallery3.com");
   }
 
-  public function sendmail_test() {
-    $domain = Input::instance()->server("HTTP_HOST");
+  public function sendmail_basic_test() {
     $expected = "To: receiver@someemail.com\r\n" .
                 "From: from@gallery3.com\n" .
-                "Reply-To: public@$domain\r\n" .
+                "Reply-To: reply_to@gallery3.com\r\n" .
                 "Subject: Test Email Unit test\r\n\r\n" .
                 "The mail message body";
     $result = Sendmail_For_Test::factory()
       ->to("receiver@someemail.com")
-      /*
-       * @todo figure out why this test fails so badly, when the following
-       * line is not supplied. It doesn't seem to be set by setup method
-       * as you would expect.
-       */
-      ->from("from@gallery3.com")
       ->subject("Test Email Unit test")
       ->message("The mail message body")
       ->send()
@@ -46,16 +40,15 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
   }
 
   public function sendmail_reply_to_test() {
-    $domain = Input::instance()->server("HTTP_HOST");
     $expected = "To: receiver@someemail.com\r\n" .
-                "From: admin@$domain\n" .
-                "Reply-To: reply-to@gallery3.com\r\n" .
+                "From: from@gallery3.com\n" .
+                "Reply-To: reply_to@gallery3.com\r\n" .
                 "Subject: Test Email Unit test\r\n\r\n" .
                 "The mail message body";
     $result = Sendmail_For_Test::factory()
       ->to("receiver@someemail.com")
       ->subject("Test Email Unit test")
-      ->reply_to("reply-to@gallery3.com")
+      ->reply_to("reply_to@gallery3.com")
       ->message("The mail message body")
       ->send()
       ->send_text;
@@ -63,10 +56,9 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
   }
 
   public function sendmail_html_message_test() {
-    $domain = Input::instance()->server("HTTP_HOST");
     $expected = "To: receiver@someemail.com\r\n" .
-                "From: admin@$domain\n" .
-                "Reply-To: public@$domain\n" .
+                "From: from@gallery3.com\n" .
+                "Reply-To: reply_to@gallery3.com\n" .
                 "MIME-Version: 1.0\n" .
                 "Content-Type: text/html; charset=UTF-8\r\n" .
                 "Subject: Test Email Unit test\r\n\r\n" .
@@ -85,8 +77,8 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
   public function sendmail_wrapped_message_test() {
     $domain = Input::instance()->server("HTTP_HOST");
     $expected = "To: receiver@someemail.com\r\n" .
-                "From: admin@$domain\n" .
-                "Reply-To: public@$domain\r\n" .
+                "From: from@gallery3.com\n" .
+                "Reply-To: reply_to@gallery3.com\r\n" .
                 "Subject: Test Email Unit test\r\n\r\n" .
                 "This is a long message that needs to go\n" .
                 "over forty characters If we get lucky we\n" .
-- 
cgit v1.2.3


From 7477f0119c39a71e05d3e6b2caad8418a7d41c83 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Sep 2010 23:39:01 -0700
Subject: Explain wtf we're doing in user_updated.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 8344c11c..5e44caef 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -551,6 +551,8 @@ class gallery_event_Core {
   }
 
   static function user_updated($original_user, $updated_user) {
+    // If no default from/reply-to email address is set, adopt the value from the first admin to
+    // set their own email address so that we at least have a valid address for the Gallery.
     if ($updated_user->admin) {
       $email = module::get_var("gallery", "email_from", "");
       if (empty($email)) {
-- 
cgit v1.2.3


From 23b566e5921d5b8bd5a957ecd2d601e556f658a0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 1 Sep 2010 23:52:19 -0700
Subject: One more adjustment for ticket #1216.  The packaging process forces
 the default email address for admin to be unknown@unknown.com and when that
 happens the gallery_event::user_updated() event listener fires and sets the
 default values.  This is hard to work around, so let's just roll with it and
 use unknown@unknown.com as our default placeholder.

So now, if an admin sets their email address and the current values
are unknown@unknown.com we adopt the admin's email address for the
site's mail_from/reply_to fields.
---
 installer/install.sql                     | 8 ++++----
 modules/gallery/helpers/gallery_event.php | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'modules/gallery')

diff --git a/installer/install.sql b/installer/install.sql
index 7440cc8f..7a40918d 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',37,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',38,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -417,15 +417,15 @@ INSERT INTO {vars} VALUES (NULL,'gallery','date_time_format','Y-M-d H:i:s');
 INSERT INTO {vars} VALUES (NULL,'gallery','favicon_url','lib/images/favicon.ico');
 INSERT INTO {vars} VALUES (NULL,'gallery','date_format','Y-M-d');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_center','a:3:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}}');
-INSERT INTO {vars} VALUES (NULL,'gallery','email_from','admin@example.com');
-INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','public@example.com');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com');
+INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
+INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:9;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:10;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:11;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:12;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
-INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'user','mininum_password_length','5');
 INSERT INTO {vars} VALUES (NULL,'rest','allow_guest_access','0');
 INSERT INTO {vars} VALUES (NULL,'slideshow','max_scale','0');
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 5e44caef..ec7d1882 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -551,11 +551,12 @@ class gallery_event_Core {
   }
 
   static function user_updated($original_user, $updated_user) {
-    // If no default from/reply-to email address is set, adopt the value from the first admin to
-    // set their own email address so that we at least have a valid address for the Gallery.
+    // If the default from/reply-to email address is set to the install time placeholder value
+    // of unknown@unknown.com then adopt the value from the first admin to set their own email
+    // address so that we at least have a valid address for the Gallery.
     if ($updated_user->admin) {
       $email = module::get_var("gallery", "email_from", "");
-      if (empty($email)) {
+      if ($email == "unknown@unknown.com") {
         module::set_var("gallery", "email_from", $updated_user->email);
         module::set_var("gallery", "email_reply_to", $updated_user->email);
       }
-- 
cgit v1.2.3


From 2a86446249c4782287e1e6e472f422b851c2fb47 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 2 Sep 2010 00:50:02 -0700
Subject: Handle the case of a completely private Gallery separately and just
 put up a login page, very similar to the way that the maintenance mode login
 page works.  Fixes ticket #1056.

---
 modules/gallery/helpers/gallery.php    | 16 ++++++++++++++++
 modules/gallery/hooks/init_gallery.php |  1 +
 2 files changed, 17 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 3f83b23d..924ee76a 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -36,6 +36,22 @@ class gallery_Core {
     }
   }
 
+  /**
+   * If the gallery is only available to registered users and the user is not logged in, present
+   * the login page.
+   */
+  static function private_gallery() {
+    if (Router::$controller != "login" &&
+        Router::$controller != "combined" &&
+        identity::active_user()->guest &&
+        !access::user_can(identity::guest(), "view", item::root())) {
+      Session::instance()->set("continue_url", url::abs_current());
+      Router::$controller = "login";
+      Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+      Router::$method = "html";
+    }
+  }
+
   /**
    * This function is called when the Gallery is fully initialized.  We relay it to modules as the
    * "gallery_ready" event.  Any module that wants to perform an action at the start of every
diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index 64e44b56..10a74733 100644
--- a/modules/gallery/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -38,6 +38,7 @@ Event::add("system.ready", array("module", "load_modules"));
 Event::add("system.ready", array("gallery", "ready"));
 Event::add("system.post_routing", array("url", "parse_url"));
 Event::add("system.post_routing", array("gallery", "maintenance_mode"));
+Event::add("system.post_routing", array("gallery", "private_gallery"));
 Event::add("system.shutdown", array("gallery", "shutdown"));
 
 // @todo once we convert to Kohana 2.4 this doesn't have to be here
-- 
cgit v1.2.3


From 511826a33cbbf03bf1e3cb151f1a181b8e6723e8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 2 Sep 2010 01:10:15 -0700
Subject: Don't show the "(## errors)" part of the status message if there
 haven't been any errors.

---
 modules/gallery/controllers/uploader.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index fb496f60..168e8b2d 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -103,11 +103,14 @@ class Uploader_Controller extends Controller {
   }
 
   public function status($success_count, $error_count) {
-    // The "errors" won't be properly pluralized :-/
-    print t2("Uploaded %count photo (%error errors)",
-             "Uploaded %count photos (%error errors)",
-             $success_count,
-             array("error" => $error_count));
+    if ($error_count) {
+      // The "errors" won't be properly pluralized :-/
+      print t2("Uploaded %count photo (%error errors)",
+               "Uploaded %count photos (%error errors)",
+               $success_count,
+               array("error" => $error_count));
+    } else {
+      print t2("Uploaded %count photo", "Uploaded %count photos", $success_count);}
   }
 
   public function finish() {
-- 
cgit v1.2.3


From 32d18920680ee63dc75c3a2b710ef805b31c127c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 2 Sep 2010 22:53:06 -0700
Subject: Follow on to 2a86446249c4782287e1e6e472f422b851c2fb47; fix a bug
 where guest access to admin pages fails because we try to go to the login
 page but you can't do that from the admin theme.  Thanks to mamouneyya for
 catching this.
 http://github.com/gallery/gallery3/commit/2a86446249c4782287e1e6e472f422b851c2fb47

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 924ee76a..9430231c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -45,10 +45,17 @@ class gallery_Core {
         Router::$controller != "combined" &&
         identity::active_user()->guest &&
         !access::user_can(identity::guest(), "view", item::root())) {
-      Session::instance()->set("continue_url", url::abs_current());
-      Router::$controller = "login";
-      Router::$controller_path = MODPATH . "gallery/controllers/login.php";
-      Router::$method = "html";
+      if (Router::$controller == "admin") {
+        // At this point we're in the admin theme and it doesn't have a themed login page, so
+        // we can't just swap in the login controller and have it work.  So redirect back to the
+        // root item where we'll run this code again with the site theme.
+        url::redirect(item::root()->abs_url());
+      } else {
+        Session::instance()->set("continue_url", url::abs_current());
+        Router::$controller = "login";
+        Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+        Router::$method = "html";
+      }
     }
   }
 
-- 
cgit v1.2.3


From db75ac642a6ff62e814929af99e7c9af4d492706 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 4 Sep 2010 13:40:39 -0700
Subject: Use the title of the root album as the site title for all RSS feeds.
 Fixes ticket #1307.

---
 modules/comment/helpers/comment_rss.php | 10 ++++++++--
 modules/gallery/helpers/gallery_rss.php | 10 ++++++++--
 modules/tag/helpers/tag_rss.php         |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 26d98d21..cc4180bf 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -57,13 +57,19 @@ class comment_rss_Core {
               "thumb_height" => $item->thumb_height,
               "thumb_width" => $item->thumb_width,
               "item_uri" => url::abs_site("{$item->type}s/$item->id"),
-              "title" => html::purify($item->title),
+              "title" => (
+                ($item->id == item::root()->id) ?
+                html::purify($item->title) :
+                t("%site_title - %item_title",
+                  array("site_title" => item::root()->title,
+                        "item_title" => $item->title))),
               "author" => html::clean($comment->author_name())),
         ArrayObject::ARRAY_AS_PROPS);
     }
 
     $feed->max_pages = ceil($comments->count_all() / $limit);
-    $feed->title = htmlspecialchars(t("Recent Comments"));
+    $feed->title = html::purify(t("%site_title - Recent Comments",
+                                 array("site_title" => item::root()->title)));
     $feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
     $feed->description = t("Recent comments");
 
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index bec34912..fb617934 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -40,7 +40,7 @@ class gallery_rss_Core {
         ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_items->find_all()->count() / $limit);
-      $feed->title = t("Recent updates");
+      $feed->title = t("%site_title - Recent updates", array("site_title" => item::root()->title));
       $feed->description = t("Recent updates");
       return $feed;
 
@@ -53,7 +53,13 @@ class gallery_rss_Core {
         ->descendants($limit, $offset, array(array("type", "=", "photo")));
       $feed->max_pages = ceil(
         $item->viewable()->descendants_count(array(array("type", "=", "photo"))) / $limit);
-      $feed->title = html::purify($item->title);
+      if ($item->id == item::root()->id) {
+        $feed->title = html::purify($item->title);
+      } else {
+        $feed->title = t("%site_title - %item_title",
+                         array("site_title" => item::root()->title,
+                               "item_title" => $item->title));
+      }
       $feed->description = nl2br(html::purify($item->description));
 
       return $feed;
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index ea3865be..f60bd908 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -38,7 +38,8 @@ class tag_rss_Core {
       $feed = new stdClass();
       $feed->items = $tag->items($limit, $offset, "photo");
       $feed->max_pages = ceil($tag->count / $limit);
-      $feed->title = $tag->name;
+      $feed->title = t("%site_title - %tag_name",
+                       array("site_title" => item::root()->title, "tag_name" => $tag->name));
       $feed->description = t("Photos related to %tag_name", array("tag_name" => $tag->name));
 
       return $feed;
-- 
cgit v1.2.3


From c51b6ab38d7f16d64127fd3a73df38166a698f0f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 4 Sep 2010 15:54:07 -0700
Subject: Fix full size dimensions after rotating an image on the photo view
 page.

The photo view page caches the dimensions of the full size and then
renders it in Javascript.  But after rotation, those dimensions are no
longer valid.  Create a new function on the items controller that
returns the appropriate dimensions, then add a hook on
$.gallery_replace_image and implement the hook on the photo view page
to have it make an async call to get the new dimensions.

Fixes ticket #1317
---
 lib/gallery.common.js                 |  3 +++
 modules/gallery/controllers/items.php |  9 +++++++++
 themes/wind/views/photo.html.php      | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index a8b237bf..69452f39 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -121,6 +121,9 @@
   // Ajax handler for replacing an image, used in Ajax thumbnail rotation
   $.gallery_replace_image = function(data, thumb) {
     $(thumb).attr({src: data.src, width: data.width, height: data.height});
+    if (typeof gallery_image_replaced_hook == 'function') {
+      gallery_image_replaced_hook(data, thumb);
+    }
   };
 
   // Initialize context menus
diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index f205bf86..39b0f638 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -31,4 +31,13 @@ class Items_Controller extends Controller {
     access::required("view", $item);
     url::redirect($item->abs_url());
   }
+
+  // Return the width/height dimensinons for the given item
+  public function dimensions($id) {
+    $item = ORM::factory("item", $id);
+    access::required("view", $item);
+    json::reply(array("thumb" => array((int)$item->thumb_width, (int)$item->thumb_height),
+                      "resize" => array((int)$item->resize_width, (int)$item->resize_height),
+                      "full" => array((int)$item->width, (int)$item->height)));
+  }
 }
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index f8b5511c..cb830e23 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -4,10 +4,23 @@
 <!-- Use javascript to show the full size as an overlay on the current page -->
 <script type="text/javascript">
   $(document).ready(function() {
+    full_dims = [<?= $theme->item()->width ?>, <?= $theme->item()->height ?>];
     $(".g-fullsize-link").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, full_dims[0], full_dims[1]);
       return false;
     });
+
+    // After the image is rotated or replaced we have to reload the image dimensions
+    // so that the full size view isn't distorted.
+    gallery_image_replaced_hook = function(data, thumb) {
+      $.ajax({
+        url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>",
+        dataType: "json",
+        success: function(data, textStatus) {
+          full_dims = data.full;
+        }
+      });
+    }
   });
 </script>
 <? endif ?>
-- 
cgit v1.2.3


From ca0c3b3e7f154ffceee944049247e15cf0190e48 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 5 Sep 2010 21:25:46 -0700
Subject: Force "Options +FollowSymLinks" since that's a requirement for
 mod_rewrite to work.  This is surprisingly obscure in the docs. Thanks to
 bromide for turning this up in http://gallery.menalto.com/node/97791!

---
 .htaccess                          | 1 +
 modules/gallery/helpers/access.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'modules/gallery')

diff --git a/.htaccess b/.htaccess
index 5e9b96d6..bea9a10a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -60,6 +60,7 @@
 # putting this block into your Apache config files.
 #
 # <IfModule mod_rewrite.c>
+#   Options +FollowSymLinks
 #   RewriteEngine On
 #   RewriteBase /
 #   RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index f1ea00c0..86ea9572 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -694,6 +694,7 @@ class access_Core {
     @mkdir(VARPATH . "security_test");
     try {
       if ($fp = @fopen(VARPATH . "security_test/.htaccess", "w+")) {
+        fwrite($fp, "Options +FollowSymLinks\n");
         fwrite($fp, "RewriteEngine On\n");
         fwrite($fp, "RewriteRule verify $success_url [L]\n");
         fclose($fp);
-- 
cgit v1.2.3


From 46b30ce949d6371bc3d2bcfe42221c599c7a85e3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 5 Sep 2010 22:00:28 -0700
Subject: Add Setswana (tn_ZA).  Fixes ticket #1336.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index aacb37ca..1f5473ff 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -103,6 +103,7 @@ class locales_Core {
     $l["sl_SI"] = "Slovenščina";              // Slovenian
     $l["sr_CS"] = "Srpski";                   // Serbian
     $l["sv_SE"] = "Svenska";                  // Swedish
+    $l["tn_ZA"] = "Setswana";                 // Setswana
     $l["tr_TR"] = "Türkçe";                   // Turkish
     $l["uk_UA"] = "українська";         // Ukrainian
     $l["vi_VN"] = "Tiếng Việt";               // Vietnamese
-- 
cgit v1.2.3


From b3b6021b0a70979a1084111ae43c1170a7592b37 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 12:41:27 -0700
Subject: Don't bomb on the race condition when we're trying to create the
 gallery/_cache row and it already exists.  Fixes ticket #1338.

---
 modules/gallery/helpers/module.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index ca6651f1..736b6854 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -448,7 +448,17 @@ class module_Core {
         $cache->module_name = "gallery";
         $cache->name = "_cache";
         $cache->value = serialize(self::$var_cache);
-        $cache->save();
+        try {
+          $cache->save();
+        } catch (Database_Exception $e) {
+          // There's a potential race condition here.  Don't fail if that happens because it's
+          // bound to be transient and not a huge deal, but at least put something in the logs.
+          if (stristr($e->getMessage(), "duplicate entry")) {
+            Kohana_Log::add("error", "Failed to cache vars");
+          } else {
+            throw $e;
+          }
+        }
       }
     }
 
-- 
cgit v1.2.3


From 2d948cb39fd2da6a5f966a10cbeb4f5d5caec5a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 14:05:48 -0700
Subject: change the Setswana locale from tn_ZA to tn_BW since it's mostly
 Botswana anyway according to @sagemaniac in
 http://gallery.menalto.com/node/97840

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 1f5473ff..624ff9cb 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -103,7 +103,7 @@ class locales_Core {
     $l["sl_SI"] = "Slovenščina";              // Slovenian
     $l["sr_CS"] = "Srpski";                   // Serbian
     $l["sv_SE"] = "Svenska";                  // Swedish
-    $l["tn_ZA"] = "Setswana";                 // Setswana
+    $l["tn_BW"] = "Setswana";                 // Setswana
     $l["tr_TR"] = "Türkçe";                   // Turkish
     $l["uk_UA"] = "українська";         // Ukrainian
     $l["vi_VN"] = "Tiếng Việt";               // Vietnamese
-- 
cgit v1.2.3


From fc856b6abaa24d27cba5273147da11fc2446c1ba Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 14:08:05 -0700
Subject: Add retry logic to the task framework.  We retry 4 times with
 increasing backoff and if that fails, we put up a manual "retry" link. Fixes
 ticket #1270.

---
 .../gallery/views/admin_maintenance_task.html.php    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 76756b66..013ac01f 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -3,6 +3,7 @@
   var target_value;
   var animation = null;
   var delta = 1;
+  var consecutive_error_count = 0;
   animate_progress_bar = function() {
     var current_value = parseInt($(".g-progress-bar div").css("width").replace("%", ""));
     if (target_value > current_value) {
@@ -26,12 +27,15 @@
     $.fn.gallery_hover_init();
   }
 
+  var FAILED_MSG = <?= t("Something went wrong...sorry!  <a>Retry</a> or check the task log for details")->for_js() ?>;
+  var ERROR_MSG = <?= t("Something went wrong!  Trying again in a moment... (__COUNT__)")->for_js() ?>;
   update = function() {
     $.ajax({
       url: <?= html::js_string(url::site("admin/maintenance/run/$task->id?csrf=$csrf")) ?>,
       dataType: "json",
       success: function(data) {
         target_value = data.task.percent_complete;
+        consecutive_error_count = 0;
         if (!animation) {
           animate_progress_bar();
         }
@@ -42,6 +46,22 @@
         } else {
           setTimeout(update, 100);
         }
+      },
+      error: function(req, textStatus, errorThrown) {
+        if (textStatus == "timeout" || textStatus == "parsererror") {
+          consecutive_error_count++;
+          if (consecutive_error_count == 5) {
+            $("#g-status").html(FAILED_MSG);
+            $("#g-pause-button").hide();
+            $("#g-done-button").show();
+            consecutive_error_count = 0;  // in case of a manual retry
+            $("#g-status a").attr("href", "javascript:update()");
+          } else {
+            $("#g-status").html(ERROR_MSG.replace("__COUNT__", consecutive_error_count));
+            // Give a little time to back off before retrying
+            setTimeout(update, 1500 * consecutive_error_count);
+          }
+        }
       }
     });
   }
-- 
cgit v1.2.3


From cb22f23be64096234197cdb1c97d7a42ba504aa4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 14:16:26 -0700
Subject: Show the "view log" button for tasks that are running, in case
 they're paused/abandoned for some reason and we want to know more details.

---
 modules/gallery/views/admin_maintenance.html.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 4bfc57f0..c28def1d 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -109,16 +109,21 @@
             <?= html::clean($task->owner()->name) ?>
           </td>
           <td>
-            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-               class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-              <?= t("cancel") ?>
-            </a>
             <? if ($task->state == "stalled"): ?>
             <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
                href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
               <?= t("resume") ?>
             </a>
             <? endif ?>
+            <? if ($task->get_log()): ?>
+            <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
+              <?= t("view log") ?>
+            </a>
+            <? endif ?>
+            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
+               class="g-button ui-icon-left ui-state-default ui-corner-all">
+              <?= t("cancel") ?>
+            </a>
           </td>
         </tr>
         <? endforeach ?>
@@ -183,7 +188,7 @@
             </a>
             <? if ($task->get_log()): ?>
             <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
-              <?= t("browse log") ?>
+              <?= t("view log") ?>
             </a>
             <? endif ?>
             <? else: ?>
-- 
cgit v1.2.3


From 883d8f1e23ba000320daf535d97a2e388cc42cd1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 15:06:37 -0700
Subject: Whitespace.

---
 modules/gallery/libraries/Gallery_I18n.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index f8068eec..6cb36f07 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -44,7 +44,7 @@ function t($message, $options=array()) {
  */
 function t2($singular, $plural, $count, $options=array()) {
   return Gallery_I18n::instance()->translate(array("one" => $singular, "other" => $plural),
-                                     array_merge($options, array("count" => $count)));
+                                             array_merge($options, array("count" => $count)));
 }
 
 class Gallery_I18n_Core {
@@ -175,7 +175,7 @@ class Gallery_I18n_Core {
                ->execute() as $row) {
         $translations[$row->key] = unserialize($row->translation);
       }
-      
+
       // Override incoming with outgoing...
       foreach (db::build()
                ->select("key", "translation")
@@ -184,7 +184,7 @@ class Gallery_I18n_Core {
                ->execute() as $row) {
         $translations[$row->key] = unserialize($row->translation);
       }
-      
+
       $cache->set($cache_key, $translations, array("translation"), 0);
     }
     return $translations;
-- 
cgit v1.2.3


From ec2c9dad64ecb8aca6ab71461e76715f39071c9f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 15:20:04 -0700
Subject: Verified checkpoint.

---
 modules/gallery/tests/controller_auth_data.txt |  1 +
 modules/gallery/tests/xss_data.txt             | 90 ++++++++++++--------------
 2 files changed, 43 insertions(+), 48 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 8b776fb9..212577c7 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -17,6 +17,7 @@ modules/gallery/controllers/logout.php                       index
 modules/gallery/controllers/quick.php                        form_edit            DIRTY_CSRF
 modules/gallery/controllers/upgrader.php                     index                DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     start                DIRTY_AUTH
+modules/gallery/controllers/uploader.php                     status               DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     finish               DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 show                 DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 contact              DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 3eae3d07..4405dad3 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -88,15 +88,15 @@ modules/gallery/views/admin_maintenance.html.php             87  DIRTY_ATTR $tas
 modules/gallery/views/admin_maintenance.html.php             88  DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             91  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             106 DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             158 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             159 DIRTY    gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php             162 DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             174 DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             162 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             162 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             163 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             164 DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             167 DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             179 DIRTY    $task->status
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::site("admin/maintenance/save_log/$task->id?csrf=$csrf")
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
-modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
+modules/gallery/views/admin_maintenance_task.html.php        75  DIRTY    $task->name
 modules/gallery/views/admin_modules.html.php                 51  DIRTY    access::csrf_form_field()
 modules/gallery/views/admin_modules.html.php                 60  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_modules.html.php                 63  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
@@ -109,7 +109,7 @@ modules/gallery/views/admin_sidebar.html.php                 50  DIRTY    $avail
 modules/gallery/views/admin_sidebar.html.php                 58  DIRTY    $active
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY_ATTR $ref
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY    $text
-modules/gallery/views/admin_theme_options.html.php           36  DIRTY    $form
+modules/gallery/views/admin_theme_options.html.php           5   DIRTY    $form
 modules/gallery/views/admin_themes.html.php                  3   DIRTY_JS url::site("admin/themes/choose")
 modules/gallery/views/admin_themes.html.php                  5   DIRTY_JS $csrf
 modules/gallery/views/admin_themes.html.php                  22  DIRTY    $themes[$site]->name
@@ -168,10 +168,13 @@ modules/gallery/views/error_admin.html.php                   284 DIRTY    $var
 modules/gallery/views/error_admin.html.php                   285 DIRTY_ATTR $env_id
 modules/gallery/views/error_admin.html.php                   291 DIRTY    $key
 modules/gallery/views/error_admin.html.php                   295 DIRTY    Kohana_Exception::safe_dump($value,$key)
-modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
-modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
-modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
-modules/gallery/views/form_uploadify.html.php                15  DIRTY_JS $simultaneous_upload_limit
+modules/gallery/views/form_uploadify.html.php                16  DIRTY_JS url::site("uploader/status/_S/_E")
+modules/gallery/views/form_uploadify.html.php                24  DIRTY_JS $flash_minimum_version
+modules/gallery/views/form_uploadify.html.php                28  DIRTY_JS url::file("lib/uploadify/uploadify.swf")
+modules/gallery/views/form_uploadify.html.php                29  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
+modules/gallery/views/form_uploadify.html.php                33  DIRTY_JS url::file("lib/uploadify/cancel.png")
+modules/gallery/views/form_uploadify.html.php                34  DIRTY_JS $simultaneous_upload_limit
+modules/gallery/views/form_uploadify.html.php                160 DIRTY_ATTR request::protocol()
 modules/gallery/views/in_place_edit.html.php                 2   DIRTY    form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"))
 modules/gallery/views/in_place_edit.html.php                 3   DIRTY    access::csrf_form_field()
 modules/gallery/views/in_place_edit.html.php                 6   DIRTY    form::input("input",$form["input"]," class=\"textbox\"")
@@ -207,17 +210,6 @@ modules/gallery/views/menu_dialog.html.php                   5   DIRTY_JS $menu-
 modules/gallery/views/menu_link.html.php                     3   DIRTY    $menu->css_id?"id='{$menu->css_id}'":""
 modules/gallery/views/menu_link.html.php                     4   DIRTY_ATTR $menu->css_class
 modules/gallery/views/menu_link.html.php                     5   DIRTY_JS $menu->url
-modules/gallery/views/move_browse.html.php                   5   DIRTY_JS url::site("move/show_sub_tree/{$source->id}/__TARGETID__")
-modules/gallery/views/move_browse.html.php                   40  DIRTY    $tree
-modules/gallery/views/move_browse.html.php                   44  DIRTY    access::csrf_form_field()
-modules/gallery/views/move_tree.html.php                     2   DIRTY    $parent->thumb_img(array(),25);
-modules/gallery/views/move_tree.html.php                     4   DIRTY_JS $parent->id
-modules/gallery/views/move_tree.html.php                     6   DIRTY_JS $parent->id
-modules/gallery/views/move_tree.html.php                     8   DIRTY_ATTR $parent->id
-modules/gallery/views/move_tree.html.php                     10  DIRTY_ATTR $child->id
-modules/gallery/views/move_tree.html.php                     11  DIRTY    $child->thumb_img(array(),25);
-modules/gallery/views/move_tree.html.php                     13  DIRTY_JS $child->id
-modules/gallery/views/move_tree.html.php                     15  DIRTY_JS $child->id
 modules/gallery/views/movieplayer.html.php                   2   DIRTY    html::anchor($item->file_url(true),"",$attrs)
 modules/gallery/views/movieplayer.html.php                   5   DIRTY_JS $attrs["id"]
 modules/gallery/views/movieplayer.html.php                   7   DIRTY_JS url::abs_file("lib/flowplayer.swf")
@@ -281,18 +273,19 @@ modules/notification/views/item_updated.html.php             20  DIRTY_JS $item-
 modules/notification/views/item_updated.html.php             20  DIRTY    $item->abs_url()
 modules/notification/views/user_profile_notification.html.php 5   DIRTY_ATTR $subscription->id
 modules/notification/views/user_profile_notification.html.php 6   DIRTY_JS $subscription->url
-modules/organize/views/organize_dialog.html.php              90  DIRTY_JS $domain
-modules/organize/views/organize_dialog.html.php              91  DIRTY_JS $access_key
-modules/organize/views/organize_dialog.html.php              92  DIRTY_JS request::protocol()
-modules/organize/views/organize_dialog.html.php              93  DIRTY_JS $file_filter
-modules/organize/views/organize_dialog.html.php              94  DIRTY_JS $sort_order
-modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $sort_fields
-modules/organize/views/organize_dialog.html.php              96  DIRTY_JS $album->id
-modules/organize/views/organize_dialog.html.php              97  DIRTY_JS $rest_uri
-modules/organize/views/organize_dialog.html.php              98  DIRTY_JS $controller_uri
-modules/organize/views/organize_dialog.html.php              104 DIRTY_JS $flash_minimum_version="10.0.0"
-modules/organize/views/organize_dialog.html.php              122 DIRTY_JS $swf_uri
-modules/organize/views/organize_dialog.html.php              136 DIRTY_ATTR request::protocol()
+modules/organize/views/organize_dialog.html.php              86  DIRTY_JS $domain
+modules/organize/views/organize_dialog.html.php              87  DIRTY_JS $access_key
+modules/organize/views/organize_dialog.html.php              88  DIRTY_JS request::protocol()
+modules/organize/views/organize_dialog.html.php              89  DIRTY_JS $file_filter
+modules/organize/views/organize_dialog.html.php              90  DIRTY_JS $sort_order
+modules/organize/views/organize_dialog.html.php              91  DIRTY_JS $sort_fields
+modules/organize/views/organize_dialog.html.php              92  DIRTY_JS $album->id
+modules/organize/views/organize_dialog.html.php              93  DIRTY_JS $selected_id
+modules/organize/views/organize_dialog.html.php              94  DIRTY_JS $rest_uri
+modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $controller_uri
+modules/organize/views/organize_dialog.html.php              101 DIRTY_JS $flash_minimum_version="10.0.0"
+modules/organize/views/organize_dialog.html.php              119 DIRTY_JS $swf_uri
+modules/organize/views/organize_dialog.html.php              132 DIRTY_ATTR request::protocol()
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
@@ -385,10 +378,10 @@ themes/admin_wind/views/pager.html.php                       37  DIRTY_JS str_re
 themes/wind/views/album.html.php                             16  DIRTY_ATTR $child->id
 themes/wind/views/album.html.php                             16  DIRTY_ATTR $item_class
 themes/wind/views/album.html.php                             18  DIRTY_JS $child->url()
-themes/wind/views/album.html.php                             19  DIRTY    $child->thumb_img(array("class"=>"g-thumbnail"))
-themes/wind/views/album.html.php                             23  DIRTY_ATTR $item_class
-themes/wind/views/album.html.php                             24  DIRTY_JS $child->url()
-themes/wind/views/album.html.php                             42  DIRTY    $theme->paginator()
+themes/wind/views/album.html.php                             20  DIRTY    $child->thumb_img(array("class"=>"g-thumbnail"))
+themes/wind/views/album.html.php                             25  DIRTY_ATTR $item_class
+themes/wind/views/album.html.php                             26  DIRTY_JS $child->url()
+themes/wind/views/album.html.php                             44  DIRTY    $theme->paginator()
 themes/wind/views/block.html.php                             3   DIRTY_ATTR $anchor
 themes/wind/views/block.html.php                             5   DIRTY_ATTR $css_id
 themes/wind/views/block.html.php                             6   DIRTY    $title
@@ -410,16 +403,17 @@ themes/wind/views/page.html.php                              44  DIRTY    $thumb
 themes/wind/views/page.html.php                              81  DIRTY    $header_text
 themes/wind/views/page.html.php                              83  DIRTY_JS item::root()->url()
 themes/wind/views/page.html.php                              87  DIRTY    $theme->user_menu()
-themes/wind/views/page.html.php                              108 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php                              126 DIRTY    $content
-themes/wind/views/page.html.php                              132 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              139 DIRTY    $footer_text
+themes/wind/views/page.html.php                              108 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php                              129 DIRTY    $content
+themes/wind/views/page.html.php                              135 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              142 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
 themes/wind/views/paginator.html.php                         79  DIRTY_JS $last_page_url
-themes/wind/views/photo.html.php                             8   DIRTY_JS $theme->item()->width
-themes/wind/views/photo.html.php                             8   DIRTY_JS $theme->item()->height
-themes/wind/views/photo.html.php                             18  DIRTY    $theme->paginator()
-themes/wind/views/photo.html.php                             23  DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php                             25  DIRTY    $item->resize_img(array("id"=>"g-item-id-{$item->id}","class"=>"g-resize"))
+themes/wind/views/photo.html.php                             7   DIRTY_JS $theme->item()->width
+themes/wind/views/photo.html.php                             7   DIRTY_JS $theme->item()->height
+themes/wind/views/photo.html.php                             17  DIRTY_JS url::site("items/dimensions/".$theme->item()->id)
+themes/wind/views/photo.html.php                             31  DIRTY    $theme->paginator()
+themes/wind/views/photo.html.php                             36  DIRTY_JS $item->file_url()
+themes/wind/views/photo.html.php                             38  DIRTY    $item->resize_img(array("id"=>"g-item-id-{$item->id}","class"=>"g-resize"))
-- 
cgit v1.2.3


From 8a36c24f39e7a6111f7872ec443e6efa63580c82 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 18:20:46 -0700
Subject: Fix some broken identity APIs: - add_user_to_group and
 remove_user_from_group should take Group_Definition instances   to be
 consistent - add_user_to_group and remove_user_from_group in
 drivers/IdentityProvider.php should   not be static

---
 modules/gallery/helpers/identity.php                        |  8 ++++----
 modules/gallery/libraries/drivers/IdentityProvider.php      | 12 ++++++------
 modules/user/helpers/group.php                              |  8 ++++----
 modules/user/libraries/drivers/IdentityProvider/Gallery.php |  7 ++-----
 4 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 5de05948..5ca024e9 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -233,14 +233,14 @@ class identity_Core {
   /**
    * @see IdentityProvider_Driver::add_user_to_group.
    */
-  static function add_user_to_group($user, $group_id) {
-    return IdentityProvider::instance()->add_user_to_group($user, $group_id);
+  static function add_user_to_group($user, $group) {
+    return IdentityProvider::instance()->add_user_to_group($user, $group);
   }
 
   /**
    * @see IdentityProvider_Driver::remove_user_to_group.
    */
-  static function remove_user_from_group($user, $group_id) {
-    return IdentityProvider::instance()->remove_user_from_group($user, $group_id);
+  static function remove_user_from_group($user, $group) {
+    return IdentityProvider::instance()->remove_user_from_group($user, $group);
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index 3e85a57b..ac2473f5 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -116,17 +116,17 @@ interface IdentityProvider_Driver {
 
   /**
    * Add the user to the specified group
-   * @param User_Definition the user to add to the group
-   * @param int             the group_id
+   * @param User_Definition  the user to add
+   * @param Group_Definition the target group
    */
-  static function add_user_to_group($user, $group_id);
+  public function add_user_to_group($user, $group);
 
   /**
    * Remove the user to the specified group
-   * @param User_Definition the user to add to the group
-   * @param int             the group id
+   * @param User_Definition  the user to remove
+   * @param Group_Definition the owning group
    */
-  static function remove_user_from_group($user, $group_id);
+  public function remove_user_from_group($user, $group);
 } // End Identity Driver Definition
 
 interface Group_Definition {}
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index c84910f1..88bfac35 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -68,13 +68,13 @@ class group_Core {
    */
   private static function _lookup_by_field($field_name, $value) {
     try {
-      $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded()) {
-        return $user;
+      $group = model_cache::get("group", $value, $field_name);
+      if ($group->loaded()) {
+        return $group;
       }
     } catch (Exception $e) {
       if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
+        throw $e;
       }
     }
     return null;
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 1ed7dd4f..44433ad7 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -148,9 +148,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::add_user_to_group.
    */
-  static function add_user_to_group($user, $group_id) {
-    $group = self::lookup_group($group_id);
-
+  public function add_user_to_group($user, $group) {
     $group->add($user);
     $group->save();
   }
@@ -158,8 +156,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::remove_user_to_group.
    */
-  static function remove_user_from_group($user, $group_id) {
-    $group = self::lookup_group_by_name($group_id);
+  public function remove_user_from_group($user, $group_id) {
     $group->remove($user);
     $group->save();
   }
-- 
cgit v1.2.3


From 886b88fccf5de7fb3b17e1f3a2acd539268d1e8b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 18:49:37 -0700
Subject: Revert "change the Setswana locale from tn_ZA to tn_BW since it's
 mostly"

This reverts commit 2d948cb39fd2da6a5f966a10cbeb4f5d5caec5a3.

Valiant said that tn_ZA is right:
http://gallery.menalto.com/node/97840#comment-352865
---
 modules/gallery/helpers/locales.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 624ff9cb..1f5473ff 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -103,7 +103,7 @@ class locales_Core {
     $l["sl_SI"] = "Slovenščina";              // Slovenian
     $l["sr_CS"] = "Srpski";                   // Serbian
     $l["sv_SE"] = "Svenska";                  // Swedish
-    $l["tn_BW"] = "Setswana";                 // Setswana
+    $l["tn_ZA"] = "Setswana";                 // Setswana
     $l["tr_TR"] = "Türkçe";                   // Turkish
     $l["uk_UA"] = "українська";         // Ukrainian
     $l["vi_VN"] = "Tiếng Việt";               // Vietnamese
-- 
cgit v1.2.3


From 2f810ec12624eefa3eb47ad7174dbbe03936135d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 19:28:34 -0700
Subject: Add "web_url" with the url to the web version of the item.  Fixes
 ticket #1341.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 1db766e9..34c22021 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -975,6 +975,8 @@ class Item_Model extends ORM_MPTT {
     }
     unset($data["album_cover_item_id"]);
 
+    $data["web_url"] = $this->abs_url();
+
     if (access::can("view_full", $this) && !$this->is_album()) {
       $data["file_url"] = rest::url("data", $this, "full");
     }
-- 
cgit v1.2.3


From fa1fe47b6a0a377929a70748406eae589ecf2a00 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Sep 2010 22:13:41 -0700
Subject: Use the absolute site url when logging out of the admin site else we
 wind up with weird url doubling effects.  Fixes ticket #1342.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index ec7d1882..0ba98025 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -210,7 +210,7 @@ class gallery_event_Core {
                       ->label($user->display_name()));
 
         if (Router::$controller == "admin") {
-          $continue_url = url::site("");
+          $continue_url = url::abs_site("");
         } else if (isset($theme->item)) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
             $continue_url = $theme->item->abs_url();
-- 
cgit v1.2.3


From ab880120e69b27bdcfed07d3b0729108326b335d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 21:04:38 -0700
Subject: The G2 import sets the sort_order to "asc"/"desc" but
 Item_Model::get_position() expects "DESC".  This breaks navigation in any
 album imported from G2 that has a descending sort order.

Two things:
1) Use "ASC"/"DESC" in G2 import for consistency
2) Make Item_Model::get_position() more robust against capitalization

Fixes ticket #1334.
---
 modules/g2_import/helpers/g2_import.php | 6 +++---
 modules/gallery/models/item.php         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index c3737f8f..515eb73d 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -452,9 +452,9 @@ class g2_import_Core {
         "title" => "title",
         "viewCount" => "view_count");
       $direction_map = array(
-        1 => "asc",
-        ORDER_ASCENDING => "asc",
-        ORDER_DESCENDING => "desc");
+        1 => "ASC",
+        ORDER_ASCENDING => "ASC",
+        ORDER_DESCENDING => "DESC");
       // Only consider G2's first sort order
       $g2_order = explode("|", $g2_album->getOrderBy() . "");
       $g2_order = $g2_order[0];
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 34c22021..485cd8cf 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -530,7 +530,7 @@ class Item_Model extends ORM_MPTT {
    * the first child in the album is at position 1.
    */
   public function get_position($child, $where=array()) {
-    if ($this->sort_order == "DESC") {
+    if (!strcasecmp($this->sort_order, "DESC")) {
       $comp = ">";
     } else {
       $comp = "<";
-- 
cgit v1.2.3


From 00c1100d9d6f717b2c8d16600ae978a13b3798fd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 21:30:53 -0700
Subject: Add Macedonian.  Fixes ticket #1345.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 1f5473ff..d1e72260 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -92,6 +92,7 @@ class locales_Core {
     $l["ko_KR"] = "한국어";                    // Korean
     $l["lt_LT"] = "Lietuvių";                 // Lithuanian
     $l["lv_LV"] = "Latviešu";                 // Latvian
+    $l["mk_MK"] = "Македонски јазик";         // Macedonian
     $l["nl_NL"] = "Nederlands";               // Dutch
     $l["no_NO"] = "Norsk bokmål";             // Norwegian
     $l["pl_PL"] = "Polski";                   // Polish
-- 
cgit v1.2.3


From afeb3bb8c47b4ffbacf4585946005bb899ef516b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 22:13:30 -0700
Subject: Fix typo.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 736b6854..e3fb8684 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -139,7 +139,7 @@ class module_Core {
   }
 
   /**
-   * Allow modules to indicate the impact of deactivating the specifeid module
+   * Allow modules to indicate the impact of deactivating the specified module
    * @param string $module_name
    * @return array an array of warning or error messages to be displayed
    */
-- 
cgit v1.2.3


From 4ba93b7cfc2889dc7cef6729681dd779451f90bf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 22:23:54 -0700
Subject: Return the size in bytes of the thumb, resize and full file. Don't
 return thumb info if there's no thumbnail (eg: album w/ no contents) Don't
 return file_url_public for albums

Fixes ticket #1347.
---
 modules/gallery/models/item.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 485cd8cf..cdba0241 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -977,23 +977,30 @@ class Item_Model extends ORM_MPTT {
 
     $data["web_url"] = $this->abs_url();
 
-    if (access::can("view_full", $this) && !$this->is_album()) {
-      $data["file_url"] = rest::url("data", $this, "full");
-    }
-    if (access::user_can(identity::guest(), "view_full", $this)) {
-      $data["file_url_public"] = $this->file_url(true);
+    if (!$this->is_album()) {
+      if (access::can("view_full", $this)) {
+        $data["file_url"] = rest::url("data", $this, "full");
+        $data["file_size"] = filesize($this->file_path());
+      }
+      if (access::user_can(identity::guest(), "view_full", $this)) {
+        $data["file_url_public"] = $this->file_url(true);
+      }
     }
 
     if ($this->is_photo()) {
       $data["resize_url"] = rest::url("data", $this, "resize");
+      $data["resize_size"] = filesize($this->resize_path());
       if (access::user_can(identity::guest(), "view", $this)) {
         $data["resize_url_public"] = $this->resize_url(true);
       }
     }
 
-    $data["thumb_url"] = rest::url("data", $this, "thumb");
-    if (access::user_can(identity::guest(), "view", $this)) {
-      $data["thumb_url_public"] = $this->thumb_url(true);
+    if ($this->has_thumb()) {
+      $data["thumb_url"] = rest::url("data", $this, "thumb");
+      $data["thumb_size"] = filesize($this->thumb_path());
+      if (access::user_can(identity::guest(), "view", $this)) {
+        $data["thumb_url_public"] = $this->thumb_url(true);
+      }
     }
 
     $data["can_edit"] = access::can("edit", $this);
-- 
cgit v1.2.3


From 8fed0fb2e20d72f43f8730b557c044dbe844196f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Sep 2010 22:42:01 -0700
Subject: Updated for b6fa33faf789749f4de3f4eadf8832748372c980

---
 modules/gallery/tests/xss_data.txt | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 4405dad3..8d26092b 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -273,19 +273,19 @@ modules/notification/views/item_updated.html.php             20  DIRTY_JS $item-
 modules/notification/views/item_updated.html.php             20  DIRTY    $item->abs_url()
 modules/notification/views/user_profile_notification.html.php 5   DIRTY_ATTR $subscription->id
 modules/notification/views/user_profile_notification.html.php 6   DIRTY_JS $subscription->url
-modules/organize/views/organize_dialog.html.php              86  DIRTY_JS $domain
-modules/organize/views/organize_dialog.html.php              87  DIRTY_JS $access_key
-modules/organize/views/organize_dialog.html.php              88  DIRTY_JS request::protocol()
-modules/organize/views/organize_dialog.html.php              89  DIRTY_JS $file_filter
-modules/organize/views/organize_dialog.html.php              90  DIRTY_JS $sort_order
-modules/organize/views/organize_dialog.html.php              91  DIRTY_JS $sort_fields
-modules/organize/views/organize_dialog.html.php              92  DIRTY_JS $album->id
-modules/organize/views/organize_dialog.html.php              93  DIRTY_JS $selected_id
-modules/organize/views/organize_dialog.html.php              94  DIRTY_JS $rest_uri
-modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $controller_uri
-modules/organize/views/organize_dialog.html.php              101 DIRTY_JS $flash_minimum_version="10.0.0"
-modules/organize/views/organize_dialog.html.php              119 DIRTY_JS $swf_uri
-modules/organize/views/organize_dialog.html.php              132 DIRTY_ATTR request::protocol()
+modules/organize/views/organize_dialog.html.php              90  DIRTY_JS $domain
+modules/organize/views/organize_dialog.html.php              91  DIRTY_JS $access_key
+modules/organize/views/organize_dialog.html.php              92  DIRTY_JS request::protocol()
+modules/organize/views/organize_dialog.html.php              93  DIRTY_JS $file_filter
+modules/organize/views/organize_dialog.html.php              94  DIRTY_JS $sort_order
+modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $sort_fields
+modules/organize/views/organize_dialog.html.php              96  DIRTY_JS $album->id
+modules/organize/views/organize_dialog.html.php              97  DIRTY_JS $selected_id
+modules/organize/views/organize_dialog.html.php              98  DIRTY_JS $rest_uri
+modules/organize/views/organize_dialog.html.php              99  DIRTY_JS $controller_uri
+modules/organize/views/organize_dialog.html.php              105 DIRTY_JS $flash_minimum_version="10.0.0"
+modules/organize/views/organize_dialog.html.php              123 DIRTY_JS $swf_uri
+modules/organize/views/organize_dialog.html.php              136 DIRTY_ATTR request::protocol()
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
@@ -330,8 +330,8 @@ modules/server_add/views/server_add_tree_dialog.html.php     4   DIRTY_JS url::s
 modules/server_add/views/server_add_tree_dialog.html.php     21  DIRTY    $tree
 modules/tag/views/admin_tags.html.php                        45  DIRTY_ATTR $tag->id
 modules/tag/views/admin_tags.html.php                        46  DIRTY    $tag->count
-modules/tag/views/tag_block.html.php                         25  DIRTY    $cloud
-modules/tag/views/tag_block.html.php                         27  DIRTY    $form
+modules/tag/views/tag_block.html.php                         26  DIRTY    $cloud
+modules/tag/views/tag_block.html.php                         28  DIRTY    $form
 modules/tag/views/tag_cloud.html.php                         4   DIRTY_ATTR (int)(($tag->count/$max_count)*7)
 modules/tag/views/tag_cloud.html.php                         5   DIRTY    $tag->count
 modules/tag/views/tag_cloud.html.php                         6   DIRTY_JS $tag->url()
-- 
cgit v1.2.3


From 391a90e3cedd1cca7631f9a4d786c6c513b1dd48 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 8 Sep 2010 20:36:22 -0700
Subject: Detect when a module fails to upgrade properly and put up an
 informative message to help the user know that she needs to get a newer copy
 of the module.  Fixes ticket #1189.

---
 modules/gallery/controllers/upgrader.php | 12 ++++++--
 modules/gallery/css/upgrader.css         | 28 +++++++++++++++++
 modules/gallery/helpers/module.php       |  6 +++-
 modules/gallery/views/upgrader.html.php  | 53 ++++++++++++++++++++++----------
 4 files changed, 79 insertions(+), 20 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index cb940b46..a3cfac48 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -39,10 +39,12 @@ class Upgrader_Controller extends Controller {
       }
     }
 
+    $failed = Input::instance()->get("failed");
     $view = new View("upgrader.html");
     $view->can_upgrade = identity::active_user()->admin || $session->get("can_upgrade");
     $view->upgrade_token = $upgrade_token;
     $view->available = module::available();
+    $view->failed = $failed ? explode(",", $failed) : array();
     $view->done = $available_upgrades == 0;
     print $view;
   }
@@ -65,20 +67,26 @@ class Upgrader_Controller extends Controller {
     }
 
     // Then upgrade the rest
+    $failed = array();
     foreach (module::available() as $id => $module) {
       if ($id == "gallery") {
         continue;
       }
 
       if ($module->active && $module->code_version != $module->version) {
-        module::upgrade($id);
+        try {
+          module::upgrade($id);
+        } catch (Exception $e) {
+          // @todo assume it's MODULE_FAILED_TO_UPGRADE for now
+          $failed[] = $id;
+        }
       }
     }
 
     if (php_sapi_name() == "cli") {
       print "Upgrade complete\n";
     } else {
-      url::redirect("upgrader");
+      url::redirect("upgrader?failed=" . join(",", $failed));
     }
   }
 }
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index d1b74c31..8610016e 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -58,6 +58,10 @@ tr.upgradeable td.gallery {
   color: #00d;
 }
 
+tr.failed td {
+  color: red;
+}
+
 p {
   font-size: .9em;
 }
@@ -120,12 +124,28 @@ div#dialog div {
   opacity: 0.5;
 }
 
+.failed {
+  color: red;
+}
+
 pre {
   display: inline;
   margin: 0px;
   padding: 0px;
 }
 
+div#upgrade_button {
+  margin-bottom: 20px;
+}
+
+div#welcome_message {
+  margin-left: 30px;
+}
+
+#logo {
+  margin-left: 14px;
+}
+
 .rtl {
   direction: rtl;
 }
@@ -153,3 +173,11 @@ pre {
 .rtl div#dialog a.close {
   float: left;
 }
+
+.rtl div#welcome_message {
+  padding-right: 30px;
+}
+
+.rtl #logo {
+  padding-right: 12px;
+}
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e3fb8684..be9c4249 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -214,10 +214,10 @@ class module_Core {
   static function upgrade($module_name) {
     $version_before = module::get_version($module_name);
     $installer_class = "{$module_name}_installer";
+    $available = module::available();
     if (method_exists($installer_class, "upgrade")) {
       call_user_func_array(array($installer_class, "upgrade"), array($version_before));
     } else {
-      $available = module::available();
       if (isset($available->$module_name->code_version)) {
         module::set_version($module_name, $available->$module_name->code_version);
       } else {
@@ -234,6 +234,10 @@ class module_Core {
                           "version_before" => $version_before,
                           "version_after" => $version_after)));
     }
+
+    if ($version_after != $available->$module_name->code_version) {
+      throw new Exception("@todo MODULE_FAILED_TO_UPGRADE");
+    }
   }
 
   /**
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 0ce24ef8..c2d8a552 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -10,7 +10,7 @@
   </head>
   <body<? if (locales::is_rtl()) { echo ' class="rtl"'; } ?>>
     <div id="outer">
-      <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
+      <img id="logo" src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
       <div id="inner">
         <? if ($can_upgrade): ?>
         <div id="dialog" style="visibility: hidden">
@@ -31,6 +31,12 @@
                     array("url" => html::mark_clean(url::base()))) ?>
             </p>
           </div>
+          <div id="failed" style="display: none">
+            <h1> <?= t("Some modules failed to upgrade!") ?> </h1>
+            <p>
+              <?= t("Failed modules are <span class=\"failed\">highlighted</span>.  Try getting newer versions or <a href=\"%admin_modules\">deactivating those modules</a>.", array("admin_modules" => url::site("admin/modules"))) ?>
+            </p>
+          </div>
         </div>
         <script type="text/javascript">
           $(document).ready(function() {
@@ -41,6 +47,10 @@
             <? if ($done): ?>
             show_done();
             <? endif ?>
+
+            <? if ($failed): ?>
+            show_failed();
+            <? endif ?>
           });
 
           var show_busy = function() {
@@ -55,10 +65,31 @@
             $("#done").show();
             $("#dialog_close_link").show();
           }
+
+          var show_failed = function() {
+            $("#dialog").css("visibility", "visible");
+            $("#failed").show();
+            $("#dialog_close_link").show();
+          }
         </script>
-        <p class="<?= $done ? "muted" : "" ?>">
-          <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
-        </p>
+        <div id="welcome_message">
+          <p class="<?= $done ? "muted" : "" ?>">
+            <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
+          </p>
+        </div>
+
+        <? if ($done): ?>
+        <div id="upgrade_button" class="button muted">
+          <?= t("Upgrade all") ?>
+        </div>
+        <? else: ?>
+        <div id="upgrade_button" class="button button-active">
+          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade") ?>">
+            <?= t("Upgrade all") ?>
+          </a>
+        </div>
+        <? endif ?>
+
         <table>
           <tr class="<?= $done ? "muted" : "" ?>">
             <th class="name"> <?= t("Module name") ?> </th>
@@ -68,7 +99,7 @@
 
           <? foreach ($available as $id => $module): ?>
           <? if ($module->active): ?>
-          <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?>" >
+          <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?> <?= in_array($id, $failed) ? "failed" : "" ?>" >
             <td class="name <?= $id ?>">
               <?= t($module->name) ?>
             </td>
@@ -85,18 +116,6 @@
           <? endforeach ?>
         </table>
 
-        <? if ($done): ?>
-        <div class="button muted">
-          <?= t("Upgrade all") ?>
-        </div>
-        <? else: ?>
-        <div class="button button-active">
-          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade") ?>">
-            <?= t("Upgrade all") ?>
-          </a>
-        </div>
-        <? endif ?>
-
         <? if (@$inactive): ?>
         <p class="<?= $done ? "muted" : "" ?>">
           <?= t("The following modules are inactive and don't require an upgrade.") ?>
-- 
cgit v1.2.3


From cbb6967405569606de3b67e1f1dcde2ed8d6bb03 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 8 Sep 2010 20:59:40 -0700
Subject: Detect out-of-date modules and put up a message for site admins.
 Fixes ticket #1353.

---
 modules/gallery/controllers/admin_modules.php | 5 +++++
 modules/gallery/controllers/upgrader.php      | 3 +++
 modules/gallery/helpers/module.php            | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index f5af9a5a..650b7e9e 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -95,12 +95,17 @@ class Admin_Modules_Controller extends Admin_Controller {
           $activated_names[] = t($info->name);
         }
       } catch (Exception $e) {
+        message::warning(t("An error occurred while installing the <b>%module_name</b> module",
+                           array("module_name" => $info->name)));
         Kohana_Log::add("error", (string)$e);
       }
     }
 
     module::event("module_change", $changes);
 
+    // If modules need upgrading, this will get recreated
+    site_status::clear("upgrade_now");
+
     // @todo this type of collation is questionable from an i18n perspective
     if ($activated_names) {
       message::success(t("Activated: %names", array("names" => join(", ", $activated_names))));
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index a3cfac48..6613d671 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -83,6 +83,9 @@ class Upgrader_Controller extends Controller {
       }
     }
 
+    // If the upgrade failed, this will get recreated
+    site_status::clear("upgrade_now");
+
     if (php_sapi_name() == "cli") {
       print "Upgrade complete\n";
     } else {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index be9c4249..7863520e 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -99,6 +99,10 @@ class module_Core {
         $m->code_version = $m->version;
         $m->version = self::get_version($module_name);
         $m->locked = false;
+
+        if ($m->active && $m->version != $m->code_version) {
+          site_status::warning(t("Some of your modules are out of date.  <a href=\"%upgrader_url\">Upgrade now!</a>", array("upgrader_url" => url::site("upgrader"))), "upgrade_now");
+        }
       }
 
       // Lock certain modules
-- 
cgit v1.2.3


From 5892712b237cb1e585b2cc7a6820d2cf3a8c1a34 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 10 Sep 2010 23:01:47 -0700
Subject: If the user is not an admin, don't 403 -- instead just redirect them
 to the root album.  Fixes ticket #1356.

---
 modules/gallery/controllers/reauthenticate.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index 0486c0fe..53a96374 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -19,12 +19,19 @@
  */
 class Reauthenticate_Controller extends Controller {
   public function index() {
+    $is_ajax = Session::instance()->get_once("is_ajax_request", request::is_ajax());
     if (!identity::active_user()->admin) {
-      access::forbidden();
+      if ($is_ajax) {
+        // We should never be able to get here since Admin_Controller::_reauth_check() won't work
+        // for non-admins.
+        access::forbidden();
+      } else {
+        url::redirect(item::root()->abs_url());
+      }
     }
+
     // On redirects from the admin controller, the ajax request indicator is lost,
     // so we store it in the session.
-    $is_ajax = Session::instance()->get_once("is_ajax_request", request::is_ajax());
     if ($is_ajax) {
       $v = new View("reauthenticate.html");
       $v->form = self::_form();
-- 
cgit v1.2.3


From 67f45cfa781ef4b446676e199470e421f5463812 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 01:46:45 -0700
Subject: Add CSRF protection to the upgrader.  And update the CLI output so
 that it tells you which modules failed to upgrade properly.  Fixes ticket
 #1359.

---
 modules/gallery/controllers/upgrader.php | 21 ++++++++++++++++++---
 modules/gallery/views/upgrader.html.php  |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 6613d671..b2646874 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -54,8 +54,16 @@ class Upgrader_Controller extends Controller {
       // @todo this may screw up some module installers, but we don't have a better answer at
       // this time.
       $_SERVER["HTTP_HOST"] = "example.com";
-    } else if (!identity::active_user()->admin && !Session::instance()->get("can_upgrade", false)) {
-      access::forbidden();
+    } else {
+      if (!identity::active_user()->admin && !Session::instance()->get("can_upgrade", false)) {
+        access::forbidden();
+      }
+
+      try {
+        access::verify_csrf();
+      } catch (Exception $e) {
+        url::redirect("upgrader");
+      }
     }
 
     $available = module::available();
@@ -87,7 +95,14 @@ class Upgrader_Controller extends Controller {
     site_status::clear("upgrade_now");
 
     if (php_sapi_name() == "cli") {
-      print "Upgrade complete\n";
+      if ($failed) {
+        print "Upgrade completed ** WITH FAILURES **\n";
+        print "The following modules were not successfully upgraded:\n";
+        print "  " . implode($failed, "\n  ") . "\n";
+        print "Try getting newer versions or deactivating those modules\n";
+      } else {
+        print "Upgrade complete\n";
+      }
     } else {
       url::redirect("upgrader?failed=" . join(",", $failed));
     }
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index c2d8a552..554cf30d 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -84,7 +84,7 @@
         </div>
         <? else: ?>
         <div id="upgrade_button" class="button button-active">
-          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade") ?>">
+          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade?csrf=__CSRF__") ?>">
             <?= t("Upgrade all") ?>
           </a>
         </div>
-- 
cgit v1.2.3


From 509b647c65d0b56760952ff886eed06625f4ac5f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 01:48:26 -0700
Subject: upgrader/index does not require CSRF

---
 modules/gallery/tests/controller_auth_data.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 212577c7..03032fd9 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -15,7 +15,7 @@ modules/gallery/controllers/login.php                        html
 modules/gallery/controllers/login.php                        auth_html            DIRTY_AUTH
 modules/gallery/controllers/logout.php                       index                DIRTY_AUTH
 modules/gallery/controllers/quick.php                        form_edit            DIRTY_CSRF
-modules/gallery/controllers/upgrader.php                     index                DIRTY_AUTH
+modules/gallery/controllers/upgrader.php                     index                DIRTY_CSRF|DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     start                DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     status               DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     finish               DIRTY_AUTH
-- 
cgit v1.2.3


From 34a71e7cd34bc184abbf9060ec4b316ba1c66bc5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 01:48:44 -0700
Subject: Verified.

---
 modules/gallery/tests/xss_data.txt | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 8d26092b..6821c963 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -42,7 +42,7 @@ modules/digibug/views/digibug_form.html.php                  4   DIRTY    form::
 modules/digibug/views/digibug_form.html.php                  6   DIRTY    form::hidden($key,$value)
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
-modules/g2_import/views/admin_g2_import.html.php             30  DIRTY    $form
+modules/g2_import/views/admin_g2_import.html.php             9   DIRTY    $form
 modules/gallery/views/admin_advanced_settings.html.php       21  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_advanced_settings.html.php       22  DIRTY    $var->module_name
 modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY_ATTR log::severity_class($entry->severity)
@@ -248,14 +248,15 @@ modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $permi
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $item->id
 modules/gallery/views/quick_delete_confirm.html.php          11  DIRTY    $form
 modules/gallery/views/reauthenticate.html.php                9   DIRTY    $form
-modules/gallery/views/upgrader.html.php                      59  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      63  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      71  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
-modules/gallery/views/upgrader.html.php                      72  DIRTY_ATTR $id
-modules/gallery/views/upgrader.html.php                      76  DIRTY    $module->version
-modules/gallery/views/upgrader.html.php                      79  DIRTY    $module->code_version
-modules/gallery/views/upgrader.html.php                      101 DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      104 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      76  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      94  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR in_array($id,$failed)?"failed":""
+modules/gallery/views/upgrader.html.php                      103 DIRTY_ATTR $id
+modules/gallery/views/upgrader.html.php                      107 DIRTY    $module->version
+modules/gallery/views/upgrader.html.php                      110 DIRTY    $module->code_version
+modules/gallery/views/upgrader.html.php                      120 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      123 DIRTY_ATTR $done?"muted":""
 modules/gallery/views/user_languages_block.html.php          2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
 modules/gallery/views/user_profile.html.php                  34  DIRTY_ATTR $user->avatar_url(40,$theme->url(,true))
 modules/gallery/views/user_profile.html.php                  43  DIRTY    $info->view
@@ -338,15 +339,17 @@ modules/tag/views/tag_cloud.html.php                         6   DIRTY_JS $tag->
 modules/user/views/admin_users.html.php                      3   DIRTY_JS url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->admin?"g-admin":""
 modules/user/views/admin_users.html.php                      72  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
-modules/user/views/admin_users.html.php                      87  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
-modules/user/views/admin_users.html.php                      123 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php                      123 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php                      125 DIRTY    $v
+modules/user/views/admin_users.html.php                      72  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/user/views/admin_users.html.php                      72  DIRTY_ATTR $user->admin?"g-admin":""
+modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      74  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
+modules/user/views/admin_users.html.php                      88  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
+modules/user/views/admin_users.html.php                      91  DIRTY    db::build()->from("items")->where("owner_id","=",$user->id)->count_records()
+modules/user/views/admin_users.html.php                      127 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php                      127 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php                      129 DIRTY    $v
+modules/user/views/admin_users_delete_user.html.php          6   DIRTY    $form
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $user->id
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $group->id
 modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $width
-- 
cgit v1.2.3


From 14ae1fde25eb8b22a2fc92453ba12c8e74aba433 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 10:41:47 -0700
Subject: Use the actual csrf token, not the placeholder (url::site doesn't
 replace that).  Fixes ticket #1361

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 554cf30d..1ec49c77 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -84,7 +84,7 @@
         </div>
         <? else: ?>
         <div id="upgrade_button" class="button button-active">
-          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade?csrf=__CSRF__") ?>">
+          <a id="upgrade_link" href="<?= url::site("upgrader/upgrade?csrf=" . access::csrf_token()) ?>">
             <?= t("Upgrade all") ?>
           </a>
         </div>
-- 
cgit v1.2.3


From bfd92ac6f2d563106bc5906cc9fddb35bca44b58 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 21:38:38 -0700
Subject: Use $theme->item() instead of $theme->item, otherwise
 isset($theme->item) may return true even when we don't have an actual
 Item_Model in there.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 0ba98025..81659b38 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -209,11 +209,12 @@ class gallery_event_Core {
                       ->url(user_profile::url($user->id))
                       ->label($user->display_name()));
 
+        $item = $theme->item();
         if (Router::$controller == "admin") {
           $continue_url = url::abs_site("");
-        } else if (isset($theme->item)) {
+        } else if ($item) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
-            $continue_url = $theme->item->abs_url();
+            $continue_url = $item->abs_url();
           } else {
             $continue_url = item::root()->abs_url();
           }
-- 
cgit v1.2.3


From b4fb11f8d5f06aed612ea9d9c9699ce31e55b957 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 21:40:57 -0700
Subject: Only call $theme->item() if we're in a non admin theme.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 81659b38..5b1db987 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -209,10 +209,9 @@ class gallery_event_Core {
                       ->url(user_profile::url($user->id))
                       ->label($user->display_name()));
 
-        $item = $theme->item();
         if (Router::$controller == "admin") {
           $continue_url = url::abs_site("");
-        } else if ($item) {
+        } else if ($item = $theme->item()) {
           if (access::user_can(identity::guest(), "view", $theme->item)) {
             $continue_url = $item->abs_url();
           } else {
-- 
cgit v1.2.3


From f84c4a6192ea0e47ca5b2006baa0bfd7e09a682c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 23:37:12 -0700
Subject: Uniqify the name and slug when we move an item to a new location with
 a conflict.  This fixes #1364.

---
 modules/gallery/models/item.php           | 50 ++++++++++++++++-----------
 modules/gallery/tests/Item_Model_Test.php | 57 ++++++++++++++-----------------
 2 files changed, 55 insertions(+), 52 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index cdba0241..3ceb5e37 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -357,26 +357,7 @@ class Item_Model extends ORM_MPTT {
           }
         }
 
-        // Randomize the name or slug if there's a conflict.  Preserve the extension.
-        // @todo Improve this.  Random numbers are not user friendly
-        $base_name = pathinfo($this->name, PATHINFO_FILENAME);
-        $base_ext = pathinfo($this->name, PATHINFO_EXTENSION);
-        $base_slug = $this->slug;
-        while (ORM::factory("item")
-               ->where("parent_id", "=", $this->parent_id)
-               ->and_open()
-               ->where("name", "=", $this->name)
-               ->or_where("slug", "=", $this->slug)
-               ->close()
-               ->find()->id) {
-          $rand = rand();
-          if ($base_ext) {
-            $this->name = "$base_name-$rand.$base_ext";
-          } else {
-            $this->name = "$base_name-$rand";
-          }
-          $this->slug = "$base_slug-$rand";
-        }
+        $this->_randomize_name_or_slug_on_conflict();
 
         parent::save();
 
@@ -427,6 +408,8 @@ class Item_Model extends ORM_MPTT {
           $this->relative_url_cache = null;
         }
 
+        $this->_randomize_name_or_slug_on_conflict();
+
         parent::save();
 
         // Now update the filesystem and any database caches if there were significant value
@@ -504,6 +487,33 @@ class Item_Model extends ORM_MPTT {
     return $this;
   }
 
+  /**
+   * Check to see if there's another item that occupies the same name or slug that this item
+   * intends to use, and if so choose a new name/slug while preserving the extension.
+   * @todo Improve this.  Random numbers are not user friendly
+   */
+  private function _randomize_name_or_slug_on_conflict() {
+    $base_name = pathinfo($this->name, PATHINFO_FILENAME);
+    $base_ext = pathinfo($this->name, PATHINFO_EXTENSION);
+    $base_slug = $this->slug;
+    while (ORM::factory("item")
+           ->where("parent_id", "=", $this->parent_id)
+           ->where("id", "<>", $this->id)
+           ->and_open()
+           ->where("name", "=", $this->name)
+           ->or_where("slug", "=", $this->slug)
+           ->close()
+           ->find()->id) {
+      $rand = rand();
+      if ($base_ext) {
+        $this->name = "$base_name-$rand.$base_ext";
+      } else {
+        $this->name = "$base_name-$rand";
+      }
+      $this->slug = "$base_slug-$rand";
+    }
+  }
+
   /**
    * Return the Item_Model representing the cover for this album.
    * @return Item_Model or null if there's no cover
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index bd123098..90c54e3c 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -136,20 +136,17 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $this->assert_true(false, "Shouldn't get here");
   }
 
-  public function item_rename_fails_with_existing_name_test() {
+  public function item_rename_over_existing_name_gets_uniqified_test() {
     // Create a test photo
     $item = test::random_photo();
     $item2 = test::random_photo();
 
-    try {
-      $item->name = $item2->name;
-      $item->save();
-    } catch (ORM_Validation_Exception $e) {
-      $this->assert_true(in_array("conflict", $e->validation->errors()));
-      return;
-    }
+    $item->name = $item2->name;
+    $item->save();
 
-    $this->assert_false(true, "rename should conflict");
+    // foo.jpg should become foo-####.jpg
+    $this->assert_true(
+      preg_match("/" . str_replace(".jpg", "", $item2->name) . "-\d+\.jpg/", $item->name));
   }
 
   public function move_album_test() {
@@ -208,24 +205,21 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $this->assert_equal("file", file_get_contents($photo->file_path()));
   }
 
-  public function move_album_fails_conflicting_target_test() {
+  public function move_album_with_conflicting_target_gets_uniqified_test() {
     $album = test::random_album();
     $source = test::random_album_unsaved($album);
     $source->name = $album->name;
     $source->save();
 
     // $source and $album have the same name, so if we move $source into the root they should
-    // conflict.
+    // conflict and get randomized
 
-    try {
-      $source->parent_id = item::root()->id;
-      $source->save();
-    } catch (ORM_Validation_Exception $e) {
-      $this->assert_equal(
-        array("name" => "conflict", "slug" => "conflict"), $e->validation->errors());
-      return;
-    }
-    $this->assert_true(false, "Shouldn't get here");
+    $source->parent_id = item::root()->id;
+    $source->save();
+
+    // foo should become foo-####
+    $this->assert_true(preg_match("/{$album->name}-\d+/", $source->name));
+    $this->assert_true(preg_match("/{$album->slug}-\d+/", $source->slug));
   }
 
   public function move_album_fails_wrong_target_type_test() {
@@ -245,7 +239,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $this->assert_true(false, "Shouldn't get here");
   }
 
-  public function move_photo_fails_conflicting_target_test() {
+  public function move_photo_with_conflicting_target_gets_uniqified_test() {
     $photo1 = test::random_photo();
     $album = test::random_album();
     $photo2 = test::random_photo_unsaved($album);
@@ -253,18 +247,17 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $photo2->save();
 
     // $photo1 and $photo2 have the same name, so if we move $photo1 into the root they should
-    // conflict.
+    // conflict and get uniqified.
 
-    try {
-      $photo2->parent_id = item::root()->id;
-      $photo2->save();
-    } catch (Exception $e) {
-      // pass
-      $this->assert_equal(
-        array("name" => "conflict", "slug" => "conflict"), $e->validation->errors());
-      return;
-    }
-    $this->assert_true(false, "Shouldn't get here");
+    $photo2->parent_id = item::root()->id;
+    $photo2->save();
+
+    // foo.jpg should become foo-####.jpg
+    $this->assert_true(
+      preg_match("/" . str_replace(".jpg", "", $photo1->name) . "-\d+\.jpg/", $photo2->name));
+
+    // foo should become foo
+    $this->assert_true(preg_match("/{$photo1->slug}/", $photo2->name));
   }
 
   public function move_album_inside_descendent_fails_test() {
-- 
cgit v1.2.3


From 19034d140e79f774826d5a94128b0abe5020d1b3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 12 Sep 2010 13:35:50 -0700
Subject: Rename the class to Item_Model_Core so that it can be overloaded.
 Related to ticket #1368.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 3ceb5e37..7bcf1f31 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -17,7 +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 Item_Model extends ORM_MPTT {
+class Item_Model_Core extends ORM_MPTT {
   protected $children = "items";
   protected $sorting = array();
   protected $data_file = null;
-- 
cgit v1.2.3


From a98841613a62a27d0a6c157d6f62546e319a08b9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 12 Sep 2010 14:30:25 -0700
Subject: LOWER() the slug and name in the find_dupes functions since DISTINCT
 is case sensitive, but our dupe validation is not.  Fixes ticket #1367.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 0886aad0..985346ba 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -596,7 +596,7 @@ class gallery_task_Core {
   static function find_dupe_slugs() {
     return db::build()
       ->select_distinct(
-        array("parent_slug" => new Database_Expression("CONCAT(`parent_id`, ':', `slug`)")))
+        array("parent_slug" => new Database_Expression("CONCAT(`parent_id`, ':', LOWER(`slug`))")))
       ->select("id")
       ->select(array("C" => "COUNT(\"*\")"))
       ->from("items")
@@ -608,7 +608,7 @@ class gallery_task_Core {
   static function find_dupe_names() {
     return db::build()
       ->select_distinct(
-        array("parent_name" => new Database_Expression("CONCAT(`parent_id`, ':', `name`)")))
+        array("parent_name" => new Database_Expression("CONCAT(`parent_id`, ':', LOWER(`name`))")))
       ->select("id")
       ->select(array("C" => "COUNT(\"*\")"))
       ->from("items")
-- 
cgit v1.2.3


From b08bf26d2db6c78315ef3ddfc2e0191923ecfa42 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 12 Sep 2010 14:34:49 -0700
Subject: Ignore the private gallery settings if we're in the cli SAPI.  It
 breaks the upgrader.  Fixes #1361, thanks to Romain LE DISEZ.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 9430231c..ca8c92c9 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -44,7 +44,8 @@ class gallery_Core {
     if (Router::$controller != "login" &&
         Router::$controller != "combined" &&
         identity::active_user()->guest &&
-        !access::user_can(identity::guest(), "view", item::root())) {
+        !access::user_can(identity::guest(), "view", item::root()) &&
+        php_sapi_name() != "cli") {
       if (Router::$controller == "admin") {
         // At this point we're in the admin theme and it doesn't have a themed login page, so
         // we can't just swap in the login controller and have it work.  So redirect back to the
-- 
cgit v1.2.3


From 19750cb0d5499920bb7786aa4f890dec84fc5a1f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 13 Sep 2010 22:00:59 -0700
Subject: When deleting items, choose the first *viewable* peer as the album
 cover.  Normally, all items are equally viewable, but in our unit tests we
 occasionally have the scenario where peers have different viewability
 settings which is internally consistent although only possible if you set the
 fields manually.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 5b1db987..78a9f5a9 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -118,8 +118,8 @@ class gallery_event_Core {
         $batch_missing_album_cover[$parent->id] = 1;
         Session::instance()->set("batch_missing_album_cover", $batch_missing_album_cover);
       } else {
-        // Choose the first child as the new cover.
-        if ($child = $parent->children(1)->current()) {
+        // Choose the first viewable child as the new cover.
+        if ($child = $parent->viewable()->children(1)->current()) {
           item::make_album_cover($child);
         }
       }
-- 
cgit v1.2.3


From 1a0d76c43e3545771ae3e1c6ad6ba255beeae32d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 13 Sep 2010 22:23:09 -0700
Subject: When moving a single item, just copy its permissions from its parent
 album.  This is totally legal since an items permissions must be the same as
 its parent's, and it's much faster for large installs where a complete
 recalculation can be very costly.  Should fix #1360.

---
 modules/gallery/helpers/access.php           | 30 ++++++++++++++++++++++++----
 modules/gallery/helpers/gallery_event.php    |  6 +++++-
 modules/gallery/helpers/gallery_task.php     |  2 +-
 modules/gallery/tests/Access_Helper_Test.php |  4 ++++
 4 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 86ea9572..52a36298 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -263,21 +263,43 @@ class access_Core {
   }
 
   /**
-   * Recalculate the permissions for a given item and its hierarchy.  $item must be an album.
+   * Recalculate the permissions for an album's hierarchy.
    */
-  static function recalculate_permissions($item) {
+  static function recalculate_album_permissions($album) {
     foreach (self::_get_all_groups() as $group) {
       foreach (ORM::factory("permission")->find_all() as $perm) {
         if ($perm->name == "view") {
-          self::_update_access_view_cache($group, $item);
+          self::_update_access_view_cache($group, $album);
         } else {
-          self::_update_access_non_view_cache($group, $perm->name, $item);
+          self::_update_access_non_view_cache($group, $perm->name, $album);
         }
       }
     }
     model_cache::clear();
   }
 
+  /**
+   * Recalculate the permissions for a single photo.
+   */
+  static function recalculate_photo_permissions($photo) {
+    $parent = $photo->parent();
+    $parent_access_cache = ORM::factory("access_cache")->where("item_id", "=", $parent->id)->find();
+    $photo_access_cache = ORM::factory("access_cache")->where("item_id", "=", $photo->id)->find();
+    foreach (self::_get_all_groups() as $group) {
+      foreach (ORM::factory("permission")->find_all() as $perm) {
+        $field = "{$perm->name}_{$group->id}";
+        if ($perm->name == "view") {
+          $photo->$field = $parent->$field;
+        } else {
+          $photo_access_cache->$field = $parent_access_cache->$field;
+        }
+      }
+    }
+    $photo_access_cache->save();
+    $photo->save();
+    model_cache::clear();
+  }
+
   /**
    * Register a permission so that modules can use it.
    *
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 78a9f5a9..b59bb9b9 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -157,7 +157,11 @@ class gallery_event_Core {
   }
 
   static function item_moved($item, $old_parent) {
-    access::recalculate_permissions($item->parent());
+    if ($item->is_album()) {
+      access::recalculate_album_permissions($item->parent());
+    } else {
+      access::recalculate_photo_permissions($item);
+    }
 
     // If the new parent doesn't have an album cover, make this it.
     if (!$item->parent()->album_cover_item_id) {
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 985346ba..3b173928 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -571,7 +571,7 @@ class gallery_task_Core {
           // The new cache rows are there, but they're incorrectly populated so we have to fix
           // them.  If this turns out to be too slow, we'll have to refactor
           // access::recalculate_permissions to allow us to do it in slices.
-          access::recalculate_permissions(item::root());
+          access::recalculate_album_permissions(item::root());
           $state = self::FIX_STATE_DONE;
         }
         break;
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index c092e3fd..32b3020f 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -359,11 +359,13 @@ class Access_Helper_Test extends Gallery_Unit_Test_Case {
     $public_album = test::random_album();
     $public_photo = test::random_photo($public_album);
     access::allow(identity::everybody(), "view", $public_album);
+    access::allow(identity::everybody(), "edit", $public_album);
 
     item::root()->reload();  // Account for MPTT changes
 
     $private_album = test::random_album();
     access::deny(identity::everybody(), "view", $private_album);
+    access::deny(identity::everybody(), "edit", $private_album);
     $private_photo = test::random_photo($private_album);
 
     // Make sure that we now have a public photo and private photo.
@@ -385,6 +387,8 @@ class Access_Helper_Test extends Gallery_Unit_Test_Case {
 
     // Make sure that the public_photo is now private, and the private_photo is now public.
     $this->assert_false(access::group_can(identity::everybody(), "view", $public_photo));
+    $this->assert_false(access::group_can(identity::everybody(), "edit", $public_photo));
     $this->assert_true(access::group_can(identity::everybody(), "view", $private_photo));
+    $this->assert_true(access::group_can(identity::everybody(), "edit", $private_photo));
   }
 }
-- 
cgit v1.2.3


From 4b8d6beb5e59402d68b1daf5e4f7220066d1b707 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 14 Sep 2010 19:40:54 -0700
Subject: Report the graphics toolkit in the platform block.

---
 modules/gallery/views/admin_block_platform.html.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index b1b8a2f9..379ab0aa 100644
--- a/modules/gallery/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
@@ -18,4 +18,7 @@
   <li>
     <?= t("Server load: %load_average", array("load_average" => $load_average)) ?>
   </li>
+  <li>
+    <?= t("Graphics toolkit: %toolkit", array("toolkit" => module::get_var("gallery", "graphics_toolkit"))) ?>
+  </li>
 </ul>
-- 
cgit v1.2.3


From 70f15c6662bbc9827128d553de31461e165fb27d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 14 Sep 2010 19:51:43 -0700
Subject: Add ability to sort albums by name.  Fixes ticket #1377.

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

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 0ac5e8b0..89185e50 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -114,6 +114,7 @@ class album_Core {
                  "captured" => t("Date captured"),
                  "created" => t("Date uploaded"),
                  "title" => t("Title"),
+                 "name" => t("File name"),
                  "updated" => t("Date modified"),
                  "view_count" => t("Number of views"),
                  "rand_key" => t("Random"));
-- 
cgit v1.2.3


From 5e316f78c6d73fcba9b39c0f9033f1d670de83cb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 16 Sep 2010 15:17:00 -0700
Subject: Restrict viewing user profile pages to registered users only, but
 provide a "show_user_profiles_to" setting to allow admins to open it up to
 everybody (choices there are "registered_users", "admin_users" or
 "everybody").  Fixes ticket #1378.

---
 installer/install.sql                         |  5 ++--
 modules/gallery/controllers/user_profile.php  | 39 +++++++++++++++++++++++++++
 modules/gallery/helpers/gallery_installer.php | 10 ++++---
 modules/gallery/module.info                   |  2 +-
 4 files changed, 50 insertions(+), 6 deletions(-)

(limited to 'modules/gallery')

diff --git a/installer/install.sql b/installer/install.sql
index 7a40918d..05dfcb5e 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',38,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',39,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=50 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -422,6 +422,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com'
 INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
+INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
 INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:9;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:10;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:11;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:12;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index e992655b..4922416c 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class User_Profile_Controller extends Controller {
+
   public function show($id) {
     // If we get here, then we should have a user id other than guest.
     $user = identity::lookup_user($id);
@@ -25,6 +26,10 @@ class User_Profile_Controller extends Controller {
       throw new Kohana_404_Exception();
     }
 
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     $v = new Theme_View("page.html", "other", "profile");
     $v->page_title = t("%name Profile", array("name" => $user->display_name()));
     $v->content = new View("user_profile.html");
@@ -44,12 +49,20 @@ class User_Profile_Controller extends Controller {
 
   public function contact($id) {
     $user = identity::lookup_user($id);
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     print user_profile::get_contact_form($user);
   }
 
   public function send($id) {
     access::verify_csrf();
     $user = identity::lookup_user($id);
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     $form = user_profile::get_contact_form($user);
     if ($form->validate()) {
       Sendmail::factory()
@@ -66,4 +79,30 @@ class User_Profile_Controller extends Controller {
       json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
+
+  private function _can_view_profile_pages($user) {
+    if (!$user->loaded()) {
+      return false;
+    }
+
+    if ($user->id == identity::active_user()->id) {
+      // You can always view your own profile
+      return true;
+    }
+
+    switch (module::get_var("gallery", "show_user_profiles_to")) {
+    case "admin_users":
+      return identity::active_user()->admin;
+
+    case "registered_users":
+      return !identity::active_user()->guest;
+
+    case "everybody":
+      return true;
+
+    default:
+      // Fail in private mode on an invalid setting
+      return false;
+    }
+  }
 }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index c23bcca8..444d307b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -302,14 +302,13 @@ class gallery_installer {
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
-
-    // Sendmail configuration
     module::set_var("gallery", "email_from", "");
     module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
     module::set_var("gallery", "email_header_separator", serialize("\n"));
+    module::set_var("gallery", "show_user_profiles_to", "registered_users");
 
-    module::set_version("gallery", 38);
+    module::set_version("gallery", 39);
   }
 
   static function upgrade($version) {
@@ -627,6 +626,11 @@ class gallery_installer {
       }
       module::set_version("gallery", $version = 38);
     }
+
+    if ($version == 38) {
+      module::set_var("gallery", "show_user_profiles_to", "registered_users");
+      module::set_version("gallery", $version = 39);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index cc3b2723..5791f79d 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 38
+version = 39
-- 
cgit v1.2.3


From de2f9baeee0a05968ef0c3809c90e335180cffd0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 16 Sep 2010 19:34:42 -0700
Subject: Add a link to
 http://codex.gallery2.org/Gallery3:Choosing_A_Graphics_Toolkit to help users
 choose a graphics toolkit.  Fixes ticket #1372.

---
 modules/gallery/views/admin_graphics.html.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 3a48e087..ae76f1e1 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -16,6 +16,7 @@
   <h1> <?= t("Graphics settings") ?> </h1>
   <p>
     <?= t("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
+    <?= t("Can't decide which toolkit to choose?  <a href=\"%url\">We can help!</a>", array("url" => "http://codex.gallery2.org/Gallery3:Choosing_A_Graphics_Toolkit")) ?>
   </p>
 
   <div class="g-block-content">
-- 
cgit v1.2.3


From 64dfccc4eddf204a80ce533bad69ac8c0c83c1bd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 16 Sep 2010 20:04:22 -0700
Subject: Preserve the image extension on the temp file that we create for
 rotating images.  Some versions of GD won't work if we don't do this. Fixes
 ticket #1375.

---
 modules/gallery/controllers/quick.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index c34209da..3db4f5df 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,7 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      $tmpfile = tempnam(TMPPATH, "rotate");
+      $tmpfile = tempnam(TMPPATH, "rotate") . "." .
+        pathinfo($item->file_path(), PATHINFO_EXTENSION);
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees));
       $item->set_data_file($tmpfile);
       $item->save();
-- 
cgit v1.2.3


From 3e1743b21fd35b9d6d540e827292f1f4f006b531 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 16 Sep 2010 20:43:48 -0700
Subject: Add a module variable containing extra paths to search for binaries.
 Fixes ticket #1384.

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

(limited to 'modules/gallery')

diff --git a/installer/install.sql b/installer/install.sql
index 05dfcb5e..52654faf 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',39,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',40,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=50 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -423,6 +423,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
+INSERT INTO {vars} VALUES (NULL,'gallery','extra_binary_paths','/usr/local/bin:/opt/local/bin:/opt/bin');
 INSERT INTO {vars} VALUES (NULL,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:9;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:10;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:11;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:12;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 444d307b..83961d6b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -307,8 +307,9 @@ class gallery_installer {
     module::set_var("gallery", "email_line_length", 70);
     module::set_var("gallery", "email_header_separator", serialize("\n"));
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
+    module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 39);
+    module::set_version("gallery", 40);
   }
 
   static function upgrade($version) {
@@ -631,6 +632,11 @@ class gallery_installer {
       module::set_var("gallery", "show_user_profiles_to", "registered_users");
       module::set_version("gallery", $version = 39);
     }
+
+    if ($version == 39) {
+      module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
+      module::set_version("gallery", $version = 40);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index bb085ea5..2868a28d 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -314,9 +314,10 @@ class graphics_Core {
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
       $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+      $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null);
 
       putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-             ":/usr/local/bin:/opt/local/bin:/opt/bin");
+             ":" . $extra_binary_paths);
 
       // @todo: consider refactoring the two segments below into a loop since they are so
       // similar.
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 3e55eefe..50339541 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -86,9 +86,10 @@ class movie_Core {
   static function find_ffmpeg() {
     if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
       $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+      $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null);
 
       putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-             ":/usr/local/bin:/opt/local/bin:/opt/bin");
+             ":" . $extra_binary_paths);
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 5791f79d..1155ddf7 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 39
+version = 40
-- 
cgit v1.2.3