From 3d2e36f5b601b5a274efd0c55bf161448409682a Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Thu, 27 Aug 2009 20:34:42 -0400
Subject: fixed CSS bug in the simple uploader  #629 and improved permissions
 UI to include breadcrumbs (consistent with the uploader dialog)

---
 modules/gallery/views/permissions_browse.html.php | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 888a27f7..f990896c 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,8 +5,9 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-        $("div.form").slideUp();
-        $("div#edit-" + id).html(data).slideDown();
+		    $("#gEditPermissionForm").html(data);
+		    $(".active").removeClass("active");
+		    $("#item-" + id).addClass("active");
       }
     });
   }
@@ -18,7 +19,7 @@
       url: action_url.replace("__CMD__", cmd).replace("__GROUP__", group_id).
            replace("__PERM__", perm_id).replace("__ITEM__", item_id),
       success: function(data) {
-        $("div#edit-" + item_id).load(form_url.replace("__ITEM__", item_id));
+        $("#gEditPermissionForm").load(form_url.replace("__ITEM__", item_id));
       }
     });
   }
@@ -31,26 +32,25 @@
     </li>
   </ul>
   <? endif ?>
-  <ul>
+  
+  <p>Edit permissions for album:</p>
+  
+  <ul class="gBreadcrumbs">
     <? foreach ($parents as $parent): ?>
-    <li>
+    <li id="item-<?= $parent->id ?>">
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= p::clean($parent->title) ?>
+        <?= p::purify($parent->title) ?>
       </a>
-      <div class="form" id="edit-<?= $parent->id ?>"></div>
-      <ul>
-        <? endforeach ?>
-        <li>
-          <a href="javascript:show(<?= $item->id ?>)">
-            <?= p::purify($item->title) ?>
-          </a>
-          <div class="form" id="edit-<?= $item->id ?>">
-            <?= $form ?>
-          </div>
-        </li>
-        <? foreach ($parents as $parent): ?>
-      </ul>
     </li>
+    <? endforeach ?>
+    <li class="active" id="item-<?= $item->id ?>">
+      <a href="javascript:show(<?= $item->id ?>)">
+    	<?= p::purify($item->title) ?></li>
+	  </a>
+	</li>
   </ul>
-  <? endforeach ?>
-</div>
+  
+  <div id="gEditPermissionForm">
+    <?= $form ?>
+  </div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From 9c79afcff53807f649cbcfaa0fc06e78799e43ec Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 10:24:16 -0700
Subject: Add logging to sendmail library when exception encountered

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

(limited to 'modules')

diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index 90998457..d6229e07 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -52,6 +52,7 @@ class Sendmail_Core {
       break;
     case  "header":
       if (count($value) != 2) {
+        Kohana::log("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
         throw new Exception("@todo INVALID_HEADER_PARAMETERS");
       }
       $this->headers[$value[0]] = $value[1];
@@ -70,6 +71,7 @@ class Sendmail_Core {
 
   public function send() {
     if (empty($this->to)) {
+      Kohana::log("error", wordwrap("Sending mail failed:\nNo to address specified"));
       throw new Exception("@todo TO_IS_REQUIRED_FOR_MAIL");
     }
     $to = implode(", ", $this->to);
-- 
cgit v1.2.3


From 430b57578b048366f054743e47de1b66cebb574e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 10:27:02 -0700
Subject: Wrap all the notification helpers call with a try catch that swallows
 the exceptions, so the exceptions don't interrupt the upstream processes

---
 .../notification/helpers/notification_event.php    | 75 ++++++++++++++--------
 1 file changed, 47 insertions(+), 28 deletions(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index d1b76e93..fd667ae8 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -18,60 +18,79 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class notification_event_Core {
+  // The assumption is that the exception was logged at a lower level, but we
+  // don't want to screw up the processing that was generating the notification
+  // so we don't pass the exception up the call stack
   static function item_updated($original, $new) {
-    notification::send_item_updated($new);
+    try {
+      notification::send_item_updated($new);
+    } catch (Exception $e) {}
   }
 
   static function item_created($item) {
-    notification::send_item_add($item);
+    try {
+      notification::send_item_add($item);
+    } catch (Exception $e) {}
   }
 
   static function item_deleted($item) {
-    notification::send_item_deleted($item);
+    try {
+      notification::send_item_deleted($item);
 
-    if (notification::is_watching($item)) {
-      notification::remove_watch($item);
-    }
+      if (notification::is_watching($item)) {
+        notification::remove_watch($item);
+      }
+    } catch (Exception $e) {}
   }
 
   static function comment_created($comment) {
-    if ($comment->state == "published") {
-      notification::send_comment_published($comment);
-    }
+    try {
+      if ($comment->state == "published") {
+        notification::send_comment_published($comment);
+      }
+    } catch (Exception $e) {}
   }
 
   static function comment_updated($original, $new) {
-    if ($new->state == "published" && $original->state != "published") {
-      notification::send_comment_published($new);
-    }
+    try {
+      if ($new->state == "published" && $original->state != "published") {
+        notification::send_comment_published($new);
+      }
+    } catch (Exception $e) {}
   }
 
   static function user_before_delete($user) {
-    ORM::factory("subscription")
-      ->where("user_id", $user->id)
-      ->delete_all();
+    try {
+      ORM::factory("subscription")
+        ->where("user_id", $user->id)
+        ->delete_all();
+    } catch (Exception $e) {}
   }
 
   static function batch_complete() {
-    notification::send_pending_notifications();
+    try {
+      notification::send_pending_notifications();
+    } catch (Exception $e) {}
   }
 
   static function site_menu($menu, $theme) {
-    if (!user::active()->guest) {
-      $item = $theme->item();
+    try {
+      if (!user::active()->guest) {
+        $item = $theme->item();
 
-      if ($item && $item->is_album() && access::can("view", $item)) {
-        $watching = notification::is_watching($item);
+        if ($item && $item->is_album() && access::can("view", $item)) {
+          $watching = notification::is_watching($item);
 
-        $label = $watching ? t("Remove notifications") : t("Enable notifications");
+          $label = $watching ? t("Remove notifications") : t("Enable notifications");
 
-        $menu->get("options_menu")
-          ->append(Menu::factory("link")
-            ->id("watch")
-            ->label($label)
-            ->css_id("gNotifyLink")
-            ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
+          $menu->get("options_menu")
+            ->append(Menu::factory("link")
+                     ->id("watch")
+                     ->label($label)
+                     ->css_id("gNotifyLink")
+                     ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
+        }
       }
-    }
+    } catch (Exception $e) {}
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 5133f93290e3ab0052909c27dcec05983c819ebe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 28 Aug 2009 11:51:41 -0700
Subject: Don't record mail failures when we throw the exception, record them
 when we catch the exception instead.

---
 modules/gallery/libraries/Sendmail.php             |  2 -
 .../notification/helpers/notification_event.php    | 54 +++++++++++++---------
 2 files changed, 33 insertions(+), 23 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index d6229e07..7bc21a67 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -86,8 +86,6 @@ class Sendmail_Core {
     $headers = implode($this->header_separator, $headers);
     $message = wordwrap($this->message, $this->line_length, "\n");
     if (!$this->mail($to, $this->subject, $message, $headers)) {
-      Kohana::log("error", wordwrap("Sending mail failed:\nTo: $to\n $this->subject\n" .
-                                    "Headers: $headers\n $this->message"));
       throw new Exception("@todo SEND_MAIL_FAILED");
     }
     return $this;
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index fd667ae8..8fbeda92 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -24,13 +24,17 @@ class notification_event_Core {
   static function item_updated($original, $new) {
     try {
       notification::send_item_updated($new);
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::item_updated() failed");
+    }
   }
 
   static function item_created($item) {
     try {
       notification::send_item_add($item);
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::item_created() failed");
+    }
   }
 
   static function item_deleted($item) {
@@ -40,7 +44,9 @@ class notification_event_Core {
       if (notification::is_watching($item)) {
         notification::remove_watch($item);
       }
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::item_deleted() failed");
+    }
   }
 
   static function comment_created($comment) {
@@ -48,7 +54,9 @@ class notification_event_Core {
       if ($comment->state == "published") {
         notification::send_comment_published($comment);
       }
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::comment_created() failed");
+    }
   }
 
   static function comment_updated($original, $new) {
@@ -56,7 +64,9 @@ class notification_event_Core {
       if ($new->state == "published" && $original->state != "published") {
         notification::send_comment_published($new);
       }
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::comment_updated() failed");
+    }
   }
 
   static function user_before_delete($user) {
@@ -64,33 +74,35 @@ class notification_event_Core {
       ORM::factory("subscription")
         ->where("user_id", $user->id)
         ->delete_all();
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::user_before_delete() failed");
+    }
   }
 
   static function batch_complete() {
     try {
       notification::send_pending_notifications();
-    } catch (Exception $e) {}
+    } catch (Exception $e) {
+      Kohana::log("error", "@todo notification_event::batch_complete() failed");
+    }
   }
 
   static function site_menu($menu, $theme) {
-    try {
-      if (!user::active()->guest) {
-        $item = $theme->item();
+    if (!user::active()->guest) {
+      $item = $theme->item();
 
-        if ($item && $item->is_album() && access::can("view", $item)) {
-          $watching = notification::is_watching($item);
+      if ($item && $item->is_album() && access::can("view", $item)) {
+        $watching = notification::is_watching($item);
 
-          $label = $watching ? t("Remove notifications") : t("Enable notifications");
+        $label = $watching ? t("Remove notifications") : t("Enable notifications");
 
-          $menu->get("options_menu")
-            ->append(Menu::factory("link")
-                     ->id("watch")
-                     ->label($label)
-                     ->css_id("gNotifyLink")
-                     ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
-        }
+        $menu->get("options_menu")
+          ->append(Menu::factory("link")
+                   ->id("watch")
+                   ->label($label)
+                   ->css_id("gNotifyLink")
+                   ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
       }
-    } catch (Exception $e) {}
+    }
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3