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/helpers/gallery_event.php')

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 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/helpers/gallery_event.php')

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 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/helpers/gallery_event.php')

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/helpers/gallery_event.php')

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 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/helpers/gallery_event.php')

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 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/helpers/gallery_event.php')

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/helpers/gallery_event.php')

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 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/helpers/gallery_event.php')

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/helpers/gallery_event.php')

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