From c7aafef85279114a8ae8855647394bb26400b3de Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 7 Jun 2009 17:48:42 -0700
Subject: Improve error handling support for corrupt images and report them
 appropriately in g2_import.

---
 modules/g2_import/helpers/g2_import.php | 38 ++++++++++++++++++++++-----------
 modules/gallery/helpers/graphics.php    |  7 +++---
 modules/gallery/helpers/photo.php       |  4 ++++
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 51dc8705..a6c21489 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -407,13 +407,19 @@ class g2_import_Core {
         Kohana::log("alert", "$g2_path unsupported image type; using a placeholder gif");
         $corrupt = 1;
       }
-      $item = photo::create(
-        $parent,
-        $g2_path,
-        $g2_item->getPathComponent(),
-        $g2_item->getTitle(),
-        self::extract_description($g2_item),
-        self::map($g2_item->getOwnerId()));
+      try {
+        $item = photo::create(
+          $parent,
+          $g2_path,
+          $g2_item->getPathComponent(),
+          $g2_item->getTitle(),
+          self::extract_description($g2_item),
+          self::map($g2_item->getOwnerId()));
+      } catch (Exception $e) {
+        Kohana::log("alert", "Corrupt image $g2_path\n" .
+                    $e->getMessage() . "\n" . $e->getTraceAsString());
+        $corrupt = 1;
+      }
       break;
 
     case "GalleryMovieItem":
@@ -449,12 +455,18 @@ class g2_import_Core {
       // Why oh why did I ever approve the session id placeholder idea in G2?
       $g2_item_url =
         str_replace('&amp;g2_GALLERYSID=TMP_SESSION_ID_DI_NOISSES_PMT', '', $g2_item_url);
-      $warning =
-        t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " .
-          "(imported as <a href=\"%g3_url\">%title</a>)",
-          array("g2_url" => $g2_item_url,
-                "g3_url" => $item->url(),
-                "title" => $g2_item->getTitle()));
+      if (!empty($item)) {
+        $warning =
+          t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " .
+            "(imported as <a href=\"%g3_url\">%title</a>)",
+            array("g2_url" => $g2_item_url,
+                  "g3_url" => $item->url(),
+                  "title" => $g2_item->getTitle()));
+      } else {
+        $warning =
+          t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed",
+            array("g2_url" => $g2_item_url, "title" => $g2_item->getTitle()));
+      }
       message::warning($warning);
       log::warning("g2_import", $warning);
       Kohana::log("alert", $warning);
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 4846fa8a..25eb0891 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -166,12 +166,11 @@ class graphics_Core {
         $item->resize_dirty = 0;
       }
       $item->save();
-    } catch (Kohana_Exception $e) {
+    } catch (Exception $e) {
       // Something went wrong rebuilding the image.  Leave it dirty and move on.
       // @todo we should handle this better.
       Kohana::log("error", "Caught exception rebuilding image: {$item->title}\n" .
-                  $e->getMessage() . "\n" .
-                  $e->getTraceAsString());
+                  $e->getMessage() . "\n" . $e->getTraceAsString());
       return false;
     }
 
@@ -192,7 +191,7 @@ class graphics_Core {
     }
 
     if (filesize($input_file) == 0) {
-      throw new Exception("@todo MALFORMED_INPUT_FILE");
+      throw new Exception("@todo EMPTY_INPUT_FILE");
     }
 
     $dims = getimagesize($input_file);
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index c1c005f5..a4bc853b 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -53,6 +53,10 @@ class photo_Core {
       throw new Exception("@todo NAME_CANNOT_END_IN_PERIOD");
     }
 
+    if (filesize($filename) == 0) {
+      throw new Exception("@todo EMPTY_INPUT_FILE");
+    }
+
     $image_info = getimagesize($filename);
 
     // Force an extension onto the name
-- 
cgit v1.2.3


From f0ca27ab924c06cc72a44d66498b86aeda672b33 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 8 Jun 2009 21:31:50 -0700
Subject: Fix the admin/themes url.

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

diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index 488fa908..a453b006 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -10,7 +10,7 @@
   </li>
   <li>
     <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_details_url\">customize the way it looks</a>.",
-        array("theme_url" => url::site("admin/theme"),
+        array("theme_url" => url::site("admin/themes"),
               "theme_details_url" => url::site("admin/theme_details"))) ?>
   </li>
   <li>
-- 
cgit v1.2.3


From a3344814d7bc22bd6a7e55b9a9174fd202ef79f2 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 8 Jun 2009 23:19:09 -0600
Subject: Keep status messages. Users click away and may miss them, especially
 with tasks which take longer to complete.

---
 lib/gallery.common.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index bb2e75a2..14c28a56 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -7,7 +7,6 @@
     return this.each(function(i){
       $(this).effect("highlight", {"color": "white"}, 3000);
       $(this).animate({opacity: 1.0}, 6000);
-      $(this).fadeOut("slow");
     });
   };
 })(jQuery);
-- 
cgit v1.2.3


From 47810c9aec1e6b190a1a90505899669a2c89b770 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 8 Jun 2009 23:02:16 -0700
Subject: Try again to properly detect the base url, taking into account the
 sites that mangle SCRIPT_NAME

---
 application/config/config.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/application/config/config.php b/application/config/config.php
index d274a31b..2d66d1c0 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -22,9 +22,25 @@
  * Base path of the web site. If this includes a domain, eg: localhost/kohana/
  * then a full URL will be used, eg: http://localhost/kohana/. If it only includes
  * the path, and a site_protocol is specified, the domain will be auto-detected.
+ *
+ * Here we do our best to autodetect the base path to Gallery.  If your url is something like:
+ *   http://example.com/gallery3/index.php/album73/photo5.jpg?param=value
+ *
+ * We want the site_domain to be:
+ *   /gallery3
+ *
+ * In the above example, $_SERVER["SCRIPT_NAME"] contains "/gallery3/index.php" so
+ * dirname($_SERVER["SCRIPT_NAME"]) is what we need.  Except some low end hosts (namely 1and1.com)
+ * break SCRIPT_NAME and it contains the extra path info, so in the above example it'd be:
+ *   /gallery3/index.php/album73/photo5.jpg
+ *
+ * So dirname doesn't work.  So we do a tricky workaround where we look up the SCRIPT_FILENAME (in
+ * this case it'd be "index.php" and we delete from that part onwards.  If you work at 1and1 and
+ * you're reading this, please fix this bug!
  */
-$config["site_domain"] = dirname(
-  empty($_SERVER["ORIG_SCRIPT_NAME"]) ? $_SERVER["SCRIPT_NAME"] : $_SERVER["ORIG_SCRIPT_NAME"]);
+$config["site_domain"] =
+  substr($_SERVER["SCRIPT_NAME"], 0,
+         strpos($_SERVER["SCRIPT_NAME"], basename($_SERVER["SCRIPT_FILENAME"])));
 
 /**
  * Force a default protocol to be used by the site. If no site_protocol is
-- 
cgit v1.2.3


From e6768a4e9771f5f751d74001ce3a0d33f6775216 Mon Sep 17 00:00:00 2001
From: unostar <unostar@danalan.info>
Date: Mon, 8 Jun 2009 17:51:56 +0800
Subject: Add string to localizer

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/gallery/views/simple_uploader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 79919d50..f10d764c 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -93,7 +93,7 @@
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
-    button_text: '<span class="swfUploadFont">Select photos...</span>',
+    button_text: '<span class="swfUploadFont"><?= t("Select photos...") ?></span>',
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
     button_text_top_padding: 10,
-- 
cgit v1.2.3


From f7a720d2e827925f6fbae4981e2a17fd79eb31f6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 8 Jun 2009 23:17:28 -0700
Subject: Rename main_element_attributes() callback to body_attributes() to be
 more intuitive for themers.

---
 modules/gallery/libraries/MY_View.php     | 2 +-
 themes/admin_default/views/admin.html.php | 2 +-
 themes/default/views/page.html.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index bd2794a0..96dcc71b 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -44,7 +44,7 @@ class View extends View_Core {
     }
   }
 
-  public function main_element_attributes() {
+  public function body_attributes() {
     if (locale::is_rtl()) {
       return 'class="rtl"';
     }
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 721c4dd5..b7cfaa40 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -31,7 +31,7 @@
     <?= $theme->admin_head() ?>
   </head>
 
-  <body <?= $theme->main_element_attributes() ?>>
+  <body <?= $theme->body_attributes() ?>>
     <?= $theme->admin_page_top() ?>
     <? if ($sidebar): ?>
     <div id="doc3" class="yui-t5 gView">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 6c77fb72..0c84129f 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -54,7 +54,7 @@
     <?= $theme->head() ?>
   </head>
 
-    <body <?= $theme->main_element_attributes() ?>>
+    <body <?= $theme->body_attributes() ?>>
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
-- 
cgit v1.2.3


From d2b8ca241d6b2a1c1a512c731721b738e719d613 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 9 Jun 2009 00:25:49 -0600
Subject: Show status message when album cover is set (#257)

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

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 6efcb9de..d6f5213f 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -87,9 +87,12 @@ class Quick_Controller extends Controller {
     access::required("view", $item->parent());
     access::required("edit", $item->parent());
 
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => $item->title));
+
     item::make_album_cover($item);
+    message::success($msg);
 
-    print json_encode(array("result" => "success"));
+    print json_encode(array("result" => "success", "reload" => 1));
   }
 
   public function delete($id) {
-- 
cgit v1.2.3


From f0ea6d532cbbfd5a95e5b992bc62bb7ecb2c1c3b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 21:35:35 +0800
Subject: Create a new method in MY_url.php "get_item_from_uri" which loads the
 item based on the uri.  Then use this helper method in logout.php to insure
 that the guest user has access to the "continue" uri.  If they don't redirect
 to the root album and let it deal with access issues.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/MY_url.php  | 21 ++++++++++++++-------
 modules/user/controllers/logout.php |  7 ++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index c8645c4d..e9a5f860 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -46,7 +46,19 @@ class url extends url_Core {
       return;
     }
 
-    $current_uri = html_entity_decode(Router::$current_uri, ENT_QUOTES);
+    $item = self:: get_item_from_uri(Router::$current_uri);
+    if ($item && $item->loaded) {
+      Router::$controller = "{$item->type}s";
+      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
+      Router::$method = $item->id;
+    }
+  }
+
+  /**
+   * Return the item that the uri is referencing
+   */
+  static function get_item_from_uri($uri) {
+    $current_uri = html_entity_decode($uri);
     $item = ORM::factory("item")->where("relative_path_cache", $current_uri)->find();
     if (!$item->loaded) {
       // It's possible that the relative path cache for the item we're looking for is out of date,
@@ -61,12 +73,7 @@ class url extends url_Core {
         }
       }
     }
-
-    if ($item && $item->loaded) {
-      Router::$controller = "{$item->type}s";
-      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-      Router::$method = $item->id;
-    }
+    return $item;
   }
 
   /**
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 6ceb7192..a541ed9b 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -26,7 +26,12 @@ class Logout_Controller extends Controller {
     log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", $user->name));
     if ($this->input->get("continue")) {
-      url::redirect($this->input->get("continue"));
+      $item = url::get_item_from_uri($this->input->get("continue"));
+      if (access::can("view", $item)) {
+        url::redirect($this->input->get("continue"));
+      } else {
+        url::redirect("");
+      }
     }
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 8189c1fc6b655907990c7f005936a4758ab7e315 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 21:44:08 +0800
Subject: Removed extra whitespace

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/MY_url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index e9a5f860..7bee70ca 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -46,7 +46,7 @@ class url extends url_Core {
       return;
     }
 
-    $item = self:: get_item_from_uri(Router::$current_uri);
+    $item = self::get_item_from_uri(Router::$current_uri);
     if ($item && $item->loaded) {
       Router::$controller = "{$item->type}s";
       Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-- 
cgit v1.2.3


From 3c3a65b5a76c2cb53fe143f2b89d767b36dcafa2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 22:18:41 +0800
Subject: Rather than just displaying the "unformatted" login screen when the
 root album is not viewable by a guest, display the root album as if it was
 empty. When the page finishes loading force the login dialog to be displayed.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php | 12 ++++++++++--
 themes/default/views/page.html.php     |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index efde4f09..0fd89f05 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -23,16 +23,24 @@ class Albums_Controller extends Items_Controller {
    *  @see REST_Controller::_show($resource)
    */
   public function _show($album) {
+    $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        print new Theme_View("login_page.html", "album");
+        $template = new Theme_View("page.html", "album");
+        $template->set_global("page_size", $page_size);
+        $template->set_global("item", $album);
+        $template->set_global("children", array());
+        $template->set_global("children_count", 0);
+        $template->set_global("parents", $album->parents());
+        $template->unauthorized = true;
+        $template->content = new View("album.html");
+        print $template;
         return;
       } else {
         access::forbidden();
       }
     }
 
-    $page_size = module::get_var("gallery", "page_size", 9);
     $show = $this->input->get("show");
 
     if ($show) {
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 6c77fb72..a17b643d 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -52,6 +52,13 @@
     <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
+    <? if (!empty($unauthorized)): ?>
+    <script type="text/javascript">
+       $(document).ready(function() {
+         $("#gLoginLink").click();
+       });
+    </script>
+    <? endif ?>
   </head>
 
     <body <?= $theme->main_element_attributes() ?>>
-- 
cgit v1.2.3


From 90244e17053ed005643537acca6c475d133cb591 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 13:25:11 -0700
Subject: fix typo: "the the" -> "the"

---
 modules/gallery/js/l10n_client.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index efd956e2..89c4a57d 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -35,20 +35,20 @@ jQuery.extend(Gallery, {
           if(userSelection.length > 0) {
             Gallery.l10nClient.filter(userSelection);
             Gallery.l10nClient.toggle(1);
-            $('#l10n-client #gL10nSearch').focus();      
+            $('#l10n-client #gL10nSearch').focus();
           } else {
             if($('#l10n-client').is('.hidden')) {
               Gallery.l10nClient.toggle(1);
               if(!$.browser.safari) {
                 $('#l10n-client #gL10nSearch').focus();
               }
-            } else { 
+            } else {
               Gallery.l10nClient.toggle(0);
             }
           }
         break;
         case 'clear':
-          this.filter(false);      
+          this.filter(false);
         break;
       }
     }
@@ -61,7 +61,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client .labels .toggle').text('X');
         /*
          * This CSS clashes with Gallery's CSS, probably due to
-         * YUI's grid / floats. 
+         * YUI's grid / floats.
           if(!$.browser.msie) {
               $('body').css('border-bottom', '22em solid #fff');
           }
@@ -79,7 +79,7 @@ jQuery.extend(Gallery, {
           }
         */
           $.cookie('Gallery_l10n_client', '0', {expires: 7, path: '/'});
-        break;        
+        break;
       }
     }
     // Get a string from the DOM tree
@@ -124,7 +124,7 @@ jQuery.extend(Gallery, {
         $('#l10n-edit-translation').removeClass('hidden');
       }
     }
-    // Filter the the string list by a search string
+    // Filter the string list by a search string
     this.filter = function(search) {
       if(search == false || search == '') {
         $('#l10n-client #l10n-search-filter-clear').focus();
@@ -153,7 +153,7 @@ Gallery.behaviors.l10nClient = function(context) {
       Gallery.l10nClient.toggle(0);
     break;
   }
-  
+
   // If the selection changes, copy string values to the source and target fields.
   // Add class to indicate selected string in list widget.
   $('#l10n-client-string-select li').click(function() {
@@ -173,7 +173,7 @@ Gallery.behaviors.l10nClient = function(context) {
   $('#l10n-client .labels .toggle').click(function() {
     if($('#l10n-client').is('.hidden')) {
       Gallery.l10nClient.toggle(1);
-    } else { 
+    } else {
       Gallery.l10nClient.toggle(0);
     }
   });
@@ -184,7 +184,7 @@ Gallery.behaviors.l10nClient = function(context) {
     $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')});
     $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #gL10nSearch', type:'keyup'}, function(){Gallery.l10nClient.key('clear')});
   }
-  
+
   // Custom listener for l10n_client livesearch
   $('#l10n-client #gL10nSearch').keyup(function(key) {
     Gallery.l10nClient.filter($('#l10n-client #gL10nSearch').val());
@@ -222,7 +222,7 @@ Gallery.behaviors.l10nClient = function(context) {
               // Clear the translation form fields
               Gallery.l10nClient.showSourceMessage('', false);
               $('#gL10nClientSaveForm #l10n-edit-translation').val('');
-        
+
               for (var i = 0; i < num_plural_forms; i++) {
                   var form = plural_forms[i];
                   $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).val('');
-- 
cgit v1.2.3


From b11ec14f2442cd92c4001e14afaadff80bff4ffb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 07:18:47 +0800
Subject: Changed how directories are processed when the parent directory is
 selected and the branch was never opened on the client.  This should fix some
 of the issues with the server_add as I was able to select the staging
 directory and then add over 400 images in a multi-tier structure.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/server_add/controllers/server_add.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 2c6eb5e0..c92b4f7e 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -87,17 +87,20 @@ class Server_Add_Controller extends Controller {
     foreach (array_keys($paths) as $valid_path) {
       $path_length = strlen($valid_path);
       foreach ($input_files as $key => $path) {
-        if (!empty($path) && $valid_path != $path && strpos($path, $valid_path) === 0) {
-          $relative_path = substr(dirname($path), $path_length);
-          $name = basename($path);
-          $files[$valid_path][] = array("path" => $relative_path,
-                                        "parent_id" => $id, "name" => basename($path),
+        if (!empty($path)) {
+          if ($valid_path != $path && strpos($path, $valid_path) === 0) {
+            $relative_path = substr(dirname($path), $path_length);
+            $name = basename($path);
+            $files[$valid_path][] = array("path" => $relative_path,
+                                          "parent_id" => $id, "name" => basename($path),
                                         "type" => is_dir($path) ? "album" : "file");
-          $total_count++;
+            $total_count++;
+          }
           if ($collapsed[$key] === "true") {
             $total_count += $this->_select_children($id, $valid_path, $path, $files[$valid_path]);
           }
           unset($input_files[$key]);
+          unset($collapsed[$key]);
         }
       }
     }
-- 
cgit v1.2.3


From a4a38ba76003f5ca8fec0f50b4a84b930c80dd20 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 08:17:27 +0800
Subject: Created not_authorized.html.php which is a prettier login screen if
 the root album is not publicly browsable.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php | 10 ++--------
 themes/default/views/page.html.php     |  7 -------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 0fd89f05..9b837442 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,14 +26,8 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $template = new Theme_View("page.html", "album");
-        $template->set_global("page_size", $page_size);
-        $template->set_global("item", $album);
-        $template->set_global("children", array());
-        $template->set_global("children_count", 0);
-        $template->set_global("parents", $album->parents());
-        $template->unauthorized = true;
-        $template->content = new View("album.html");
+        $template = new Theme_View("not_authorized.html", "album");
+        $template->content = new View("login_page.html");
         print $template;
         return;
       } else {
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index a17b643d..6c77fb72 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -52,13 +52,6 @@
     <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
-    <? if (!empty($unauthorized)): ?>
-    <script type="text/javascript">
-       $(document).ready(function() {
-         $("#gLoginLink").click();
-       });
-    </script>
-    <? endif ?>
   </head>
 
     <body <?= $theme->main_element_attributes() ?>>
-- 
cgit v1.2.3


From 98422857ebd5bd5c68b7b0060b6f6aef0b74bcbc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 08:22:35 +0800
Subject: Forgot this on the last commit

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 themes/default/views/not_authorized.html.php | 69 ++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 themes/default/views/not_authorized.html.php

diff --git a/themes/default/views/not_authorized.html.php b/themes/default/views/not_authorized.html.php
new file mode 100644
index 00000000..d009a4ac
--- /dev/null
+++ b/themes/default/views/not_authorized.html.php
@@ -0,0 +1,69 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <title>
+      <? if (empty($page_title)): ?>
+        <?= t("Gallery3 Login") ?>
+        <? if (!empty($item)): ?>
+        :: <?= p::clean($item->title) ?>
+        <? endif ?>
+      <? else: ?>
+        <?= $page_title ?>
+      <? endif ?>
+      <?= $theme->page_type ?>
+    </title>
+    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
+          media="screen,print,projection" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
+          media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
+          media="screen,print,projection" />
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
+          media="screen,print,projection" />
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
+    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
+    <?= $theme->head() ?>
+  </head>
+
+    <body <?= $theme->main_element_attributes() ?>>
+    <?= $theme->page_top() ?>
+    <div id="doc4" class="yui-t5 gView">
+      <?= $theme->site_status() ?>
+      <div id="gHeader">
+        <?= $theme->display("header.html") ?>
+      </div>
+      <div id="bd">
+        <div id="yui-main">
+          <div class="yui-b">
+            <div id="gContent" class="yui-g">
+              <?= $theme->messages() ?>
+              <?= $content ?>
+            </div>
+          </div>
+        </div>
+        <div id="gSidebar" class="yui-b">
+        </div>
+      </div>
+      <div id="gFooter">
+        <?= $theme->display("footer.html") ?>
+      </div>
+    </div>
+    <?= $theme->page_bottom() ?>
+  </body>
+</html>
-- 
cgit v1.2.3


From b276eaa68beca1266bf8fd83625ddfad73f44420 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 08:38:21 +0800
Subject: Add some window dressing to login_page.html in order to make it more
 in line with the overall look of the Gallery3 theme

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php       |  4 +-
 themes/default/views/login_page.html.php     | 48 ++++++++++++++++++-
 themes/default/views/not_authorized.html.php | 69 ----------------------------
 3 files changed, 47 insertions(+), 74 deletions(-)
 delete mode 100644 themes/default/views/not_authorized.html.php

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9b837442..f37609e6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,9 +26,7 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $template = new Theme_View("not_authorized.html", "album");
-        $template->content = new View("login_page.html");
-        print $template;
+        print new Theme_View("login_page.html");
         return;
       } else {
         access::forbidden();
diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php
index 27f8571e..c4880727 100644
--- a/themes/default/views/login_page.html.php
+++ b/themes/default/views/login_page.html.php
@@ -7,11 +7,55 @@
     <title>
       <?= t("Please Login to Gallery") ?>
     </title>
+    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
+          media="screen,print,projection" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
+          media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
+          media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
           media="screen,print,projection" />
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
+    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
+    <?= $theme->head() ?>
   </head>
 
-  <body>
-    <?= user::get_login_form("login/auth_html") ?>
+    <body <?= $theme->main_element_attributes() ?>>
+    <?= $theme->page_top() ?>
+    <div id="doc4" class="yui-t5 gView">
+      <?= $theme->site_status() ?>
+      <div id="gHeader">
+        <?= $theme->display("header.html") ?>
+      </div>
+      <div id="bd">
+        <div id="yui-main">
+          <div class="yui-b">
+            <div id="gContent" class="yui-g">
+              <?= $theme->messages() ?>
+              <?= user::get_login_form("login/auth_html") ?>
+            </div>
+          </div>
+        </div>
+        <div id="gSidebar" class="yui-b">
+        </div>
+      </div>
+      <div id="gFooter">
+        <?= $theme->display("footer.html") ?>
+      </div>
+    </div>
+    <?= $theme->page_bottom() ?>
   </body>
 </html>
diff --git a/themes/default/views/not_authorized.html.php b/themes/default/views/not_authorized.html.php
deleted file mode 100644
index d009a4ac..00000000
--- a/themes/default/views/not_authorized.html.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>
-      <? if (empty($page_title)): ?>
-        <?= t("Gallery3 Login") ?>
-        <? if (!empty($item)): ?>
-        :: <?= p::clean($item->title) ?>
-        <? endif ?>
-      <? else: ?>
-        <?= $page_title ?>
-      <? endif ?>
-      <?= $theme->page_type ?>
-    </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
-          media="screen" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
-          media="screen,print,projection" />
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <?= $theme->head() ?>
-  </head>
-
-    <body <?= $theme->main_element_attributes() ?>>
-    <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
-      <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <?= $theme->display("header.html") ?>
-      </div>
-      <div id="bd">
-        <div id="yui-main">
-          <div class="yui-b">
-            <div id="gContent" class="yui-g">
-              <?= $theme->messages() ?>
-              <?= $content ?>
-            </div>
-          </div>
-        </div>
-        <div id="gSidebar" class="yui-b">
-        </div>
-      </div>
-      <div id="gFooter">
-        <?= $theme->display("footer.html") ?>
-      </div>
-    </div>
-    <?= $theme->page_bottom() ?>
-  </body>
-</html>
-- 
cgit v1.2.3


From 79d526f1faccb2f929f00c296cb22941d74b8eb2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 18:58:40 -0700
Subject: Put in a placeholder link to click on if there's no value for a
 setting.

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

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 77aff050..34abadea 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -25,7 +25,11 @@
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . p::clean($var->name)) ?>"
           class="gDialogLink"
           title="<?= t("Edit %var (%module_name)", array("var" => p::clean($var->name), "module_name" => $var->module_name)) ?>">
+          <? if ($var->value): ?>
           <?= p::clean($var->value) ?>
+          <? else: ?>
+          <i> <?= t("empty") ?> </i>
+          <? endif ?>
       </a>
       </td>
     </tr>
-- 
cgit v1.2.3


From d0b25445119274760af40722eaa95279c2942a89 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 18:59:53 -0700
Subject: Check in /usr/local/bin for ffmpeg, and create the setting even if
 its empty (to make it easier for folks to change it in Admin > Settings >
 Advanced)

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

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 3aa40dc9..986d5f62 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -142,10 +142,12 @@ class movie_Core {
     if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
-        if ($ffmpeg_path) {
-          module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
-        }
       }
+
+      if (empty($ffmpeg) && @file_exists("/usr/local/bin/ffmpeg")) {
+        $ffmpeg_path = "/usr/local/bin/ffmpeg";
+      }
+      module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
     }
     return $ffmpeg_path;
   }
-- 
cgit v1.2.3


From 798444f40bbc0344568e9744abf7034b9a59febd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 19:45:15 -0700
Subject: Replace login_page.html.php with the form, wrapped in our default
 page type.

---
 modules/gallery/controllers/albums.php   |  4 ++-
 themes/default/views/login_page.html.php | 61 --------------------------------
 2 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 themes/default/views/login_page.html.php

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index f37609e6..34fee917 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,7 +26,9 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        print new Theme_View("login_page.html");
+        $view = new Theme_View("page.html", "page");
+        $view->content = user::get_login_form("login/auth_html");
+        print $view;
         return;
       } else {
         access::forbidden();
diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php
deleted file mode 100644
index c4880727..00000000
--- a/themes/default/views/login_page.html.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>
-      <?= t("Please Login to Gallery") ?>
-    </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
-          media="screen" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
-          media="screen,print,projection" />
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <?= $theme->head() ?>
-  </head>
-
-    <body <?= $theme->main_element_attributes() ?>>
-    <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
-      <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <?= $theme->display("header.html") ?>
-      </div>
-      <div id="bd">
-        <div id="yui-main">
-          <div class="yui-b">
-            <div id="gContent" class="yui-g">
-              <?= $theme->messages() ?>
-              <?= user::get_login_form("login/auth_html") ?>
-            </div>
-          </div>
-        </div>
-        <div id="gSidebar" class="yui-b">
-        </div>
-      </div>
-      <div id="gFooter">
-        <?= $theme->display("footer.html") ?>
-      </div>
-    </div>
-    <?= $theme->page_bottom() ?>
-  </body>
-</html>
-- 
cgit v1.2.3


From 7ccb65ea9ebf10e35c09bbebf8ffe1118d3fb0fb Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 9 Jun 2009 19:49:06 -0700
Subject: Fix for fetching l10n plural messages. Need to cast from stdclass to
 array(), as I18n expects all messages to be either string or array.

---
 modules/gallery/helpers/l10n_client.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 33f23857..20f81ecc 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -123,7 +123,12 @@ class l10n_client_Core {
       $key = $message_data->key;
       $locale = $message_data->locale;
       $revision = $message_data->rev;
-      $translation = serialize(json_decode($message_data->translation));
+      $translation = json_decode($message_data->translation);
+      if (!is_string($translation)) {
+        // Normalize stdclass to array
+        $translation = (array) $translation;
+      }
+      $translation = serialize($translation);
 
       // @todo Should we normalize the incoming_translations table into messages(id, key, message)
       // and incoming_translations(id, translation, locale, revision)? Or just allow
-- 
cgit v1.2.3


From 5e6c8894e23239f2f34f3fb99ab76f43cbabe838 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:08:48 -0700
Subject: Use a reference in available() to avoid crappy looking dereferencing.

---
 modules/gallery/helpers/module.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 2fd5be6c..0559ff04 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -78,10 +78,11 @@ class module_Core {
     foreach (glob(MODPATH . "*/module.info") as $file) {
       $module_name = basename(dirname($file));
       $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-      $modules->$module_name->installed = self::is_installed($module_name);
-      $modules->$module_name->active = self::is_active($module_name);
-      $modules->$module_name->version = self::get_version($module_name);
-      $modules->$module_name->locked = false;
+      $m =& $modules->$module_name;
+      $m->installed = self::is_installed($module_name);
+      $m->active = self::is_active($module_name);
+      $m->version = self::get_version($module_name);
+      $m->locked = false;
     }
 
     // Lock certain modules
-- 
cgit v1.2.3


From 7e4fcb97cb4a575811c1e84ced07fbaf4d7ed7ba Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 9 Jun 2009 20:10:34 -0700
Subject: Fix HTML bug in l10n message

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

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 34abadea..b4dedaef 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -6,7 +6,7 @@
   </p>
   <ul id="gMessage">
     <li class="gWarning">
-      <b><?= t("Change these values at your own risk!</b>") ?>
+      <b><?= t("Change these values at your own risk!") ?>
     </li>
   </ul>
 
-- 
cgit v1.2.3


From 00b528afac33cd4e99fd3e5e648288a9d646eb38 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:32:37 -0700
Subject: Cache the available module list in module::$available.

---
 modules/gallery/helpers/module.php | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 0559ff04..58f9b20d 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -27,6 +27,7 @@ class module_Core {
   public static $active = array();
   public static $modules = array();
   public static $var_cache = null;
+  public static $available = array();
 
   /**
    * Set the version of the corresponding Module_Model
@@ -74,23 +75,27 @@ class module_Core {
    * Return the list of available modules, including uninstalled modules.
    */
   static function available() {
-    $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-    foreach (glob(MODPATH . "*/module.info") as $file) {
-      $module_name = basename(dirname($file));
-      $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-      $m =& $modules->$module_name;
-      $m->installed = self::is_installed($module_name);
-      $m->active = self::is_active($module_name);
-      $m->version = self::get_version($module_name);
-      $m->locked = false;
-    }
+    if (empty(self::$available)) {
+      $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+      foreach (glob(MODPATH . "*/module.info") as $file) {
+        $module_name = basename(dirname($file));
+        $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+        $m =& $modules->$module_name;
+        $m->installed = self::is_installed($module_name);
+        $m->active = self::is_active($module_name);
+        $m->code_version = $m->version;
+        $m->version = self::get_version($module_name);
+        $m->locked = false;
+      }
 
-    // Lock certain modules
-    $modules->gallery->locked = true;
-    $modules->user->locked = true;
-    $modules->ksort();
+      // Lock certain modules
+      $modules->gallery->locked = true;
+      $modules->user->locked = true;
+      $modules->ksort();
+      self::$available = $modules;
+    }
 
-    return $modules;
+    return self::$available;
   }
 
   /**
-- 
cgit v1.2.3


From a20246b7382ea828157e358dd5ed62ed05db5193 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:33:06 -0700
Subject: Say hello to the new upgrader UI.

---
 modules/gallery/controllers/upgrader.php |  25 ++++++
 modules/gallery/views/upgrader.html.php  | 135 +++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 modules/gallery/controllers/upgrader.php
 create mode 100644 modules/gallery/views/upgrader.html.php

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
new file mode 100644
index 00000000..e8798de5
--- /dev/null
+++ b/modules/gallery/controllers/upgrader.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Upgrader_Controller extends Controller {
+  public function index() {
+    $view = new View("upgrader.html");
+    print $view;
+  }
+}
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
new file mode 100644
index 00000000..ecf2e265
--- /dev/null
+++ b/modules/gallery/views/upgrader.html.php
@@ -0,0 +1,135 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Gallery3 Upgrader") ?></title>
+  </head>
+  <style>
+    body {
+      background: #eee;
+      font-family: Trebuchet MS;
+      font-size: 1.1em;
+    }
+    div#outer {
+      width: 650px;
+      background: white;
+      border: 1px solid #999;
+      margin: 0 auto;
+        padding: -10px;
+    }
+    div#inner {
+      padding: 0 1em 0 1em;
+      margin: 0px;
+    }
+    div#footer {
+      border-top: 1px solid #ccc;
+      margin: 1em;
+    }
+    td.name {
+      text-align: left;
+      padding-left: 30px;
+    }
+    td {
+      text-align: center;
+      border-bottom: 1px solid #eee;
+    }
+    tr.current td {
+      color: #999;
+      font-style: italic;
+    }
+    tr.upgradeable td {
+      font-weight: bold;
+    }
+    table {
+      width: 600px;
+      margin-bottom: 10px;
+    }
+    p {
+      font-size: .9em;
+    }
+    ul {
+      font-size: .9em;
+      list-style: none;
+    }
+    li {
+      display: inline;
+    }
+    li:before {
+      content: "\00BB \0020";
+    }
+    div.button {
+      margin: 0 auto;
+      width: 120px;
+      text-align: center;
+      border: 1px solid #999;
+      background: #eee;
+    }
+    div.button:hover {
+      background: #ccc;
+    }
+  </style>
+  <body>
+    <div id="outer">
+      <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
+      <div id="inner">
+        <p>
+          <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
+        </p>
+        <table>
+          <tr>
+            <th> <?= t("Module name") ?> </th>
+            <th> <?= t("Installed version") ?> </th>
+            <th> <?= t("Available version") ?> </th>
+          </tr>
+
+          <? foreach (module::available() as $module): ?>
+          <? if ($module->active): ?>
+          <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?>" >
+            <td class="name">
+              <?= $module->name ?>
+            </td>
+            <td>
+              <?= $module->version ?>
+            </td>
+            <td>
+              <?= $module->code_version ?>
+            </td>
+          </tr>
+          <? else: ?>
+          <? @$inactive++ ?>
+          <? endif ?>
+          <? endforeach ?>
+        </table>
+
+        <div class="button">
+          <a href="<?= url::site("upgrader/upgrade") ?>">
+            <?= t("Upgrade all") ?>
+          </a>
+        </div>
+
+        <? if (@$inactive): ?>
+        <p>
+          <?= t("The following modules are inactive and don't require an upgrade.") ?>
+        </p>
+        <ul>
+          <? foreach (module::available() as $module): ?>
+          <? if (!$module->active): ?>
+          <li>
+            <?= $module->name ?>
+          </li>
+          <? endif ?>
+          <? endforeach ?>
+        </p>
+        <? endif ?>
+      </div>
+      <div id="footer">
+        <p>
+          <i>
+            <?= t("Did something go wrong? Try the <a href=\"%faq_url\">FAQ</a> or ask in the <a href=\"%forums_url\">Gallery forums</a>.</i>",
+                array("faq_url" => "http://codex.gallery2.org/Gallery3:FAQ",
+                      "forums_url" => "http://gallery.menalto.com/forum")) ?>
+          </i>
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
-- 
cgit v1.2.3


From f1c91ab9779542f1605476bc52c57d5f14294e97 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Tue, 9 Jun 2009 23:54:02 -0400
Subject: fixed that you couldn't copy and paste text from the admin dashboard

* made only the block headers draggable, so that the rest of the block could be normal
* this should fix bug #292
---
 modules/gallery/views/admin_dashboard.html.php | 8 ++++----
 themes/admin_default/css/screen.css            | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index c266d7e1..5b8cae2e 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -10,23 +10,23 @@
   };
 
   $(document).ready(function(){
-    $("#gAdminDashboard .gBlock *:first").addClass("gDraggable");
+    $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable");
     $("#gAdminDashboard").sortable({
       connectWith: ["#gAdminDashboardSidebar"],
       containment: "document",
       cursor: "move",
-      handle: $("div:first"),
+      handle: $(".ui-widget-header"),
       opacity: 0.6,
       placeholder: "gDropTarget",
       stop: update_blocks
     });
 
-    $("#gAdminDashboardSidebar .gBlock *:first").addClass("gDraggable");
+    $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable");
     $("#gAdminDashboardSidebar").sortable({
       connectWith: ["#gAdminDashboard"],
       containment: "document",
       cursor: "move",
-      handle: $("div:first"),
+      handle: $(".ui-widget-header"),
       opacity: 0.6,
       placeholder: "gDropTarget",
       stop: update_blocks
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 1ad64fa1..82f85f21 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -327,8 +327,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   border: none;
 }
 
-.ui-draggable,
-.ui-sortable {
+.ui-draggable {
   cursor: move;
 }
 
-- 
cgit v1.2.3


From 5f7dfc272e3188fbced26a72881176c98481cfb0 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 9 Jun 2009 21:05:33 -0700
Subject: Remove double quotes from module.info (theme.info) attribute values.
 (actually, we did that before: Now removing HTML element attributes since
 they were delimited by single quotes because PHP's ini parser can't deal with
 double-quotes in values.)

Background:
Requiring all l10n messages a) to be well-formed HTML and b) to use double-quotes as HTML element attributes, since the l10n server side
validation normalizes all attribute delimiters to double-quotes). See ticket #254.
---
 modules/akismet/module.info   | 2 +-
 modules/recaptcha/module.info | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/akismet/module.info b/modules/akismet/module.info
index 8655927d..d45d8a7b 100644
--- a/modules/akismet/module.info
+++ b/modules/akismet/module.info
@@ -1,3 +1,3 @@
 name = Akismet
-description = "Filter comments through the <a href='http://akismet.com'>Akismet web service</a> to detect and eliminate spam.  You'll need a <a href='http://wordpress.com/api-keys/'>WordPress.com API</a> key to use it."
+description = "Filter comments through the Akismet web service to detect and eliminate spam (http://akismet.com).  You'll need a WordPress.com API key to use it."
 version = 1
diff --git a/modules/recaptcha/module.info b/modules/recaptcha/module.info
index 85397580..f2cc50cf 100644
--- a/modules/recaptcha/module.info
+++ b/modules/recaptcha/module.info
@@ -1,3 +1,3 @@
 name = Recaptcha
-description = "<a href='http://recaptcha.net'>Recaptcha</a> displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam."
+description = "Recaptcha displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam (http://recaptcha.net)."
 version = 1
-- 
cgit v1.2.3


From accce788d97d19663a4c39666de03a417b5837b6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:26:28 -0700
Subject: Fix a bug in set_version() where we were always forcing the value to
 1.  Oops!

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

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 58f9b20d..dea8e22c 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -40,7 +40,7 @@ class module_Core {
       $module->name = $module_name;
       $module->active = $module_name == "gallery";  // only gallery is active by default
     }
-    $module->version = 1;
+    $module->version = $version;
     $module->save();
     Kohana::log("debug", "$module_name: version is now $version");
   }
-- 
cgit v1.2.3


From 2fd322deeaf6b6b3f880fe21bf78664870d630a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:26:37 -0700
Subject: ACtually implement the upgrader, and add a confirmation box when the
 upgrade is complete.

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

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index e8798de5..b8769b27 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -20,6 +20,27 @@
 class Upgrader_Controller extends Controller {
   public function index() {
     $view = new View("upgrader.html");
+    $view->available = module::available();
+    $view->done = Input::instance()->get("done");
     print $view;
   }
+
+  public function upgrade() {
+    // Upgrade gallery and user first
+    module::install("gallery");
+    module::install("user");
+
+    // Then upgrade the rest
+    foreach (module::available() as $id => $module) {
+      if ($id == "gallery") {
+        continue;
+      }
+
+      if ($module->active && $module->code_version != $module->version) {
+        module::install($id);
+      }
+    }
+
+    url::redirect("upgrader?done=1");
+  }
 }
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index ecf2e265..6b9a0110 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -36,9 +36,15 @@
       color: #999;
       font-style: italic;
     }
+    tr.current td.gallery {
+      color: #00d;
+    }
     tr.upgradeable td {
       font-weight: bold;
     }
+    tr.upgradeable td.gallery {
+      color: #00d;
+    }
     table {
       width: 600px;
       margin-bottom: 10px;
@@ -63,28 +69,60 @@
       border: 1px solid #999;
       background: #eee;
     }
+    div.button a {
+      text-decoration: none;
+    }
     div.button:hover {
       background: #ccc;
     }
+    div#confirmation {
+      position: fixed;
+      top: 400px;
+      left: 325px;
+      background: blue;
+      z-index: 1000;
+      margin: 10px;
+      text-align: center;
+    }
+    div#confirmation div {
+      margin: 2px;
+      padding: 20px;
+      border: 2px solid #999;
+      background: white;
+    }
+    .gray_on_done {
+      opacity: <?= $done ? "0.5" : "1" ?>;
+    }
   </style>
   <body>
     <div id="outer">
       <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
       <div id="inner">
-        <p>
+        <? if ($done): ?>
+        <div id="confirmation">
+          <div>
+            <h1> <?= t("That's it!") ?> </h1>
+            <p>
+              <?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
+                    array("url" => url::site("albums/1"))) ?>
+            </p>
+          </div>
+        </div>
+        <? endif ?>
+        <p class="gray_on_done">
           <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
         </p>
         <table>
-          <tr>
+          <tr class="gray_on_done">
             <th> <?= t("Module name") ?> </th>
             <th> <?= t("Installed version") ?> </th>
             <th> <?= t("Available version") ?> </th>
           </tr>
 
-          <? foreach (module::available() as $module): ?>
+          <? foreach ($available as $id => $module): ?>
           <? if ($module->active): ?>
           <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?>" >
-            <td class="name">
+            <td class="name <?= $id ?>">
               <?= $module->name ?>
             </td>
             <td>
@@ -100,18 +138,18 @@
           <? endforeach ?>
         </table>
 
-        <div class="button">
+        <div class="button gray_on_done">
           <a href="<?= url::site("upgrader/upgrade") ?>">
             <?= t("Upgrade all") ?>
           </a>
         </div>
 
         <? if (@$inactive): ?>
-        <p>
+        <p class="gray_on_done">
           <?= t("The following modules are inactive and don't require an upgrade.") ?>
         </p>
-        <ul>
-          <? foreach (module::available() as $module): ?>
+        <ul class="gray_on_done">
+          <? foreach ($available as $module): ?>
           <? if (!$module->active): ?>
           <li>
             <?= $module->name ?>
-- 
cgit v1.2.3


From d6b808b726a20570e294e6d3eeeb8ea384979ecf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:27:55 -0700
Subject: Add security checks

---
 modules/gallery/controllers/upgrader.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index b8769b27..0d5bb4f6 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -19,6 +19,11 @@
  */
 class Upgrader_Controller extends Controller {
   public function index() {
+    // Todo: give the admin a chance to log in here
+    if (!user::active()->admin) {
+      access::forbidden();
+    }
+
     $view = new View("upgrader.html");
     $view->available = module::available();
     $view->done = Input::instance()->get("done");
@@ -26,6 +31,11 @@ class Upgrader_Controller extends Controller {
   }
 
   public function upgrade() {
+    // Todo: give the admin a chance to log in here
+    if (!user::active()->admin) {
+      access::forbidden();
+    }
+
     // Upgrade gallery and user first
     module::install("gallery");
     module::install("user");
-- 
cgit v1.2.3


From d297f1fdd24c3bc509ee5fd1bb5969976dc8a160 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Wed, 10 Jun 2009 02:07:47 -0400
Subject: first stab at makeing the language admin view prettier

---
 themes/admin_default/css/screen.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 82f85f21..de4d2413 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -432,3 +432,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   cursor: pointer;
 }
 
+#gLanguageSettingsForm .checklist li {
+  width: 150px;
+  overflow: hidden;
+}
-- 
cgit v1.2.3


From fc64a55f2e6d2e3f16e0806e6672f7d8c8de42a7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 10 Jun 2009 00:13:31 -0700
Subject: Golden file update

---
 modules/gallery/tests/xss_data.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index b71262df..f47ae0dc 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -73,7 +73,7 @@ modules/gallery/views/admin_advanced_settings.html.php       25  DIRTY $var->mod
 modules/gallery/views/admin_advanced_settings.html.php       25        $var->name
 modules/gallery/views/admin_advanced_settings.html.php       27        $var->name
 modules/gallery/views/admin_advanced_settings.html.php       27  DIRTY $var->module_name
-modules/gallery/views/admin_advanced_settings.html.php       28        $var->value
+modules/gallery/views/admin_advanced_settings.html.php       29        $var->value
 modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY $entry->severity
 modules/gallery/views/admin_block_log_entries.html.php       5   DIRTY $entry->user_id
 modules/gallery/views/admin_block_log_entries.html.php       5         $entry->user->name
@@ -278,6 +278,14 @@ modules/gallery/views/simple_uploader.html.php               28        $parent->
 modules/gallery/views/simple_uploader.html.php               30        $item->title
 modules/gallery/views/simple_uploader.html.php               77  DIRTY $item->id
 modules/gallery/views/simple_uploader.html.php               81  DIRTY $csrf
+modules/gallery/views/upgrader.html.php                      94  DIRTY $done
+modules/gallery/views/upgrader.html.php                      124 DIRTY $module->version
+modules/gallery/views/upgrader.html.php                      124 DIRTY $module->code_version
+modules/gallery/views/upgrader.html.php                      125 DIRTY $id
+modules/gallery/views/upgrader.html.php                      126 DIRTY $module->name
+modules/gallery/views/upgrader.html.php                      129 DIRTY $module->version
+modules/gallery/views/upgrader.html.php                      132 DIRTY $module->code_version
+modules/gallery/views/upgrader.html.php                      155 DIRTY $module->name
 modules/image_block/views/image_block_block.html.php         3   DIRTY $item->url()
 modules/image_block/views/image_block_block.html.php         4   DIRTY $item->thumb_img(array("class" => "gThumbnail"))
 modules/info/views/info_block.html.php                       6         $item->title
@@ -492,6 +500,7 @@ themes/admin_default/views/admin.html.php                    20  DIRTY $theme->u
 themes/admin_default/views/admin.html.php                    29  DIRTY $theme->url("js/jquery.dropshadow.js")
 themes/admin_default/views/admin.html.php                    30  DIRTY $theme->url("js/ui.init.js")
 themes/admin_default/views/admin.html.php                    31  DIRTY $theme->admin_head()
+themes/admin_default/views/admin.html.php                    34  DIRTY $theme->body_attributes()
 themes/admin_default/views/admin.html.php                    35  DIRTY $theme->admin_page_top()
 themes/admin_default/views/admin.html.php                    41  DIRTY $theme->site_status()
 themes/admin_default/views/admin.html.php                    43  DIRTY $theme->admin_header_top()
@@ -563,7 +572,6 @@ themes/default/views/header.html.php                         21  DIRTY $parent->
 themes/default/views/header.html.php                         21  DIRTY $item->id
 themes/default/views/header.html.php                         22        $parent->title
 themes/default/views/header.html.php                         26        $item->title
-themes/default/views/login_page.html.php                     10  DIRTY $theme->url("css/screen.css")
 themes/default/views/movie.html.php                          4   DIRTY $theme->photo_top()
 themes/default/views/movie.html.php                          7   DIRTY $position
 themes/default/views/movie.html.php                          7   DIRTY $sibling_count
@@ -590,6 +598,7 @@ themes/default/views/page.html.php                           51  DIRTY $theme->u
 themes/default/views/page.html.php                           52  DIRTY $theme->url("js/jquery.localscroll.js")
 themes/default/views/page.html.php                           53  DIRTY $theme->url("js/ui.init.js")
 themes/default/views/page.html.php                           54  DIRTY $theme->head()
+themes/default/views/page.html.php                           57  DIRTY $theme->body_attributes()
 themes/default/views/page.html.php                           58  DIRTY $theme->page_top()
 themes/default/views/page.html.php                           60  DIRTY $theme->site_status()
 themes/default/views/page.html.php                           62  DIRTY $theme->display("header.html")
-- 
cgit v1.2.3