From 56ca3b09b637fdae25e45bc454a1574486cb3aef Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 20:48:57 -0700
Subject: Focus on the username field by default.  Don't use jQuery because
 we're operating in a very limited context.

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

(limited to 'modules')

diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index 6351b6ab..0b832a2d 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -44,6 +44,9 @@
       <?= t("This site is currently only accessible by site administrators.") ?>
     </p>
     <?= auth::get_login_form("login/auth_html") ?>
+    <script type="text/javascript">
+      document.forms[0].name.focus();
+    </script>
   </body>
 </html>
 
-- 
cgit v1.2.3


From 49eb3e32b9b8df20360ee6ceb388f00828063efa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 20:49:14 -0700
Subject: Make the continuation url go to admin/maintenance.

---
 modules/gallery/controllers/maintenance.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/gallery/controllers/maintenance.php b/modules/gallery/controllers/maintenance.php
index 27673ff0..43fdfc55 100644
--- a/modules/gallery/controllers/maintenance.php
+++ b/modules/gallery/controllers/maintenance.php
@@ -19,6 +19,7 @@
  */
 class Maintenance_Controller extends Controller {
   function index() {
+    Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
     print new View("maintenance.html");
  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From c33b24c9faf5d83e4f1bfc6d3778da6c37139b3f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 21:00:30 -0700
Subject: Make maintenance mode a variable instead of a config. Then create
 links on the Admin > Maintenance page to allow you to turn it on and off. 
 This should be efficient since we cache all vars and look them up on every
 request anyway.

This also allows us to have the Fix task enable maintenance mode while
it's running which greatly reduces the chances that somebody will come
along and hork the database while we're tinkering with MPTT pointers.

Fixes ticket #1259.
---
 application/config/config.php                     |  7 ------
 modules/gallery/controllers/admin_maintenance.php |  6 ++++++
 modules/gallery/helpers/gallery.php               |  6 +++---
 modules/gallery/helpers/gallery_installer.php     | 10 +++++++--
 modules/gallery/helpers/gallery_task.php          |  9 ++++++--
 modules/gallery/libraries/Theme_View.php          |  8 ++++---
 modules/gallery/module.info                       |  2 +-
 modules/gallery/views/admin_maintenance.html.php  | 26 ++++++++++++++++++-----
 8 files changed, 51 insertions(+), 23 deletions(-)

(limited to 'modules')

diff --git a/application/config/config.php b/application/config/config.php
index 9a8f4299..3b92ac73 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -151,10 +151,3 @@ if (TEST_MODE) {
                array(MODPATH . "gallery_unit_test",
                      MODPATH . "unit_test"));
 }
-
-/**
- * Setting the maintenance_mode to block all non administrative access.  In
- * this mode a user can attempt to logon, but will be unable to access anything.
- * The application will behave normally if an adminstrator logs on.
- */
-//$config["maintenance_mode"] = true;
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 3567b4f0..a9cc933c 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -226,4 +226,10 @@ class Admin_Maintenance_Controller extends Admin_Controller {
                           "done" => (bool) $task->done)));
     }
   }
+
+  public function maintenance_mode($value) {
+    access::verify_csrf();
+    module::set_var("gallery", "maintenance_mode", $value);
+    url::redirect("admin/maintenance");
+  }
 }
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index d4078209..33a6830c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -25,9 +25,9 @@ class gallery_Core {
    * down for maintenance" page.
    */
   static function maintenance_mode() {
-    $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
-
-    if (Router::$controller != "login" && !empty($maintenance_mode) && !identity::active_user()->admin) {
+    if (Router::$controller != "login" &&
+        module::get_var("gallery", "maintenance_mode", false) &&
+        !identity::active_user()->admin) {
       Router::$controller = "maintenance";
       Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
       Router::$method = "index";
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 39c35711..f5589618 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -295,7 +295,8 @@ class gallery_installer {
     module::set_var("gallery", "credits", (string) $powered_by_string);
     module::set_var("gallery", "simultaneous_upload_limit", 5);
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
-    module::set_version("gallery", 30);
+    module::set_var("gallery", "maintenance_mode", 0);
+    module::set_version("gallery", 31);
   }
 
   static function upgrade($version) {
@@ -554,7 +555,12 @@ class gallery_installer {
     if ($version == 29) {
       $db->query("ALTER TABLE {caches} ADD KEY (`key`);");
       module::set_version("gallery", $version = 30);
-    }                
+    }
+
+    if ($version == 30) {
+      module::set_var("gallery", "maintenance_mode", 0);
+      module::set_version("gallery", $version = 31);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index da9fba49..f5c25ddc 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -56,8 +56,8 @@ class gallery_task_Core {
     $tasks[] = Task_Definition::factory()
       ->callback("gallery_task::fix")
       ->name(t("Fix your Gallery"))
-      ->description(t("Fix up a variety of little problems that might be causing " .
-                      "your Gallery to act a little weird"))
+      ->description(t("Fix a variety of problems that might cause your Gallery to act " .
+                      "strangely.  Requires maintenance mode."))
       ->severity(log::SUCCESS);
 
     return $tasks;
@@ -343,6 +343,10 @@ class gallery_task_Core {
     $completed = $task->get("completed");
     $state = $task->get("state");
 
+    if (!module::get_var("gallery", "maintenance_mode")) {
+      module::set_var("gallery", "maintenance_mode", 1);
+    }
+
     // This is a state machine that checks each item in the database.  It verifies the following
     // attributes for an item.
     // 1. Left and right MPTT pointers are correct
@@ -543,6 +547,7 @@ class gallery_task_Core {
       $task->done = true;
       $task->state = "success";
       $task->percent_complete = 100;
+      module::set_var("gallery", "maintenance_mode", 0);
     } else {
       $task->percent_complete = round(100 * $completed / $total);
     }
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 6246c6f1..7b90c034 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -46,9 +46,11 @@ class Theme_View_Core extends Gallery_View {
       $this->set_global("thumb_proportion", $this->thumb_proportion());
     }
 
-    $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
-    if ($maintenance_mode) {
-      message::warning(t("This site is currently in maintenance mode"));
+    if (module::get_var("gallery", "maintenance_mode", false)) {
+      if (identity::active_user()->admin) {
+        message::warning(t("This site is currently in maintenance mode.  Visit the <a href=\"%maintenance_url\">maintenance page</a>", array("maintenance_url" => url::site("admin/maintenance"))));
+    } else
+        message::warning(t("This site is currently in maintenance mode."));
     }
   }
 
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index df2be978..7d28a7c1 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 30
+version = 31
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index ad0e2f55..4bfc57f0 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,13 +1,29 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-maintenance" class="g-block">
-  <h1> <?= t("Maintenance tasks") ?> </h1>
-  <p>
-    <?= t("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
-  </p>
+  <h1> <?= t("Maintenance") ?> </h1>
+  <div class="g-block-content">
+    <div id="g-maintenance-mode">
+      <?= t("When you're performing maintenance on your Gallery, you can enable <b>maintenance mode</b> which prevents any non-admin from accessing your Gallery.  Some of the tasks below will automatically put your Gallery in maintenance mode for you.") ?>
+      <ul id="g-action-status" class="g-message-block">
+        <? if (module::get_var("gallery", "maintenance_mode")): ?>
+        <li class="g-warning">
+          <?= t("Maintenance mode is <b>on</b>.  Non admins cannot access your Gallery.  <a href=\"%enable_maintenance_mode_url\">Turn off maintenance mode</a>", array("enable_maintenance_mode_url" => url::site("admin/maintenance/maintenance_mode/0?csrf=$csrf"))) ?>
+        </li>
+        <? else: ?>
+        <li class="g-info">
+          <?= t("Maintenance mode is off.  User access is permitted.  <a href=\"%enable_maintenance_mode_url\">Turn on maintenance mode</a>", array("enable_maintenance_mode_url" => url::site("admin/maintenance/maintenance_mode/1?csrf=$csrf"))) ?>
+        </li>
+        <? endif ?>
+      </ul>
+    </div>
+  </div>
 
   <div class="g-block-content">
     <div id="g-available-tasks">
-      <h2> <?= t("Available tasks") ?> </h2>
+      <h2> <?= t("Maintenance tasks") ?> </h2>
+      <p>
+        <?= t("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
+      </p>
       <table>
         <tr>
           <th>
-- 
cgit v1.2.3


From 400c248e2d2c9acf022a247b80ed298ba0deab85 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 21:10:27 -0700
Subject: default maintenance_mode from false -> 0 for consistency  with the
 value we set in the db

---
 modules/gallery/helpers/gallery.php      | 2 +-
 modules/gallery/libraries/Theme_View.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 33a6830c..82b8a790 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -26,7 +26,7 @@ class gallery_Core {
    */
   static function maintenance_mode() {
     if (Router::$controller != "login" &&
-        module::get_var("gallery", "maintenance_mode", false) &&
+        module::get_var("gallery", "maintenance_mode", 0) &&
         !identity::active_user()->admin) {
       Router::$controller = "maintenance";
       Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 7b90c034..46291005 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -46,7 +46,7 @@ class Theme_View_Core extends Gallery_View {
       $this->set_global("thumb_proportion", $this->thumb_proportion());
     }
 
-    if (module::get_var("gallery", "maintenance_mode", false)) {
+    if (module::get_var("gallery", "maintenance_mode", 0)) {
       if (identity::active_user()->admin) {
         message::warning(t("This site is currently in maintenance mode.  Visit the <a href=\"%maintenance_url\">maintenance page</a>", array("maintenance_url" => url::site("admin/maintenance"))));
     } else
-- 
cgit v1.2.3


From ca54cdd6448ec919efe3853992dc652b7c671d97 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 21:44:24 -0700
Subject: While we're cleaning up albums, also find any cases where we have an
 album_cover_item_id that points to an invalid item.

---
 modules/gallery/helpers/gallery_task.php | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index f5c25ddc..abfa9e8f 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -20,8 +20,8 @@
 class gallery_task_Core {
   const FIX_STATE_START_MPTT = 0;
   const FIX_STATE_RUN_MPTT = 1;
-  const FIX_STATE_START_PERMISSIONS = 2;
-  const FIX_STATE_RUN_PERMISSIONS = 3;
+  const FIX_STATE_START_ALBUMS = 2;
+  const FIX_STATE_RUN_ALBUMS = 3;
   const FIX_STATE_START_DUPE_SLUGS = 4;
   const FIX_STATE_RUN_DUPE_SLUGS = 5;
   const FIX_STATE_START_DUPE_NAMES = 6;
@@ -323,7 +323,7 @@ class gallery_task_Core {
     $total = $task->get("total");
     if (empty($total)) {
       // mptt: 2 operations for every item
-      // permissions: 1 operation for every album
+      // album audit (permissions and bogus album covers): 1 operation for every album
       // dupe slugs: 1 operation for each unique conflicted slug
       $total = 2 * db::build()->count_records("items");
       $total += db::build()->where("type", "=", "album")->count_records("items");
@@ -352,6 +352,7 @@ class gallery_task_Core {
     // 1. Left and right MPTT pointers are correct
     // 2. The .htaccess permission files for restricted items exist and are well formed.
     // 3. The relative_path_cache and relative_url_cache values are set to null.
+    // 4. there are no album_cover_item_ids pointing to missing items
     //
     // We'll do a depth-first tree walk over our hierarchy using only the adjacency data because
     // we don't trust MPTT here (that might be what we're here to fix!).  Avoid avoid using ORM
@@ -460,7 +461,7 @@ class gallery_task_Core {
           $task->set("stack", implode(" ", $stack));
           $state = self::FIX_STATE_RUN_DUPE_NAMES;
         } else {
-          $state = self::FIX_STATE_START_PERMISSIONS;
+          $state = self::FIX_STATE_START_ALBUMS;
         }
         break;
 
@@ -493,11 +494,11 @@ class gallery_task_Core {
         $completed++;
 
         if (empty($stack)) {
-          $state = self::FIX_STATE_START_PERMISSIONS;
+          $state = self::FIX_STATE_START_ALBUMS;
         }
         break;
 
-      case self::FIX_STATE_START_PERMISSIONS:
+      case self::FIX_STATE_START_ALBUMS:
         $stack = array();
         foreach (db::build()
                  ->select("id")
@@ -507,23 +508,26 @@ class gallery_task_Core {
           $stack[] = $row->id;
         }
         $task->set("stack", implode(" ", $stack));
-        $state = self::FIX_STATE_RUN_PERMISSIONS;
+        $state = self::FIX_STATE_RUN_ALBUMS;
         break;
 
-      case self::FIX_STATE_RUN_PERMISSIONS:
+      case self::FIX_STATE_RUN_ALBUMS:
         $stack = explode(" ", $task->get("stack"));
         $id = array_pop($stack);
 
+        $item = ORM::factory("item", $id);
+        if ($item->album_cover_item_id) {
+          $album_cover_item = ORM::factory("item", $item->album_cover_item_id);
+          if (!$album_cover_item->loaded()) {
+            $item->album_cover_item_id = null;
+            $item->save();
+          }
+        }
+
         $everybody = identity::everybody();
         $view_col = "view_{$everybody->id}";
         $view_full_col = "view_full_{$everybody->id}";
         $intent = ORM::factory("access_intent")->where("item_id", "=", $id)->find();
-
-        // Only load the item if we're going to use it below
-        if ($intent->$view_col === access::DENY ||
-            $intent->$view_full_col === access::DENY) {
-          $item = ORM::factory("item", $id);
-        }
         if ($intent->$view_col === access::DENY) {
           access::update_htaccess_files($item, $everybody, "view", access::DENY);
         }
-- 
cgit v1.2.3


From 3e8d683ce4bf6cf41b67e61ebe76c32c129105e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 22:09:02 -0700
Subject: Use the login/html page for maintenance mode; we don't need the
 maintenance controller/view anymore.  Fixes ticket #1267.

---
 modules/gallery/controllers/maintenance.php | 25 --------------
 modules/gallery/helpers/gallery.php         |  8 +++--
 modules/gallery/views/login_ajax.html.php   |  2 +-
 modules/gallery/views/maintenance.html.php  | 53 -----------------------------
 4 files changed, 6 insertions(+), 82 deletions(-)
 delete mode 100644 modules/gallery/controllers/maintenance.php
 delete mode 100644 modules/gallery/views/maintenance.html.php

(limited to 'modules')

diff --git a/modules/gallery/controllers/maintenance.php b/modules/gallery/controllers/maintenance.php
deleted file mode 100644
index 43fdfc55..00000000
--- a/modules/gallery/controllers/maintenance.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 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 Maintenance_Controller extends Controller {
-  function index() {
-    Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
-    print new View("maintenance.html");
- }
-}
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 82b8a790..54d16322 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -26,11 +26,13 @@ class gallery_Core {
    */
   static function maintenance_mode() {
     if (Router::$controller != "login" &&
+        Router::$controller != "combined" &&
         module::get_var("gallery", "maintenance_mode", 0) &&
         !identity::active_user()->admin) {
-      Router::$controller = "maintenance";
-      Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
-      Router::$method = "index";
+      Session::instance()->set("continue_url", url::abs_site("admin/maintenance"));
+      Router::$controller = "login";
+      Router::$controller_path = MODPATH . "gallery/controllers/login.php";
+      Router::$method = "html";
     }
   }
 
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index 88fe2389..a40d1950 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -43,7 +43,7 @@
     <li id="g-login-form">
       <?= $form ?>
     </li>
-    <? if (identity::is_writable()): ?>
+    <? if (identity::is_writable() && !module::get_var("gallery", "maintenance_mode")): ?>
     <li>
       <a href="#" id="g-password-reset" class="g-right g-text-small"><?= t("Forgot your password?") ?></a>
     </li>
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
deleted file mode 100644
index 0b832a2d..00000000
--- a/modules/gallery/views/maintenance.html.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<html>
-  <head>
-    <title>
-      <?= t("Gallery - maintenance mode") ?>
-    </title>
-    <style>
-      body {
-        background: #ccc;
-      }
-      form {
-        border: 1px solid #555;
-        background: #999;
-        width: 300px;
-      }
-      fieldset {
-        border: none;
-      }
-      fieldset legend {
-        font-size: 24px;
-        display: none !important;
-        padding-left: 0px;
-      }
-      ul {
-        list-style-type: none;
-        margin-top: 0px;
-        padding-left: 0px;
-        bullet-style: none;
-      }
-      ul li {
-        margin-left: 0px;
-      }
-      label {
-        width: 60px;
-        display: block;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>
-      <?= t("Gallery - maintenance mode") ?>
-    </h1>
-    <p>
-      <?= t("This site is currently only accessible by site administrators.") ?>
-    </p>
-    <?= auth::get_login_form("login/auth_html") ?>
-    <script type="text/javascript">
-      document.forms[0].name.focus();
-    </script>
-  </body>
-</html>
-
-
-- 
cgit v1.2.3


From 3492f1712dd21511347c96a463504eb5ac912681 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 1 Aug 2010 22:18:22 -0700
Subject: Fix the i18n error message for missing/incorrect password.  Fixes
 ticket #1265.

---
 modules/user/controllers/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index d13cccb2..5e6239d8 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -189,7 +189,7 @@ class Users_Controller extends Controller {
     $group->password("password")->label(t("Current password"))->id("g-password")
       ->callback("auth::validate_too_many_failed_auth_attempts")
       ->callback("user::valid_password")
-      ->error_messages("invalid", t("Incorrect password"))
+      ->error_messages("invalid_password", t("Incorrect password"))
       ->error_messages(
         "too_many_failed_auth_attempts",
         t("Too many incorrect passwords.  Try again later"));
-- 
cgit v1.2.3


From 8559cdb5b6bfa87864941f726521660023779fa7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 4 Aug 2010 21:30:48 -0700
Subject: Add docs reflecting that we may skip some items that have invalid
 parent_ids

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index abfa9e8f..bf1355b8 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -357,6 +357,10 @@ class gallery_task_Core {
     // We'll do a depth-first tree walk over our hierarchy using only the adjacency data because
     // we don't trust MPTT here (that might be what we're here to fix!).  Avoid avoid using ORM
     // calls as much as possible since they're expensive.
+    //
+    // NOTE: the MPTT check will only traverse items that have valid parents.  It's possible that
+    // we have some tree corruption where there are items with parent ids to non-existent items.
+    // We should probably do something about that.
     while ($state != self::FIX_STATE_DONE && microtime(true) - $start < 1.5) {
       switch ($state) {
       case self::FIX_STATE_START_MPTT:
-- 
cgit v1.2.3


From 0fe44fe3809041edb64b69496bcee070578483d5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 6 Aug 2010 10:40:41 -0700
Subject: Use module::install and module::activate for the gallery module as
 well; I've verified that it generates the same installer files.

---
 modules/gallery/controllers/packager.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 835cb903..f463d0de 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -59,11 +59,7 @@ class Packager_Controller extends Controller {
     // numbers, keeping our install.sql file more stable.
     srand(0);
 
-    gallery_installer::install(true);
-
-    module::load_modules();
-
-    foreach (array("user", "comment", "organize", "info", "rest",
+    foreach (array("gallery", "user", "comment", "organize", "info", "rest",
                    "rss", "search", "slideshow", "tag") as $module_name) {
       module::install($module_name);
       module::activate($module_name);
-- 
cgit v1.2.3


From 1b2da1ff70acba4177a7ebea825f802f24801a0c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 6 Aug 2010 10:41:38 -0700
Subject: Add a "weight" column to the module table.  This allows us to specify
 module ordering, which is currently being done in the moduleorder contrib
 module.

By default, the weight will be the same as the id of the row which
means that new modules will get added at the end of the list.  This is
covered in the upgrade case as well.

The one gotcha is that we need to make sure that we don't try to sort
by the weight column if the gallery module version is < 32, which is
something we haven't done before.

Fixes ticket #1272.
---
 installer/install.sql                         | 30 ++++++++++++++-------------
 modules/gallery/helpers/gallery_installer.php | 13 ++++++++++--
 modules/gallery/helpers/module.php            | 20 +++++++++++++++++-
 modules/gallery/module.info                   |  2 +-
 4 files changed, 47 insertions(+), 18 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 8836f53f..18cf607a 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -236,20 +236,22 @@ CREATE TABLE {modules} (
   `active` tinyint(1) DEFAULT '0',
   `name` varchar(64) DEFAULT NULL,
   `version` int(9) DEFAULT NULL,
+  `weight` int(9) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
+  UNIQUE KEY `name` (`name`),
+  KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',31);
-INSERT INTO {modules} VALUES (2,1,'user',3);
-INSERT INTO {modules} VALUES (3,1,'comment',3);
-INSERT INTO {modules} VALUES (4,1,'organize',1);
-INSERT INTO {modules} VALUES (5,1,'info',1);
-INSERT INTO {modules} VALUES (6,1,'rest',3);
-INSERT INTO {modules} VALUES (7,1,'rss',1);
-INSERT INTO {modules} VALUES (8,1,'search',1);
-INSERT INTO {modules} VALUES (9,1,'slideshow',2);
-INSERT INTO {modules} VALUES (10,1,'tag',2);
+INSERT INTO {modules} VALUES (1,1,'gallery',32,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',1,4);
+INSERT INTO {modules} VALUES (5,1,'info',1,5);
+INSERT INTO {modules} VALUES (6,1,'rest',3,6);
+INSERT INTO {modules} VALUES (7,1,'rss',1,7);
+INSERT INTO {modules} VALUES (8,1,'search',1,8);
+INSERT INTO {modules} VALUES (9,1,'slideshow',2,9);
+INSERT INTO {modules} VALUES (10,1,'tag',2,10);
 DROP TABLE IF EXISTS {outgoing_translations};
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -391,7 +393,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -408,14 +410,14 @@ INSERT INTO {vars} VALUES (NULL,'gallery','simultaneous_upload_limit','5');
 INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
-INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','date_time_format','Y-M-d H:i:s');
 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','choose_default_tookit','1');
+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,'gallery','blocks_site_sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'slideshow','max_scale','0');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index f5589618..8fc0cf96 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -144,8 +144,10 @@ class gallery_installer {
                  `active` BOOLEAN default 0,
                  `name` varchar(64) default NULL,
                  `version` int(9) default NULL,
+                 `weight` int(9) default NULL,
                  PRIMARY KEY (`id`),
-                 UNIQUE KEY(`name`))
+                 UNIQUE KEY(`name`),
+                 KEY (`weight`))
                DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {outgoing_translations} (
@@ -296,7 +298,7 @@ class gallery_installer {
     module::set_var("gallery", "simultaneous_upload_limit", 5);
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
     module::set_var("gallery", "maintenance_mode", 0);
-    module::set_version("gallery", 31);
+    module::set_version("gallery", 32);
   }
 
   static function upgrade($version) {
@@ -561,6 +563,13 @@ class gallery_installer {
       module::set_var("gallery", "maintenance_mode", 0);
       module::set_version("gallery", $version = 31);
     }
+
+    if ($version == 31) {
+      db::update("modules")
+        ->set("weight", "=", "id")
+        ->execute();
+      module::set_version("gallery", $version = 32);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 5134c7b3..ca6651f1 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -166,6 +166,16 @@ class module_Core {
     } else {
       module::set_version($module_name, 1);
     }
+
+    // Set the weight of the new module, which controls the order in which the modules are
+    // loaded. By default, new modules are installed at the end of the priority list.  Since the
+    // id field is monotonically increasing, the easiest way to guarantee that is to set the weight
+    // the same as the id.  We don't know that until we save it for the first time
+    $module = ORM::factory("module")->where("name", "=", $module_name)->find();
+    if ($module->loaded()) {
+      $module->weight = $module->id;
+      $module->save();
+    }
     module::load_modules();
 
     // Now the module is installed but inactive, so don't leave it in the active path
@@ -314,7 +324,15 @@ class module_Core {
     self::$modules = array();
     self::$active = array();
     $kohana_modules = array();
-    foreach (ORM::factory("module")->find_all() as $module) {
+
+    // In version 32 we introduced a weight column so we can specify the module order
+    // If we try to use that blindly, we'll break earlier versions before they can even
+    // run the upgrader.
+    $modules = module::get_version("gallery") < 32 ?
+      ORM::factory("module")->find_all():
+      ORM::factory("module")->order_by("weight")->find_all();
+
+    foreach ($modules as $module) {
       self::$modules[$module->name] = $module;
       if (!$module->active) {
         continue;
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 7d28a7c1..59db07de 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 31
+version = 32
-- 
cgit v1.2.3


From 16ae65464cb33b16d77cb214bebb699158d548a7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 10:57:18 -0700
Subject: Oops.  Fix the upgrader path to add the weight column to the modules
 table.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 8fc0cf96..7896a7a7 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -565,8 +565,10 @@ class gallery_installer {
     }
 
     if ($version == 31) {
+      $db->query("ALTER TABLE {modules} ADD COLUMN `weight` int(9) DEFAULT NULL");
+      $db->query("ALTER TABLE {modules} ADD KEY (`weight`)");
       db::update("modules")
-        ->set("weight", "=", "id")
+        ->set("weight", new Database_Expression("`id`"))
         ->execute();
       module::set_version("gallery", $version = 32);
     }
-- 
cgit v1.2.3


From 779d91cca01567a09b894e9fff4dfa32cb82d3d9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 12:18:43 -0700
Subject: Add an index for left_ptr, since we use that in ORM_MPTT::parents()
 which is on every album page.  Bump Gallery module version to 33.

---
 modules/gallery/helpers/gallery_installer.php | 10 ++++++++--
 modules/gallery/module.info                   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 7896a7a7..21c47ad5 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -114,7 +114,8 @@ class gallery_installer {
                  KEY `parent_id` (`parent_id`),
                  KEY `type` (`type`),
                  KEY `random` (`rand_key`),
-                 KEY `weight` (`weight` DESC))
+                 KEY `weight` (`weight` DESC),
+                 KEY `left_ptr` (`left_ptr`))
                DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {logs} (
@@ -298,7 +299,7 @@ class gallery_installer {
     module::set_var("gallery", "simultaneous_upload_limit", 5);
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
     module::set_var("gallery", "maintenance_mode", 0);
-    module::set_version("gallery", 32);
+    module::set_version("gallery", 33);
   }
 
   static function upgrade($version) {
@@ -572,6 +573,11 @@ class gallery_installer {
         ->execute();
       module::set_version("gallery", $version = 32);
     }
+
+    if ($version == 32) {
+      $db->query("ALTER TABLE {items} ADD KEY (`left_ptr`)");
+      module::set_version("gallery", $version = 33);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 59db07de..dbecda03 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 32
+version = 33
-- 
cgit v1.2.3


From c6ca77377f2c55316923c62e80b34802a45979c2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 18:02:39 -0700
Subject: Whitespace fix.

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

(limited to 'modules')

diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 87520032..85d344d6 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -50,7 +50,8 @@ class Uploader_Controller extends Controller {
     // Uploadify adds its own field to the form, so validate that separately.
     $file_validation = new Validation($_FILES);
     $file_validation->add_rules(
-      "Filedata", "upload::valid",  "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
+      "Filedata", "upload::valid",  "upload::required",
+      "upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
 
     if ($form->validate() && $file_validation->validate()) {
       $temp_filename = upload::save("Filedata");
-- 
cgit v1.2.3


From 1abf43d3f1efa9d0d51f4c7e8f6f946db2497a09 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 22:06:57 -0700
Subject: Add a max_level to _sanitize_for_dump() so that we don't blow the
 stack.

---
 modules/gallery/libraries/MY_Kohana_Exception.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index 72cb2ac0..27d1afc1 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -41,16 +41,21 @@ class Kohana_Exception extends Kohana_Exception_Core {
    * data, such as session ids and passwords / hashes.
    */
   public static function safe_dump($value, $key, $length=128, $max_level=5) {
-    return parent::dump(self::_sanitize_for_dump($value, $key), $length, $max_level);
+    return parent::dump(self::_sanitize_for_dump($value, $key, $max_level), $length, $max_level);
   }
 
   /**
    * Elides sensitive data which shouldn't be echoed to the client,
    * such as passwords, and other secrets.
    */
-  /* Visible for testing*/ static function _sanitize_for_dump($value, $key=null) {
+  /* Visible for testing*/ static function _sanitize_for_dump($value, $key=null, $max_level) {
     // Better elide too much than letting something through.
     // Note: unanchored match is intended.
+    if (!$max_level) {
+      // Too much recursion; give up.  We gave it our best shot.
+      return $value;
+    }
+
     $sensitive_info_pattern =
       '/(password|pass|email|hash|private_key|session_id|session|g3sid|csrf|secret)/i';
     if (preg_match($sensitive_info_pattern, $key) ||
@@ -63,7 +68,7 @@ class Kohana_Exception extends Kohana_Exception_Core {
       } else if ($value instanceof User_Model) {
         return get_class($value) . ' object for "' . $value->name . '" - details omitted for display';
       }
-      return self::_sanitize_for_dump((array) $value, $key);
+      return self::_sanitize_for_dump((array) $value, $key, $max_level - 1);
     } else if (is_array($value)) {
       $result = array();
       foreach ($value as $k => $v) {
@@ -78,7 +83,7 @@ class Kohana_Exception extends Kohana_Exception_Core {
         if (is_object($v)) {
           $key_for_display .= ' (type: ' . get_class($v) . ')';
         }
-        $result[$key_for_display] = self::_sanitize_for_dump($v, $actual_key);
+        $result[$key_for_display] = self::_sanitize_for_dump($v, $actual_key, $max_level - 1);
       }
     } else {
       $result = $value;
-- 
cgit v1.2.3


From dfb095a26267f8b68b40add03dfe407966c49b92 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 22:18:28 -0700
Subject: Add the ability to replace the source data file in
 Item_Model::save(). Refactor the rotate code in Quick_Controller to replace
 the data file, and then have gallery_event::item_updated_data_file() pick up
 after the change is saved, rebuild the image and handle album covers.  This
 is much more portable than before and it will allow any mechanism (eg: REST)
 to replace the source image.

---
 modules/gallery/controllers/quick.php     | 22 ++-------
 modules/gallery/helpers/gallery_event.php | 14 ++++++
 modules/gallery/helpers/movie.php         | 44 +++++++++++-------
 modules/gallery/helpers/photo.php         | 12 +++++
 modules/gallery/models/item.php           | 74 ++++++++++++++++++++-----------
 modules/gallery/tests/Item_Model_Test.php | 31 +++++++++++++
 6 files changed, 137 insertions(+), 60 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index fee601d9..c34209da 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,25 +36,11 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      gallery_graphics::rotate($item->file_path(), $item->file_path(),
-                               array("degrees" => $degrees));
-
-      list($item->width, $item->height) = getimagesize($item->file_path());
-      $item->resize_dirty= 1;
-      $item->thumb_dirty= 1;
+      $tmpfile = tempnam(TMPPATH, "rotate");
+      gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees));
+      $item->set_data_file($tmpfile);
       $item->save();
-
-      graphics::generate($item);
-
-      // @todo: this is an inadequate way to regenerate album cover thumbnails after rotation.
-      foreach (ORM::factory("item")
-               ->where("album_cover_item_id", "=", $item->id)
-               ->find_all() as $target) {
-        copy($item->thumb_path(), $target->thumb_path());
-        $target->thumb_width = $item->thumb_width;
-        $target->thumb_height = $item->thumb_height;
-        $target->save();
-      }
+      unlink($tmpfile);
     }
 
     if (Input::instance()->get("page_type") == "collection") {
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index e3fa5e08..e048118b 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -124,6 +124,20 @@ class gallery_event_Core {
     }
   }
 
+  static function item_updated_data_file($item) {
+    graphics::generate($item);
+
+    // Update any places where this is the album cover
+    foreach (ORM::factory("item")
+             ->where("album_cover_item_id", "=", $item->id)
+             ->find_all() as $target) {
+      copy($item->thumb_path(), $target->thumb_path());
+      $target->thumb_width = $item->thumb_width;
+      $target->thumb_height = $item->thumb_height;
+      $target->save();
+    }
+  }
+
   static function batch_complete() {
     // Set the album covers for any items that where we probably deleted the album cover during
     // this batch.  The item may have been deleted, so don't count on it being around.  Choose the
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index bbb5b66c..4ff29a7b 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -57,23 +57,6 @@ class movie_Core {
     return $form;
   }
 
-
-  static function getmoviesize($filename) {
-    $ffmpeg = self::find_ffmpeg();
-    if (empty($ffmpeg)) {
-      throw new Exception("@todo MISSING_FFMPEG");
-    }
-
-    $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($filename) . " 2>&1";
-    $result = `$cmd`;
-    if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $result, $regs)) {
-      list ($width, $height) = array($regs[1], $regs[2]);
-    } else {
-      list ($width, $height) = array(0, 0);
-    }
-    return array($width, $height);
-  }
-
   static function extract_frame($input_file, $output_file) {
     $ffmpeg = self::find_ffmpeg();
     if (empty($ffmpeg)) {
@@ -114,4 +97,31 @@ class movie_Core {
     }
     return $ffmpeg_path;
   }
+
+
+  /**
+   * Return the width, height, mime_type and extension of the given movie file.
+   */
+  static function get_file_metadata($file_path) {
+    $ffmpeg = self::find_ffmpeg();
+    if (empty($ffmpeg)) {
+      throw new Exception("@todo MISSING_FFMPEG");
+    }
+
+    $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($file_path) . " 2>&1";
+    $result = `$cmd`;
+    if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $result, $regs)) {
+      list ($width, $height) = array($regs[1], $regs[2]);
+    } else {
+      list ($width, $height) = array(0, 0);
+    }
+
+    $pi = pathinfo($file_path);
+    $extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension?  Assume FLV.
+    $mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ?
+      "video/mp4" : "video/x-flv";
+
+    return array($width, $height, $mime_type, $extension);
+  }
+
 }
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 73cd60c0..a38b4fb2 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -77,4 +77,16 @@ class photo_Core {
     }
     return sprintf($format, $new_width, $new_height);
   }
+
+  /**
+   * Return the width, height, mime_type and extension of the given image file.
+   */
+  static function get_file_metadata($file_path) {
+    $image_info = getimagesize($file_path);
+    $width = $image_info[0];
+    $height = $image_info[1];
+    $mime_type = $image_info["mime"];
+    $extension = image_type_to_extension($image_info[2], false);
+    return array($width, $height, $mime_type, $extension);
+  }
 }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c00b7972..5257bbb9 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -316,7 +316,7 @@ class Item_Model extends ORM_MPTT {
     unset($significant_changes["relative_url_cache"]);
     unset($significant_changes["relative_path_cache"]);
 
-    if (!empty($this->changed) && $significant_changes) {
+    if ((!empty($this->changed) && $significant_changes) || isset($this->data_file)) {
       $this->updated = time();
       if (!$this->loaded()) {
         // Create a new item.
@@ -341,30 +341,19 @@ class Item_Model extends ORM_MPTT {
         }
 
         // Get the width, height and mime type from our data file for photos and movies.
-        if ($this->is_movie() || $this->is_photo()) {
-          $pi = pathinfo($this->data_file);
-
+        if ($this->is_photo() || $this->is_movie()) {
           if ($this->is_photo()) {
-            $image_info = getimagesize($this->data_file);
-            $this->width = $image_info[0];
-            $this->height = $image_info[1];
-            $this->mime_type = $image_info["mime"];
-
-            // Force an extension onto the name if necessary
-            if (empty($pi["extension"])) {
-              $pi["extension"] = image_type_to_extension($image_info[2], false);
-              $this->name .= "." . $pi["extension"];
-            }
-          } else {
-            list ($this->width, $this->height) = movie::getmoviesize($this->data_file);
-
-            // No extension?  Assume FLV.
-            if (empty($pi["extension"])) {
-              $pi["extension"] = "flv";
-              $this->name .= "." . $pi["extension"];
-            }
+            list ($this->width, $this->height, $this->mime_type, $extension) =
+              photo::get_file_metadata($this->data_file);
+          } else if ($this->is_movie()) {
+            list ($this->width, $this->height, $this->mime_type, $extension) =
+              movie::get_file_metadata($this->data_file);
+          }
 
-            $this->mime_type = in_array(strtolower($pi["extension"]), array("mp4", "m4v")) ? "video/mp4" : "video/x-flv";
+          // Force an extension onto the name if necessary
+          $pi = pathinfo($this->data_file);
+          if (empty($pi["extension"])) {
+            $this->name = "{$this->name}.$extension";
           }
         }
 
@@ -479,7 +468,30 @@ class Item_Model extends ORM_MPTT {
             ->execute();
         }
 
+        // Replace the data file, if requested.
+        // @todo: we don't handle the case where you swap in a file of a different mime type
+        //        should we prevent that in validation?  or in set_data_file()
+        if ($this->data_file && ($this->is_photo() || $this->is_movie())) {
+          copy($this->data_file, $this->file_path());
+
+          // Get the width, height and mime type from our data file for photos and movies.
+          if ($this->is_photo()) {
+            list ($this->width, $this->height) = photo::get_file_metadata($this->file_path());
+          } else if ($this->is_movie()) {
+            list ($this->width, $this->height) = movie::get_file_metadata($this->file_path());
+          }
+          $this->thumb_dirty = 1;
+          $this->resize_dirty = 1;
+        }
+
         module::event("item_updated", $original, $this);
+
+        if ($this->data_file) {
+          // Null out the data file variable here, otherwise this event will trigger another
+          // save() which will think that we're doing another file move.
+          $this->data_file = null;
+          module::event("item_updated_data_file", $this);
+        }
       }
     } else if (!empty($this->changed)) {
       // Insignificant changes only.  Don't fire events or do any special checking to try to keep
@@ -765,8 +777,9 @@ class Item_Model extends ORM_MPTT {
         $this->rules["slug"] = array();
       }
 
-      // Movies and photos must have data files
-      if (($this->is_photo() || $this->is_movie()) && !$this->loaded()) {
+      // Movies and photos must have data files.  Verify the data file on new items, or if it has
+      // been replaced.
+      if (($this->is_photo() || $this->is_movie()) && $this->data_file) {
         $this->rules["name"]["callbacks"][] = array($this, "valid_data_file");
       }
     }
@@ -842,6 +855,17 @@ class Item_Model extends ORM_MPTT {
     } else if (filesize($this->data_file) == 0) {
       $v->add_error("name", "empty_data_file");
     }
+
+    if ($this->loaded()) {
+      if ($this->is_photo()) {
+        list ($a, $b, $mime_type) = photo::get_file_metadata($this->data_file);
+      } else if ($this->is_movie()) {
+        list ($a, $b, $mime_type) = movie::get_file_metadata($this->data_file);
+      }
+      if ($mime_type != $this->mime_type) {
+        $v->add_error("name", "cant_change_mime_type");
+      }
+    }
   }
 
   /**
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 907cfe24..bd123098 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -384,4 +384,35 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
 
     $this->assert_same($photo->id, $album->album_cover_item_id);
   }
+
+  public function replace_data_file_test() {
+    // Random photo is modules/gallery/tests/test.jpg which is 1024x768 and 6232 bytes.
+    $photo = test::random_photo();
+    $this->assert_equal(1024, $photo->width);
+    $this->assert_equal(768, $photo->height);
+    $this->assert_equal(6232, filesize($photo->file_path()));
+
+    // Random photo is gallery/images/imagemagick.jpg is 114x118 and 20337 bytes
+    $photo->set_data_file(MODPATH . "gallery/images/imagemagick.jpg");
+    $photo->save();
+
+    $this->assert_equal(114, $photo->width);
+    $this->assert_equal(118, $photo->height);
+    $this->assert_equal(20337, filesize($photo->file_path()));
+  }
+
+  public function replacement_data_file_must_be_same_mime_type_test() {
+    // Random photo is modules/gallery/tests/test.jpg
+    $photo = test::random_photo();
+    $photo->set_data_file(MODPATH . "gallery/images/graphicsmagick.png");
+
+    try {
+      $photo->save();
+    } catch (ORM_Validation_Exception $e) {
+      $this->assert_same(array("name" => "cant_change_mime_type"), $e->validation->errors());
+      return;  // pass
+    }
+    $this->assert_true(false, "Shouldn't get here");
+
+  }
 }
-- 
cgit v1.2.3


From 20fd9872965a65121c4497fb166eda15b1a9f360 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 7 Aug 2010 22:33:01 -0700
Subject: A new REST resource that allows access to view and modify the actual
 contents of the file, which enables REST viewers to see the actual data which
 is useful when the files are privileged.  Currently it returns the contents
 of the file in JSON encoded form, which may not be the best.  Multipart/mime
 might be much better.

Fixes ticket #1224.
---
 modules/gallery/helpers/data_rest.php | 84 +++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 modules/gallery/helpers/data_rest.php

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
new file mode 100644
index 00000000..ca5acb4a
--- /dev/null
+++ b/modules/gallery/helpers/data_rest.php
@@ -0,0 +1,84 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 data_rest_Core {
+  static function get($request) {
+    $item = rest::resolve($request->url);
+    access::required("view", $item);
+
+    $p = $request->params;
+    switch (isset($p->size) ? $p->size : "full") {
+    case "thumb":
+      $entity = array(
+        "width" => $item->thumb_width,
+        "height" => $item->thumb_height,
+        "path" => $item->thumb_path());
+      break;
+
+    case "resize":
+      $entity = array(
+        "width" => $item->resize_width,
+        "height" => $item->resize_height,
+        "path" => $item->resize_path());
+      break;
+
+    default:
+    case "full":
+      $entity = array(
+        "width" => $item->width,
+        "height" => $item->height,
+        "path" => $item->file_path());
+      break;
+    }
+
+    $entity["size"] = filesize($entity["path"]);
+    $entity["contents"] = file_get_contents($entity["path"]);
+    unset($entity["path"]);
+
+    $result = array(
+      "url" => $request->url,
+      "entity" => $entity,
+      "relationships" => rest::relationships("data", $item));
+    return $result;
+  }
+
+  static function put($request) {
+    $item = rest::resolve($request->url);
+    access::required("edit", $item);
+
+    if ($item->is_album()) {
+      throw new Rest_Exception("Bad Request", 400, array("errors" => array("type" => "invalid")));
+    }
+
+    $item->set_data_file($request->file);
+    $item->save();
+  }
+
+  static function resolve($id) {
+    $item = ORM::factory("item", $id);
+    if (!access::can("view", $item)) {
+      throw new Kohana_404_Exception();
+    }
+    return $item;
+  }
+
+  static function url($item) {
+    return url::abs_site("rest/data/{$item->id}");
+  }
+}
-- 
cgit v1.2.3


From 7f61f9754e3bcf7cd9c85d65414e1ee7945fdca5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 00:30:55 -0700
Subject: Change file modes to 644.

---
 modules/gallery/images/missing_movie.png | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 modules/gallery/images/missing_movie.png

(limited to 'modules')

diff --git a/modules/gallery/images/missing_movie.png b/modules/gallery/images/missing_movie.png
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 4e95ec843a2bef45e044e2aa3a36fcb590d85464 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 01:12:43 -0700
Subject: Allow item_rest::put() to replace the current data file.  Remove
 data_rest::put() altogether; it's no longer necessary.

---
 modules/gallery/helpers/data_rest.php | 12 ------------
 modules/gallery/helpers/item_rest.php |  6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index ca5acb4a..e45a4645 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -58,18 +58,6 @@ class data_rest_Core {
     return $result;
   }
 
-  static function put($request) {
-    $item = rest::resolve($request->url);
-    access::required("edit", $item);
-
-    if ($item->is_album()) {
-      throw new Rest_Exception("Bad Request", 400, array("errors" => array("type" => "invalid")));
-    }
-
-    $item->set_data_file($request->file);
-    $item->save();
-  }
-
   static function resolve($id) {
     $item = ORM::factory("item", $id);
     if (!access::can("view", $item)) {
diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 6869181d..10f9e16a 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -126,6 +126,12 @@ class item_rest_Core {
         }
       }
     }
+
+    // Replace the data file, if required
+    if (($item->is_photo() || $item->is_movie()) && isset($request->file)) {
+      $item->set_data_file($request->file);
+    }
+
     $item->save();
 
     if (isset($request->params->members) && $item->sort_column == "weight") {
-- 
cgit v1.2.3


From 0d2237979a2cc92d707a47115e492bff57fa9c5d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 01:48:09 -0700
Subject: Make the error page more informative, and include platform
 information.

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

(limited to 'modules')

diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php
index 40eb7374..5afaa0fe 100644
--- a/modules/gallery/views/error_admin.html.php
+++ b/modules/gallery/views/error_admin.html.php
@@ -102,6 +102,10 @@
       .number {
         padding-right: 1em;
       }
+
+      #g-platform h2 {
+        font-size: 1.1em;
+      }
     </style>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title><?= t("Something went wrong!") ?></title>
@@ -144,6 +148,17 @@
       <h2>
         <?= t("Hey wait, you're an admin!  We can tell you stuff.") ?>
       </h2>
+      <p>
+        There's an error message below and you can find more details
+        in gallery3/var/logs (look for the file with the most recent
+        date on it).  Stuck?  Stop by the <a href="http://gallery.menalto.com/forum/96">Gallery 3
+        Forums</a> and ask for help.  You can also look at our list
+        of <a href="http://sourceforge.net/apps/trac/gallery/roadmap">open
+        tickets</a> to see if the problem you're seeing has been
+        reported.  If you post a request, here's some useful
+        information to include: <?  @$block =
+        gallery_block::get("platform_info"); @print $block; ?>
+      </p>
       <div id="kohana_error">
         <h3>
           <span class="type">
-- 
cgit v1.2.3


From cc43c37a1c71c54d03979489ee7f1d5884a648af Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 02:06:50 -0700
Subject: Add a sad face on the dang page.  Just cause.

---
 modules/gallery/views/error_admin.html.php | 32 +++++++++++++++++++------
 modules/gallery/views/error_user.html.php  | 38 ++++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 17 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php
index 5afaa0fe..512a0d88 100644
--- a/modules/gallery/views/error_admin.html.php
+++ b/modules/gallery/views/error_admin.html.php
@@ -20,8 +20,21 @@
         margin: 20px auto;
       }
 
-      div#framework_error {
+      #framework_error {
+        height: 6em;
+      }
+
+      #framework_error .crashlogo {
+        position: relative;
+        top: .3em;
+        font-size: 6.0em;
+      }
+
+      #framework_error .title {
+        position: relative;
+        top: -3em;
         text-align: center;
+        margin: 0 auto;
       }
 
       div#error_details {
@@ -137,12 +150,17 @@
   <body>
     <? try { $user = identity::active_user(); } catch (Exception $e) { } ?>
     <div class="big_box" id="framework_error">
-      <h1>
-        <?= t("Dang...  Something went wrong!") ?>
-      </h1>
-      <h2>
-        <?= t("We tried really hard, but it's broken.") ?>
-      </h2>
+      <div class="crashlogo">
+        :-(
+      </div>
+      <div class="title">
+        <h1>
+          <?= t("Dang...  Something went wrong!") ?>
+        </h1>
+        <h2>
+          <?= t("We tried really hard, but it's broken.") ?>
+        </h2>
+      </div>
     </div>
     <div class="big_box" id="error_details">
       <h2>
diff --git a/modules/gallery/views/error_user.html.php b/modules/gallery/views/error_user.html.php
index 74c6a8fb..b64cfb53 100644
--- a/modules/gallery/views/error_user.html.php
+++ b/modules/gallery/views/error_user.html.php
@@ -19,8 +19,21 @@
         margin: 20px auto;
       }
 
-      div#framework_error {
+      #framework_error {
+        height: 8em;
+      }
+
+      #framework_error .crashlogo {
+        position: relative;
+        top: .3em;
+        font-size: 6em;
+      }
+
+      #framework_error .title {
+        position: relative;
+        top: -3em;
         text-align: center;
+        margin: 0 auto;
       }
     </style>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -28,15 +41,20 @@
   </head>
   <body>
     <div class="big_box" id="framework_error">
-      <h1>
-        <?= t("Dang...  Something went wrong!") ?>
-      </h1>
-      <h2>
-        <?= t("We tried really hard, but it's broken.") ?>
-      </h2>
-      <p>
-        <?= t("Talk to your Gallery administrator for help fixing this!") ?>
-      </p>
+      <div class="crashlogo">
+        :-(
+      </div>
+      <div class="title">
+        <h1>
+          <?= t("Dang...  Something went wrong!") ?>
+        </h1>
+        <h2>
+          <?= t("We tried really hard, but it's broken.") ?>
+        </h2>
+        <p>
+          <?= t("Talk to your Gallery administrator for help fixing this!") ?>
+        </p>
+      </div>
     </div>
   </body>
 </html>
-- 
cgit v1.2.3


From b7700d1eec02caa794629adcc0555d7c9f0c1414 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 09:57:13 -0700
Subject: Require the size parameter.  Optional params are confusing.  And be
 robust in the face of a missing data file (movies and albums lack resize,
 albums lack full size, some albums don't have a thumb if they have no
 contents, etc)

---
 modules/gallery/helpers/data_rest.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index e45a4645..48de2a3a 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -23,7 +23,11 @@ class data_rest_Core {
     access::required("view", $item);
 
     $p = $request->params;
-    switch (isset($p->size) ? $p->size : "full") {
+    if (!isset($p->size) || !in_array($p->size, array("thumb", "resize", "full"))) {
+      throw new Rest_Exception("Bad Request", 400, array("errors" => array("size" => "invalid")));
+    }
+
+    switch ($p->size) {
     case "thumb":
       $entity = array(
         "width" => $item->thumb_width,
@@ -38,7 +42,6 @@ class data_rest_Core {
         "path" => $item->resize_path());
       break;
 
-    default:
     case "full":
       $entity = array(
         "width" => $item->width,
@@ -47,8 +50,13 @@ class data_rest_Core {
       break;
     }
 
-    $entity["size"] = filesize($entity["path"]);
-    $entity["contents"] = file_get_contents($entity["path"]);
+    if (file_exists($entity["path"]) && is_file($entity["path"])) {
+      $entity["size"] = filesize($entity["path"]);
+      $entity["contents"] = file_get_contents($entity["path"]);
+    } else {
+      $entity["size"] = null;
+      $entity["contents"] = null;
+    }
     unset($entity["path"]);
 
     $result = array(
-- 
cgit v1.2.3


From a22cf8cf1c1f3eccedb01ab4629e579c95594dae Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 10:14:29 -0700
Subject: Handle "1" as a default order direction in G2.  Why would we ever do
 that?  Dunno. Fixes ticket #1276.

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

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 4aa9e642..4817ec04 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -442,6 +442,7 @@ class g2_import_Core {
         "title" => "title",
         "viewCount" => "view_count");
       $direction_map = array(
+        1 => "asc",
         ORDER_ASCENDING => "asc",
         ORDER_DESCENDING => "desc");
       // Only consider G2's first sort order
-- 
cgit v1.2.3


From ded9ed4df809d28ba2f4519a398e06daf335ee81 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 11:35:36 -0700
Subject: Create a registry of REST resources and call it "registry"..  Pretty
 simple, actually.  Fixes ticket #1173.

---
 modules/rest/helpers/registry_rest.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 modules/rest/helpers/registry_rest.php

(limited to 'modules')

diff --git a/modules/rest/helpers/registry_rest.php b/modules/rest/helpers/registry_rest.php
new file mode 100644
index 00000000..e9c8b955
--- /dev/null
+++ b/modules/rest/helpers/registry_rest.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 registry_rest_Core {
+  static function get($request) {
+    $results = array();
+    foreach (module::active() as $module) {
+      foreach (glob(MODPATH . "{$module->name}/helpers/*_rest.php") as $filename) {
+        $results[] = str_replace("_rest.php", "", basename($filename));
+      }
+    }
+    return array_unique($results);
+  }
+}
-- 
cgit v1.2.3


From 3c7dc6d7a63e59c841f60d9594575efcf0969f98 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 12:46:26 -0700
Subject: Handle 404 exceptions specially to reduce spam in the log files. 
 Fixes ticket #1228.

---
 modules/gallery/libraries/MY_Kohana_Exception.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index 27d1afc1..82899d7e 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -22,11 +22,15 @@ class Kohana_Exception extends Kohana_Exception_Core {
    * Dump out the full stack trace as part of the text representation of the exception.
    */
   public static function text($e) {
-    return sprintf(
-      "%s [ %s ]: %s\n%s [ %s ]\n%s",
-      get_class($e), $e->getCode(), strip_tags($e->getMessage()),
-      $e->getFile(), $e->getLine(),
-      $e->getTraceAsString());
+    if ($e instanceof Kohana_404_Exception) {
+      return "File not found: " . Router::$complete_uri;
+    } else {
+      return sprintf(
+        "%s [ %s ]: %s\n%s [ %s ]\n%s",
+        get_class($e), $e->getCode(), strip_tags($e->getMessage()),
+        $e->getFile(), $e->getLine(),
+        $e->getTraceAsString());
+    }
   }
 
   /**
-- 
cgit v1.2.3


From 371a2ff7d29f50dde5ff23ca45188d0eac365481 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 13:39:27 -0700
Subject: Adjust the vertical placement of the "Dang" message.

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

(limited to 'modules')

diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php
index 512a0d88..28776e60 100644
--- a/modules/gallery/views/error_admin.html.php
+++ b/modules/gallery/views/error_admin.html.php
@@ -32,9 +32,9 @@
 
       #framework_error .title {
         position: relative;
-        top: -3em;
+        top: -2.5em;
+        padding: 0px;
         text-align: center;
-        margin: 0 auto;
       }
 
       div#error_details {
-- 
cgit v1.2.3


From de4d858dc27b356776a6665fd9eeed82cffe9c2e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 14:56:28 -0700
Subject: Add in the missing 'error' count.

---
 modules/gallery_unit_test/views/kohana_unit_test_cli.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery_unit_test/views/kohana_unit_test_cli.php b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
index a0de0f52..61dae7dd 100644
--- a/modules/gallery_unit_test/views/kohana_unit_test_cli.php
+++ b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
@@ -71,7 +71,7 @@ foreach ($results as $class => $methods) {
   }
 
   echo "+", str_repeat("=", 87), "+", str_repeat("=", 10), "+\n";
-  printf("| %-40.40s %-13.13s %-13.13s %-13.13s %-13.13s |\n",
+  printf("| %-40.40s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s  |\n",
          $class,
          "Score: {$stats[$class]['score']}",
          "Total: {$stats[$class]['total']}",
@@ -81,7 +81,7 @@ foreach ($results as $class => $methods) {
   echo "+", str_repeat("=", 98), "+\n\n\n";
 }
 
-printf("  %-40.40s %-13.13s %-13.13s %-13.13s %-13.13s\n",
+printf("  %-40.40s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s\n",
        "TOTAL",
        "Score: " . ($totals["total"] ? 100 * ($totals["passed"] / $totals["total"]) : 0),
        "Total: {$totals['total']}",
-- 
cgit v1.2.3


From ab2e2d2d7786f834b26b0330dd2b6f682f23bd96 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:00:23 -0700
Subject: Add the $max_level param to all calls to _sanitize_for_dump()

---
 modules/gallery/tests/Kohana_Exception_Test.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Kohana_Exception_Test.php b/modules/gallery/tests/Kohana_Exception_Test.php
index 48bc5184..df7cf9ff 100644
--- a/modules/gallery/tests/Kohana_Exception_Test.php
+++ b/modules/gallery/tests/Kohana_Exception_Test.php
@@ -37,22 +37,22 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
 
   public function sanitize_for_dump_match_key_test() {
     $this->assert_equal("removed for display",
-        Kohana_Exception::_sanitize_for_dump("original value", "password"));
+        Kohana_Exception::_sanitize_for_dump("original value", "password", 5));
     $this->assert_equal("original value",
-        Kohana_Exception::_sanitize_for_dump("original value", "meow"));
+        Kohana_Exception::_sanitize_for_dump("original value", "meow", 5));
   }
 
   public function sanitize_for_dump_match_key_loosely_test() {
     $this->assert_equal("removed for display",
-        Kohana_Exception::_sanitize_for_dump("original value", "this secret key"));
+        Kohana_Exception::_sanitize_for_dump("original value", "this secret key", 5));
   }
 
   public function sanitize_for_dump_match_value_test() {
     // Looks like a hash / secret value.
     $this->assert_equal("removed for display",
-        Kohana_Exception::_sanitize_for_dump("p$2a178b841c6391d6368f131", "meow"));
+        Kohana_Exception::_sanitize_for_dump("p$2a178b841c6391d6368f131", "meow", 5));
     $this->assert_equal("original value",
-        Kohana_Exception::_sanitize_for_dump("original value", "meow"));
+        Kohana_Exception::_sanitize_for_dump("original value", "meow", 5));
   }
 
   public function sanitize_for_dump_array_test() {
@@ -64,7 +64,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
                       "three" => "removed for display");
 
     $this->assert_equal($expected,
-        Kohana_Exception::_sanitize_for_dump($var, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($var, "ignored", 5));
   }
 
   public function sanitize_for_dump_nested_array_test() {
@@ -73,7 +73,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
     $expected = array("safe" => "original value 1",
                       "safe 2" => array("some hash" => "removed for display"));
     $this->assert_equal($expected,
-        Kohana_Exception::_sanitize_for_dump($var, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($var, "ignored", 5));
   }
 
   public function sanitize_for_dump_user_test() {
@@ -83,7 +83,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
     $user->email = "value 2";
     $user->full_name = "value 3";
     $this->assert_equal('User_Model object for "john" - details omitted for display',
-        Kohana_Exception::_sanitize_for_dump($user, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($user, "ignored", 5));
   }
 
   public function sanitize_for_dump_database_test() {
@@ -91,7 +91,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
         array("connection" => array("user" => "john", "name" => "gallery_3"),
               "cache" => array()));
     $this->assert_equal("Kohana_Exception_Test_Database object - details omitted for display",
-        Kohana_Exception::_sanitize_for_dump($db, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($db, "ignored", 5));
   }
 
   public function sanitize_for_dump_nested_database_test() {
@@ -104,7 +104,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
         array("some" => "foo",
               "bar (type: Kohana_Exception_Test_Database)" =>
               "Kohana_Exception_Test_Database object - details omitted for display"),
-        Kohana_Exception::_sanitize_for_dump($var, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($var, "ignored", 5));
   }
 
   public function sanitize_for_dump_object_test() {
@@ -117,7 +117,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
                       "private: email_address" => "removed for display",
                       "password" => "removed for display");
     $this->assert_equal($expected,
-        Kohana_Exception::_sanitize_for_dump($obj, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($obj, "ignored", 5));
   }
 
   public function sanitize_for_dump_nested_object_test() {
@@ -142,7 +142,7 @@ class Kohana_Exception_Test extends Gallery_Unit_Test_Case {
                       "foo" => array("bar (type: User_Model)" =>
                                      'User_Model object for "john" - details omitted for display'));
     $this->assert_equal($expected,
-        Kohana_Exception::_sanitize_for_dump($obj, "ignored"));
+        Kohana_Exception::_sanitize_for_dump($obj, "ignored", 5));
   }
 }
 
-- 
cgit v1.2.3


From 9b5e058dd3a7d0d08fa0fad954a1908b9949e934 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:01:38 -0700
Subject: We can always send back the header because Kohana buffers output.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/json.php b/modules/gallery/helpers/json.php
index a39db27a..a88608aa 100644
--- a/modules/gallery/helpers/json.php
+++ b/modules/gallery/helpers/json.php
@@ -25,9 +25,7 @@ class json_Core {
    * @param  mixed $message string or object to json encode and print
    */
   static function reply($message) {
-    if (!headers_sent()) {
-      header("Content-Type: application/json; charset=" . Kohana::CHARSET);
-    }
+    header("Content-Type: application/json; charset=" . Kohana::CHARSET);
     print json_encode($message);
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From d6f5a8a8d13892d6487f344c5e5b1f5dd48893d5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:02:24 -0700
Subject: Add JSONP support.  You must specify
 &output=jsonp?callback=<js_function> Fixes ticket #1205.

---
 modules/rest/helpers/rest.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 644779da..73d09c64 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -24,7 +24,27 @@ class rest_Core {
     Session::instance()->abort_save();
 
     header("X-Gallery-API-Version: " . rest::API_VERSION);
-    if (Input::instance()->get("output") == "html") {
+    switch (Input::instance()->get("output", "json")) {
+    case "json":
+      json::reply($data);
+      break;
+
+    case "jsonp":
+      if (!($callback = Input::instance()->get("callback", ""))) {
+        throw new Rest_Exception(
+          "Bad Request", 400, array("errors" => array("callback" => "missing")));
+      }
+
+      if (preg_match('/^[$A-Za-z_][0-9A-Za-z_]*$/', $callback) == 1) {
+        header("Content-type: application/javascript");
+        print "$callback(" . json_encode($data) . ")";
+      } else {
+        throw new Rest_Exception(
+          "Bad Request", 400, array("errors" => array("callback" => "invalid")));
+      }
+      break;
+
+    case "html":
       header("Content-type: text/html");
       if ($data) {
         $html = preg_replace(
@@ -34,8 +54,10 @@ class rest_Core {
         $html = t("Empty response");
       }
       print "<pre>$html</pre>";
-    } else {
-      json::reply($data);
+      break;
+
+    default:
+      throw new Rest_Exception("Bad Request", 400);
     }
   }
 
-- 
cgit v1.2.3


From f5b7e207c8c6dc92f82b3607d57459e794b7990e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:02:58 -0700
Subject: Verified.

---
 modules/gallery/tests/xss_data.txt | 123 ++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 62 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 02483865..f135c522 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -77,23 +77,23 @@ modules/gallery/views/admin_languages.html.php               62  DIRTY    form::
 modules/gallery/views/admin_languages.html.php               63  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               65  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               113 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
-modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
-modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             70  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             70  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php             71  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY    gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php             75  DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             90  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             141 DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             141 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             142 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             143 DIRTY    gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php             146 DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             158 DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             40  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             40  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             41  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             42  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             45  DIRTY    $task->description
+modules/gallery/views/admin_maintenance.html.php             86  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             86  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             87  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             88  DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             91  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             106 DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             158 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             159 DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             162 DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             174 DIRTY    $task->status
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::site("admin/maintenance/save_log/$task->id?csrf=$csrf")
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
@@ -122,50 +122,50 @@ modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info-
 modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
 modules/gallery/views/admin_themes_preview.html.php          8   DIRTY_ATTR $url
 modules/gallery/views/error_404.html.php                     14  DIRTY    $login_form
-modules/gallery/views/error_admin.html.php                   150 DIRTY    $type
-modules/gallery/views/error_admin.html.php                   150 DIRTY    $code
-modules/gallery/views/error_admin.html.php                   153 DIRTY    $message
-modules/gallery/views/error_admin.html.php                   156 DIRTY_ATTR $error_id
-modules/gallery/views/error_admin.html.php                   161 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   161 DIRTY    $line
-modules/gallery/views/error_admin.html.php                   166 DIRTY_ATTR ($num==$line)?"highlight":""
-modules/gallery/views/error_admin.html.php                   166 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   166 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   178 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   178 DIRTY_JS $source_id
-modules/gallery/views/error_admin.html.php                   178 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   178 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   180 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   180 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   187 DIRTY    $step["function"]
-modules/gallery/views/error_admin.html.php                   188 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   188 DIRTY_JS $args_id
-modules/gallery/views/error_admin.html.php                   192 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   197 DIRTY    $name
-modules/gallery/views/error_admin.html.php                   200 DIRTY    Kohana_Exception::safe_dump($arg,$name)
-modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR ($num==$step["line"])?"highlight":""
-modules/gallery/views/error_admin.html.php                   208 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   208 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   218 DIRTY_ATTR $env_id=$error_id."environment"
-modules/gallery/views/error_admin.html.php                   218 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   220 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   222 DIRTY_ATTR $env_id=$error_id."environment_included"
-modules/gallery/views/error_admin.html.php                   222 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   222 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   223 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   228 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   235 DIRTY_ATTR $env_id=$error_id."environment_loaded"
-modules/gallery/views/error_admin.html.php                   235 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   235 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   236 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   241 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   249 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
-modules/gallery/views/error_admin.html.php                   250 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   250 DIRTY    $var
-modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   257 DIRTY    $key
-modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::safe_dump($value,$key)
+modules/gallery/views/error_admin.html.php                   183 DIRTY    $type
+modules/gallery/views/error_admin.html.php                   183 DIRTY    $code
+modules/gallery/views/error_admin.html.php                   186 DIRTY    $message
+modules/gallery/views/error_admin.html.php                   189 DIRTY_ATTR $error_id
+modules/gallery/views/error_admin.html.php                   194 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   194 DIRTY    $line
+modules/gallery/views/error_admin.html.php                   199 DIRTY_ATTR ($num==$line)?"highlight":""
+modules/gallery/views/error_admin.html.php                   199 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   199 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   211 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   211 DIRTY_JS $source_id
+modules/gallery/views/error_admin.html.php                   211 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   211 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   213 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   213 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   220 DIRTY    $step["function"]
+modules/gallery/views/error_admin.html.php                   221 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   221 DIRTY_JS $args_id
+modules/gallery/views/error_admin.html.php                   225 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   230 DIRTY    $name
+modules/gallery/views/error_admin.html.php                   233 DIRTY    Kohana_Exception::safe_dump($arg,$name)
+modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR ($num==$step["line"])?"highlight":""
+modules/gallery/views/error_admin.html.php                   241 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   241 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id=$error_id."environment"
+modules/gallery/views/error_admin.html.php                   251 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   253 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   255 DIRTY_ATTR $env_id=$error_id."environment_included"
+modules/gallery/views/error_admin.html.php                   255 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   255 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   256 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   268 DIRTY_ATTR $env_id=$error_id."environment_loaded"
+modules/gallery/views/error_admin.html.php                   268 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   268 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   269 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   274 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   282 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
+modules/gallery/views/error_admin.html.php                   283 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   283 DIRTY    $var
+modules/gallery/views/error_admin.html.php                   284 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   290 DIRTY    $key
+modules/gallery/views/error_admin.html.php                   294 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
 modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
@@ -191,7 +191,6 @@ modules/gallery/views/l10n_client.html.php                   62  DIRTY    form::
 modules/gallery/views/l10n_client.html.php                   67  DIRTY    form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
 modules/gallery/views/login_ajax.html.php                    6   DIRTY_JS url::site("password/reset")
 modules/gallery/views/login_ajax.html.php                    44  DIRTY    $form
-modules/gallery/views/maintenance.html.php                   46  DIRTY    auth::get_login_form("login/auth_html")
 modules/gallery/views/menu.html.php                          4   DIRTY    $menu->css_id?"id='$menu->css_id'":""
 modules/gallery/views/menu.html.php                          4   DIRTY_ATTR $menu->css_class
 modules/gallery/views/menu.html.php                          6   DIRTY    $element->render()
-- 
cgit v1.2.3


From e5a1da71ed0383155469e552e412b3504a1742e9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:05:55 -0700
Subject: Convert tabs to spaces to fix File_Structure_Test.

---
 modules/comment/controllers/admin_manage_comments.php | 6 +++---
 modules/comment/controllers/comments.php              | 4 ++--
 modules/user/controllers/users.php                    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index e451791f..0ba3d6b0 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -35,9 +35,9 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
   public function menu_labels() {
     $menu = $this->_menu($this->_counts());
     json::reply(array((string) $menu->get("unpublished")->label,
-		      (string) $menu->get("published")->label,
-		      (string) $menu->get("spam")->label,
-		      (string) $menu->get("deleted")->label));
+                      (string) $menu->get("published")->label,
+                      (string) $menu->get("spam")->label,
+                      (string) $menu->get("deleted")->label));
   }
 
   public function queue($state) {
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 6ec4132b..ff0e9ce1 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -57,8 +57,8 @@ class Comments_Controller extends Controller {
       $view->comment = $comment;
 
       json::reply(array("result" => "success",
-			"view" => (string)$view,
-			"form" => (string)comment::get_add_form($item)));
+                        "view" => (string)$view,
+                        "form" => (string)comment::get_add_form($item)));
     } else {
       $form = comment::prefill_add_form($form);
       json::reply(array("result" => "error", "form" => (string)$form));
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 5e6239d8..73b83770 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -55,7 +55,7 @@ class Users_Controller extends Controller {
       module::event("user_edit_form_completed", $user, $form);
       message::success(t("User information updated"));
       json::reply(array("result" => "success",
-			"resource" => url::site("users/{$user->id}")));
+                        "resource" => url::site("users/{$user->id}")));
     } else {
       json::reply(array("result" => "error", "html" => (string)$form));
     }
@@ -87,7 +87,7 @@ class Users_Controller extends Controller {
       module::event("user_auth", $user);
       module::event("user_password_change", $user);
       json::reply(array("result" => "success",
-			"resource" => url::site("users/{$user->id}")));
+                        "resource" => url::site("users/{$user->id}")));
     } else {
       log::warning("user", t("Failed password change for %name", array("name" => $user->name)));
       $name = $user->name;
@@ -121,7 +121,7 @@ class Users_Controller extends Controller {
       message::success(t("Email address changed"));
       module::event("user_auth", $user);
       json::reply(array("result" => "success",
-			"resource" => url::site("users/{$user->id}")));
+                        "resource" => url::site("users/{$user->id}")));
     } else {
       log::warning("user", t("Failed email change for %name", array("name" => $user->name)));
       $name = $user->name;
-- 
cgit v1.2.3


From 8da37d595cc81e3c340dd98fdb621b6955a3ad3f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 15:25:21 -0700
Subject: Verified.

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

(limited to 'modules')

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 3c9b3afc..0864a928 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -14,7 +14,6 @@ modules/gallery/controllers/login.php                        auth_ajax
 modules/gallery/controllers/login.php                        html                 DIRTY_AUTH
 modules/gallery/controllers/login.php                        auth_html            DIRTY_AUTH
 modules/gallery/controllers/logout.php                       index                DIRTY_AUTH
-modules/gallery/controllers/maintenance.php                  index                DIRTY_AUTH
 modules/gallery/controllers/quick.php                        form_edit            DIRTY_CSRF
 modules/gallery/controllers/upgrader.php                     index                DIRTY_AUTH
 modules/gallery/controllers/uploader.php                     start                DIRTY_AUTH
-- 
cgit v1.2.3


From cdb6306d7e75451587fbc029b94ef197f42842f1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 16:50:02 -0700
Subject: Backdate the created/updated dates for imported comments.  Fixes
 ticket #1215.

---
 modules/g2_import/helpers/g2_import.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 4817ec04..8db10dc1 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -859,7 +859,6 @@ class g2_import_Core {
     $comment->text = self::_transform_bbcode($text);
     $comment->state = "published";
     $comment->server_http_host = $g2_comment->getHost();
-    $comment->created = $g2_comment->getDate();
     try {
       $comment->save();
     } catch (Exception $e) {
@@ -868,6 +867,14 @@ class g2_import_Core {
             array("id" => $g2_comment_id)),
           $e);
     }
+
+    // Backdate the creation date.  We can't do this at creation time because
+    // Comment_Model::save() will override it.
+    db::update("comments")
+      ->set("created", $g2_comment->getDate())
+      ->set("updated", $g2_comment->getDate())
+      ->where("id", "=", $comment->id)
+      ->execute();
   }
 
   /**
-- 
cgit v1.2.3


From 2dda8e22a7a32db8a5577aad0cff2b47ac0f9c63 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 16:54:31 -0700
Subject: Use the gallery helper date/time functions wherever we format date
 time for the browser.  Fixes ticket #1278.

---
 modules/comment/views/comments.html.php              | 6 +++---
 modules/comment/views/user_profile_comments.html.php | 4 ++--
 modules/gallery/helpers/gallery.php                  | 4 ++--
 modules/gallery/tests/xss_data.txt                   | 2 +-
 modules/info/views/info_block.html.php               | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index da45f57b..b524f5da 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -36,11 +36,11 @@
         </a>
         <? if ($comment->author()->guest): ?>
         <?= t('on %date %name said',
-              array("date" => date("Y-M-d H:i:s", $comment->created),
-                    "name" => html::clean($comment->author_name()))); ?>
+            array("date" => gallery::date_time($comment->created),
+                  "name" => html::clean($comment->author_name()))); ?>
         <? else: ?>
         <?= t('on %date <a href="%url">%name</a> said',
-              array("date" => date("Y-M-d H:i:s", $comment->created),
+              array("date" => gallery::date_time($comment->created),
                     "url" => user_profile::url($comment->author_id),
                     "name" => html::clean($comment->author_name()))); ?>
         <? endif ?>
diff --git a/modules/comment/views/user_profile_comments.html.php b/modules/comment/views/user_profile_comments.html.php
index a2a641ba..377b2d95 100644
--- a/modules/comment/views/user_profile_comments.html.php
+++ b/modules/comment/views/user_profile_comments.html.php
@@ -4,8 +4,8 @@
   <? foreach ($comments as $comment): ?>
   <li id="g-comment-<?= $comment->id ?>">
     <p class="g-author">
-      <?= t('on %date for %title ',
-            array("date" => date("Y-M-d H:i:s", $comment->created),
+      <?= t("on %date for %title ",
+            array("date" => gallery::date_time($comment->created),
                   "title" => $comment->item()->title)); ?>
       <a href="<?= $comment->item()->url() ?>">
         <?= $comment->item()->thumb_img(array(), 50) ?>
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 54d16322..3f83b23d 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -60,7 +60,7 @@ class gallery_Core {
    * @return string
    */
   static function date_time($timestamp) {
-    return date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $timestamp);
+    return date(module::get_var("gallery", "date_time_format"), $timestamp);
   }
 
   /**
@@ -69,7 +69,7 @@ class gallery_Core {
    * @return string
    */
   static function date($timestamp) {
-    return date(module::get_var("gallery", "date_format", "Y-M-d"), $timestamp);
+    return date(module::get_var("gallery", "date_format"), $timestamp);
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index f135c522..ef92970b 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -267,7 +267,7 @@ modules/gallery/views/user_profile.html.php                  34  DIRTY_ATTR $use
 modules/gallery/views/user_profile.html.php                  43  DIRTY    $info->view
 modules/image_block/views/image_block_block.html.php         3   DIRTY_JS $item->url()
 modules/image_block/views/image_block_block.html.php         4   DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
-modules/info/views/info_block.html.php                       22  DIRTY    date("M j, Y H:i:s",$item->captured)
+modules/info/views/info_block.html.php                       22  DIRTY    gallery::date_time($item->captured)
 modules/info/views/info_block.html.php                       29  DIRTY_JS $item->owner->url
 modules/notification/views/comment_published.html.php        28  DIRTY_JS $comment->item()->abs_url()
 modules/notification/views/comment_published.html.php        29  DIRTY    $comment->item()->abs_url()
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index ac177ee7..ebe9bd28 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -19,7 +19,7 @@
   <? if ($item->captured): ?>
   <li>
     <strong class="caption"><?= t("Captured:") ?></strong>
-    <?= date("M j, Y H:i:s", $item->captured)?>
+    <?= gallery::date_time($item->captured)?>
   </li>
   <? endif ?>
   <? if ($item->owner): ?>
-- 
cgit v1.2.3


From bd541342b9b56db00b8d24db1da43b9693e9849a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 17:07:13 -0700
Subject: Add gallery stats in addition to platform stats.

---
 modules/gallery/views/error_admin.html.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php
index 28776e60..f5004eae 100644
--- a/modules/gallery/views/error_admin.html.php
+++ b/modules/gallery/views/error_admin.html.php
@@ -116,7 +116,7 @@
         padding-right: 1em;
       }
 
-      #g-platform h2 {
+      #g-platform h2, #g-stats h2 {
         font-size: 1.1em;
       }
     </style>
@@ -174,8 +174,9 @@
         of <a href="http://sourceforge.net/apps/trac/gallery/roadmap">open
         tickets</a> to see if the problem you're seeing has been
         reported.  If you post a request, here's some useful
-        information to include: <?  @$block =
-        gallery_block::get("platform_info"); @print $block; ?>
+        information to include:
+        <?=  @gallery_block::get("platform_info") ?>
+        <?=  @gallery_block::get("stats") ?>
       </p>
       <div id="kohana_error">
         <h3>
-- 
cgit v1.2.3


From e85b345edaded7d4a68ae758138bcff9d0ceaefb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 17:10:00 -0700
Subject: Visually separate the G2 comment's subject and body when we blend
 them into the G3 comment body.  Fixes ticket #1269.

---
 modules/g2_import/helpers/g2_import.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 8db10dc1..306a0c50 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -838,11 +838,7 @@ class g2_import_Core {
       return;
     }
 
-    $text = $g2_comment->getSubject();
-    if ($text) {
-      $text .= " ";
-    }
-    $text .= $g2_comment->getComment();
+    $text = join("\n", array($g2_comment->getSubject(), $g2_comment->getComment()));
     $text = html_entity_decode($text);
 
     // Just import the fields we know about.  Do this outside of the comment API for now so that
-- 
cgit v1.2.3


From c3ad4b5374435fdd93644066eeebd94ba5271e20 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 17:14:09 -0700
Subject: Whitespace fix

---
 modules/user/controllers/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 73b83770..6bb4967f 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -41,7 +41,7 @@ class Users_Controller extends Controller {
       // Translate ORM validation errors into form error messages
       foreach ($e->validation->errors() as $key => $error) {
         $form->edit_user->inputs[$key]->add_error($error, 1);
-     }
+      }
       $valid = false;
     }
 
-- 
cgit v1.2.3


From 6a8c1f5e855b1c4d768524e6e542218c234df6d3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 17:19:51 -0700
Subject: whitespace fix.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 5f1664ec..4febc4e2 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -66,7 +66,8 @@ class identity_Core {
 
       // The installer cannot set a user into the session, so it just sets an id which we should
       // upconvert into a user.
-      // @todo set the user name into the session instead of 2 and then use it to get the user object
+      // @todo set the user name into the session instead of 2 and then use it to get the
+      //       user object
       if ($user === 2) {
         auth::login(IdentityProvider::instance()->admin_user());
       }
-- 
cgit v1.2.3


From acb1faaa594fc5067c4340e073afca3b83f819d4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 17:25:31 -0700
Subject: Cache the group ids for a day to trade off performance for security
 updates. Fixes ticket #1227.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 4febc4e2..5de05948 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -72,12 +72,14 @@ class identity_Core {
         auth::login(IdentityProvider::instance()->admin_user());
       }
 
-      if (!$session->get("group_ids")) {
+      // Cache the group ids for a day to trade off performance for security updates.
+      if (!$session->get("group_ids") || $session->get("group_ids_timeout", 0) < time()) {
         $ids = array();
         foreach ($user->groups() as $group) {
           $ids[] = $group->id;
         }
         $session->set("group_ids", $ids);
+        $session->set("group_ids_timeout", time() + 86400);
       }
     } catch (Exception $e) {
       // Log it, so we at least have so notification that we swallowed the exception.
-- 
cgit v1.2.3


From 1ad1f9517f91875875f2e062bda7d834827c3430 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 8 Aug 2010 17:29:22 -0700
Subject: Fix for ticket #1279. In admin themes sanitize the theme name before
 checking that theme.info exists.

---
 modules/gallery/controllers/admin_themes.php | 7 ++++---
 modules/gallery/helpers/theme.php            | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index e59eadaf..a88e1e89 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -31,10 +31,11 @@ class Admin_Themes_Controller extends Admin_Controller {
   private function _get_themes() {
     $themes = array();
     foreach (scandir(THEMEPATH) as $theme_name) {
+      if ($theme_name[0] == ".") {
+        continue;
+      }
+      $theme_name = preg_replace("/[^a-zA-Z0-9\._-]/", "", $theme_name);
       if (file_exists(THEMEPATH . "$theme_name/theme.info")) {
-        if ($theme_name[0] == ".") {
-          continue;
-        }
 
         $themes[$theme_name] = theme::get_info($theme_name);
       }
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 3589a5b7..9df3eaf2 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -111,7 +111,7 @@ class theme_Core {
   }
 
   static function get_info($theme_name) {
-    $theme_name = preg_replace("/[^\w]/", "", $theme_name);
+    $theme_name = preg_replace("/[^a-zA-Z0-9\._-]/", "", $theme_name);
     $file = THEMEPATH . "$theme_name/theme.info";
     $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
     $theme_info->description = t($theme_info->description);
-- 
cgit v1.2.3


From 639d31a2c1a54f31ad32208b8602a8922d336fa0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 21:17:16 -0700
Subject: If the imported item from Gallery 2 has a preferred derivative with a
 rotation, then rotate the imported image accordingly.  Fixes ticket #1274..

---
 modules/g2_import/helpers/g2_import.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 306a0c50..f2e9dad9 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -588,6 +588,20 @@ class g2_import_Core {
         $item->description = self::_decode_html_special_chars(self::extract_description($g2_item));
         $item->owner_id = self::map($g2_item->getOwnerId());
         $item->save();
+
+        // If the item has a preferred derivative with a rotation, then rotate this image
+        // accordingly.  Should we obey scale rules as well?  I vote no because rotation is less
+        // destructive -- you lose too much data from scaling.
+        $g2_preferred = g2(GalleryCoreApi::fetchPreferredSource($g2_item));
+        if ($g2_preferred && $g2_preferred instanceof GalleryDerivative) {
+          if (preg_match("/rotate\|(-?\d+)/", $g2_preferred->getDerivativeOperations(), $matches)) {
+            $tmpfile = tempnam(TMPPATH, "rotate");
+            gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $matches[1]));
+            $item->set_data_file($tmpfile);
+            $item->save();
+            unlink($tmpfile);
+          }
+        }
       } catch (Exception $e) {
         $exception_info = (string) new G2_Import_Exception(
             t("Corrupt image '%path'", array("path" => $g2_path)),
-- 
cgit v1.2.3


From 0014745d4ad0c5e95e4ebced95062a6272359bf5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 21:49:30 -0700
Subject: Add a button to the user profile page to let you reset your REST API
 key.  This is useful if you think it's been compromised in some way. Fixes
 ticket #1226.

---
 modules/rest/controllers/rest.php                 | 16 ++++++++++++++++
 modules/rest/helpers/rest.php                     | 10 ++++++++++
 modules/rest/helpers/rest_event.php               |  7 -------
 modules/rest/views/reset_api_key_confirm.html.php |  7 +++++++
 modules/rest/views/user_profile_rest.html.php     |  3 +++
 5 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 modules/rest/views/reset_api_key_confirm.html.php

(limited to 'modules')

diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index bf2f0a54..a721ff2b 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -37,6 +37,22 @@ class Rest_Controller extends Controller {
     rest::reply(rest::access_key());
   }
 
+  public function reset_api_key_confirm() {
+    $form = new Forge("rest/reset_api_key", "", "post", array("id" => "g-reset-api-key"));
+    $group = $form->group("confirm_reset")->label(t("Confirm resetting your REST API key"));
+    $group->submit("")->value(t("Reset"));
+    $v = new View("reset_api_key_confirm.html");
+    $v->form = $form;
+    print $v;
+  }
+
+  public function reset_api_key() {
+    access::verify_csrf();
+    rest::reset_access_key();
+    message::success(t("Your REST API key has been reset."));
+    json::reply(array("result" => "success"));
+  }
+
   public function __call($function, $args) {
     try {
       $input = Input::instance();
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 73d09c64..333daf95 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -87,6 +87,16 @@ class rest_Core {
     identity::set_active_user($user);
   }
 
+  static function reset_access_key() {
+    $key = ORM::factory("user_access_key")
+      ->where("user_id", "=", identity::active_user()->id)
+      ->find();
+    if ($key->loaded()) {
+      $key->delete();
+    }
+    return rest::access_key();
+  }
+
   static function access_key() {
     $key = ORM::factory("user_access_key")
       ->where("user_id", "=", identity::active_user()->id)
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index f23b9a58..6a42e893 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -54,13 +54,6 @@ class rest_event {
     self::_get_access_key_form($user, $form);
   }
 
-  /**
-   * Called when user is editing their own form
-   */
-  static function user_edit_form($user, $form) {
-    self::_get_access_key_form($user, $form);
-  }
-
   /**
    * Get the form fields for user edit
    */
diff --git a/modules/rest/views/reset_api_key_confirm.html.php b/modules/rest/views/reset_api_key_confirm.html.php
new file mode 100644
index 00000000..3aae2a9a
--- /dev/null
+++ b/modules/rest/views/reset_api_key_confirm.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div id="g-rest-reset-api-key" class="ui-helper-clearfix">
+  <p>
+    <?= t("Do you really want to reset your REST API key?  Any clients that use this key will need to be updated with the new value.") ?>
+  </p>
+  <?= $form ?>
+</div>
diff --git a/modules/rest/views/user_profile_rest.html.php b/modules/rest/views/user_profile_rest.html.php
index e81f3d0b..3e5d3dbf 100644
--- a/modules/rest/views/user_profile_rest.html.php
+++ b/modules/rest/views/user_profile_rest.html.php
@@ -4,6 +4,9 @@
     <li id="g-rest-key">
       <p>
         <?= t("<b>Key</b>: %key", array("key" => $rest_key)) ?>
+        <a class="g-button ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("rest/reset_api_key_confirm") ?>">
+          <?= t("reset") ?>
+        </a>
       </p>
     </li>
   </ul>
-- 
cgit v1.2.3


From 541a084cc1dcc6afa19ff526f1a12d0e878be5ab Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Aug 2010 21:51:26 -0700
Subject: "REST api" --> "REST API".

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

(limited to 'modules')

diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 6a42e893..d8c69e94 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -97,6 +97,6 @@ class rest_event {
       $key->save();
     }
     $view->rest_key = $key->access_key;
-    $data->content[] = (object)array("title" => t("REST api"), "view" => $view);
+    $data->content[] = (object)array("title" => t("REST API"), "view" => $view);
   }
 }
-- 
cgit v1.2.3


From b6a50140474b4ac20eb3bf6e1c9427674f728b54 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 00:29:28 -0700
Subject: Fix a pagination bug.  Fixes ticket #1280.

---
 modules/comment/controllers/admin_manage_comments.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index 0ba3d6b0..0889dc4e 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -51,8 +51,10 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
       ->order_by("created", "DESC")
+      ->order_by("id", "DESC")
       ->where("state", "=", $state)
-      ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
+      ->limit(self::$items_per_page)
+      ->offset(($page - 1) * self::$items_per_page)
       ->find_all();
     $view->content->pager = new Pagination();
     $view->content->pager->initialize(
-- 
cgit v1.2.3


From 0ff81c7ded9e61a16a2f900edfbe98d48847bf59 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 15:18:25 -0700
Subject: The root album's edit form doesn't have a name field, so don't count
 on it being there in update().  Fixes ticket #1281.

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

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index f3f5dee3..fb7d5c59 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -132,7 +132,9 @@ class Albums_Controller extends Items_Controller {
       $album->description = $form->edit_item->description->value;
       $album->sort_column = $form->edit_item->sort_order->column->value;
       $album->sort_order = $form->edit_item->sort_order->direction->value;
-      $album->name = $form->edit_item->inputs["name"]->value;
+      if (array_key_exists("name", $form->edit_item->inputs)) {
+        $album->name = $form->edit_item->inputs["name"]->value;
+      }
       $album->slug = $form->edit_item->slug->value;
       $album->validate();
     } catch (ORM_Validation_Exception $e) {
-- 
cgit v1.2.3


From d5dbd1677ffdc141823066e98fb5bb3842b0263c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 21:22:54 -0700
Subject: "Server Add" -> "Server add" (Sentence capitalization)

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

(limited to 'modules')

diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index 631af02f..fd4ade71 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -22,7 +22,7 @@ class server_add_event_Core {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
                ->id("server_add")
-               ->label(t("Server Add"))
+               ->label(t("Server add"))
                ->url(url::site("admin/server_add")));
   }
 
@@ -35,7 +35,7 @@ class server_add_event_Core {
       $menu->get("add_menu")
         ->append(Menu::factory("dialog")
                  ->id("server_add")
-                 ->label(t("Server Add"))
+                 ->label(t("Server add"))
                  ->url(url::site("server_add/browse/$item->id")));
     }
   }
-- 
cgit v1.2.3


From f0d8aef0ead373f310c59c665f8973264815e784 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 22:51:14 -0700
Subject: "Content-type" --> "Content-Type".

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

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 15b4279f..d4e0d4c7 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -127,7 +127,7 @@ class File_Proxy_Controller extends Controller {
 
     // Dump out the image.  If the item is a movie, then its thumbnail will be a JPG.
     if ($item->is_movie() && $type != "albums") {
-      header("Content-type: image/jpeg");
+      header("Content-Type: image/jpeg");
     } else {
       header("Content-Type: $item->mime_type");
     }
-- 
cgit v1.2.3


From 3c18762fda9a91717b5defc300ace6bda61eb233 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 22:54:57 -0700
Subject: Change the way that this works.  Now instead of sending back the
 image metadata and the data itself JSON encoded, we just send back the raw
 data with the right Content-Type.  This, combined with code in
 Item_Model::as_restful_array() that swaps in /rest/data urls as appropriate,
 means that the RESTful payload has consistent urls when permissions are in
 play.

---
 modules/gallery/helpers/data_rest.php | 55 +++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 25 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index 48de2a3a..3cd2f59a 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
+/**
+ * This resource returns the raw contents of Item_Model data files.  It's analogous to the
+ * file_proxy controller, but it uses the REST authentication model.
+ */
 class data_rest_Core {
   static function get($request) {
     $item = rest::resolve($request->url);
@@ -29,41 +34,41 @@ class data_rest_Core {
 
     switch ($p->size) {
     case "thumb":
-      $entity = array(
-        "width" => $item->thumb_width,
-        "height" => $item->thumb_height,
-        "path" => $item->thumb_path());
+      $file = $item->thumb_path();
       break;
 
     case "resize":
-      $entity = array(
-        "width" => $item->resize_width,
-        "height" => $item->resize_height,
-        "path" => $item->resize_path());
+      $file = $item->resize_path();
       break;
 
     case "full":
-      $entity = array(
-        "width" => $item->width,
-        "height" => $item->height,
-        "path" => $item->file_path());
+      $file = $item->file_path();
       break;
     }
 
-    if (file_exists($entity["path"]) && is_file($entity["path"])) {
-      $entity["size"] = filesize($entity["path"]);
-      $entity["contents"] = file_get_contents($entity["path"]);
+    if (!file_exists($file)) {
+      throw new Kohana_404_Exception();
+    }
+
+    // Note: this code is roughly duplicated in data_rest, so if you modify this, please look to
+    // see if you should make the same change there as well.
+    //
+    // We don't have a cache buster in the url, so don't set cache headers here.
+    // We don't need to save the session for this request
+    Session::instance()->abort_save();
+
+    // Dump out the image.  If the item is a movie, then its thumbnail will be a JPG.
+    if ($item->is_movie() && $p->size == "thumb") {
+      header("Content-Type: image/jpeg");
     } else {
-      $entity["size"] = null;
-      $entity["contents"] = null;
+      header("Content-Type: {$item->mime_type}");
     }
-    unset($entity["path"]);
+    Kohana::close_buffers(false);
+    readfile($file);
 
-    $result = array(
-      "url" => $request->url,
-      "entity" => $entity,
-      "relationships" => rest::relationships("data", $item));
-    return $result;
+    // We must exit here to keep the regular REST framework reply code from adding more bytes on
+    // at the end or tinkering with headers.
+    exit;
   }
 
   static function resolve($id) {
@@ -74,7 +79,7 @@ class data_rest_Core {
     return $item;
   }
 
-  static function url($item) {
-    return url::abs_site("rest/data/{$item->id}");
+  static function url($item, $size) {
+    return url::abs_site("rest/data/{$item->id}?size=$size");
   }
 }
-- 
cgit v1.2.3


From 9de371e1b3bda42fdaf564af502c0c986eeada10 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 22:55:58 -0700
Subject: Use the data_rest implementation to proxy access to raw
 thumb/resize/full data files when permissions are in play.

---
 modules/gallery/models/item.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 5257bbb9..1dea60e8 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -974,13 +974,26 @@ class Item_Model extends ORM_MPTT {
     unset($data["album_cover_item_id"]);
 
     if (access::can("view_full", $this) && $this->is_photo()) {
-      $data["file_url"] = $this->file_url(true);
+      if (access::user_can(identity::guest(), "view_full", $this)) {
+        $data["file_url"] = $this->file_url(true);
+      } else {
+        $data["file_url"] = rest::url("data", $this, "full");
+      }
     }
 
     if (($tmp = $this->resize_url(true)) && $this->is_photo()) {
-      $data["resize_url"] = $tmp;
+      if (access::user_can(identity::guest(), "view", $this)) {
+        $data["resize_url"] = $tmp;
+      } else {
+        $data["resize_url"] = rest::url("data", $this, "resize");
+      }
+    }
+
+    if (access::user_can(identity::guest(), "view", $this)) {
+      $data["thumb_url"] = $this->thumb_url(true);
+    } else {
+      $data["thumb_url"] = rest::url("data", $this, "thumb");
     }
-    $data["thumb_url"] = $this->thumb_url(true);
     $data["can_edit"] = access::can("edit", $this);
 
     // Elide some internal-only data that is going to cause confusion in the client.
-- 
cgit v1.2.3


From a94bb197987deeee4b0046fb6566510080e087f6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 23:01:47 -0700
Subject: Force the charset to UTF-8 when viewing the HTML form of REST output.

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

(limited to 'modules')

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 333daf95..3a6b2cad 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -45,7 +45,7 @@ class rest_Core {
       break;
 
     case "html":
-      header("Content-type: text/html");
+      header("Content-type: text/html; charset=UTF-8");
       if ($data) {
         $html = preg_replace(
           "#([\w]+?://[\w]+[^ \'\"\n\r\t<]*)#ise", "'<a href=\"\\1\" >\\1</a>'",
-- 
cgit v1.2.3


From 524554c65b363adfd264c66dafe0671ba5115a1f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 11 Aug 2010 21:02:57 -0700
Subject: Send back the content length of files.  This fixes streaming movies. 
 Fixes ticket #974.

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

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index d4e0d4c7..b17310c4 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -116,6 +116,8 @@ class File_Proxy_Controller extends Controller {
       throw new Kohana_404_Exception();
     }
 
+    header("Content-Length: " . filesize($file));
+
     header("Pragma:");
     // Check that the content hasn't expired or it wasn't changed since cached
     expires::check(2592000, $item->updated);
-- 
cgit v1.2.3


From d9f8c8a295b760bb5b858c96f1658d50c321bd01 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Aug 2010 14:56:28 -0700
Subject: Rebuild access_caches rows if they're missing, as necessary.  Fixes
 ticket #1289.

---
 modules/gallery/helpers/gallery_task.php | 56 +++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index bf1355b8..6a1fc28a 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -26,7 +26,9 @@ class gallery_task_Core {
   const FIX_STATE_RUN_DUPE_SLUGS = 5;
   const FIX_STATE_START_DUPE_NAMES = 6;
   const FIX_STATE_RUN_DUPE_NAMES = 7;
-  const FIX_STATE_DONE = 8;
+  const FIX_STATE_START_MISSING_ACCESS_CACHES = 8;
+  const FIX_STATE_RUN_MISSING_ACCESS_CACHES = 9;
+  const FIX_STATE_DONE = 10;
 
   static function available_tasks() {
     $dirty_count = graphics::find_dirty_images_query()->count_records();
@@ -323,15 +325,14 @@ class gallery_task_Core {
     $total = $task->get("total");
     if (empty($total)) {
       // mptt: 2 operations for every item
-      // album audit (permissions and bogus album covers): 1 operation for every album
-      // dupe slugs: 1 operation for each unique conflicted slug
       $total = 2 * db::build()->count_records("items");
+      // album audit (permissions and bogus album covers): 1 operation for every album
       $total += db::build()->where("type", "=", "album")->count_records("items");
-      foreach (self::find_dupe_slugs() as $row) {
-        $total++;
-      }
-      foreach (self::find_dupe_names() as $row) {
-        $total++;
+      // one operation for each missing slug, name and access cache
+      foreach (array("find_dupe_slugs", "find_dupe_names", "find_missing_access_caches") as $func) {
+        foreach (self::$func() as $row) {
+          $total++;
+        }
       }
 
       $task->set("total", $total);
@@ -542,6 +543,36 @@ class gallery_task_Core {
         $completed++;
 
         if (empty($stack)) {
+          $state = self::FIX_STATE_START_MISSING_ACCESS_CACHES;
+        }
+        break;
+
+      case self::FIX_STATE_START_MISSING_ACCESS_CACHES:
+        $stack = array();
+        foreach (self::find_missing_access_caches() as $row) {
+          $stack[] = $row->id;
+        }
+        if ($stack) {
+          $task->set("stack", implode(" ", $stack));
+          $state = self::FIX_STATE_RUN_MISSING_ACCESS_CACHES;
+        } else {
+          $state = self::FIX_STATE_DONE;
+        }
+        break;
+
+      case self::FIX_STATE_RUN_MISSING_ACCESS_CACHES:
+        $stack = explode(" ", $task->get("stack"));
+        $id = array_pop($stack);
+        $access_cache = ORM::factory("access_cache");
+        $access_cache->item_id = $id;
+        $access_cache->save();
+        $task->set("stack", implode(" ", $stack));
+        $completed++;
+        if (empty($stack)) {
+          // 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());
           $state = self::FIX_STATE_DONE;
         }
         break;
@@ -587,4 +618,13 @@ class gallery_task_Core {
       ->group_by("parent_name")
       ->execute();
   }
+
+  static function find_missing_access_caches() {
+    return db::build()
+      ->select("items.id")
+      ->from("items")
+      ->join("access_caches", "items.id", "access_caches.item_id", "left")
+      ->where("access_caches.id", "is", null)
+      ->execute();
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 50e3230d79b8736f78ebaa4f1c7e6df1c29b3243 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Aug 2010 15:10:07 -0700
Subject: Add a key on access_caches.item_id.  Without this, the Fix task query
 to find missing access_caches is very slow.  Bump Gallery module to v34.

---
 installer/install.sql                         |  5 +++--
 modules/gallery/helpers/gallery_installer.php | 10 ++++++++--
 modules/gallery/module.info                   |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 0df82086..c6314aa7 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -10,7 +10,8 @@ CREATE TABLE {access_caches} (
   `view_full_2` binary(1) NOT NULL DEFAULT '0',
   `edit_2` binary(1) NOT NULL DEFAULT '0',
   `add_2` binary(1) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `item_id` (`item_id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_caches} VALUES (1,1,'1','0','0','1','0','0');
@@ -243,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',33,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',34,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',1,4);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 21c47ad5..569c5118 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -23,7 +23,8 @@ class gallery_installer {
     $db->query("CREATE TABLE {access_caches} (
                  `id` int(9) NOT NULL auto_increment,
                  `item_id` int(9),
-                 PRIMARY KEY (`id`))
+                 PRIMARY KEY (`id`),
+                 KEY (`item_id`))
                DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {access_intents} (
@@ -299,7 +300,7 @@ class gallery_installer {
     module::set_var("gallery", "simultaneous_upload_limit", 5);
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
     module::set_var("gallery", "maintenance_mode", 0);
-    module::set_version("gallery", 33);
+    module::set_version("gallery", 34);
   }
 
   static function upgrade($version) {
@@ -578,6 +579,11 @@ class gallery_installer {
       $db->query("ALTER TABLE {items} ADD KEY (`left_ptr`)");
       module::set_version("gallery", $version = 33);
     }
+
+    if ($version == 33) {
+      $db->query("ALTER TABLE {access_caches} ADD KEY (`item_id`)");
+      module::set_version("gallery", $version = 34);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index dbecda03..084a0945 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 33
+version = 34
-- 
cgit v1.2.3


From b562751fdb2ae8aab3a344e84176ea03381ca04c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Aug 2010 15:45:16 -0700
Subject: Don't expose members of an item that are not viewable by the end
 user. This leaks item ids, but no other information about the item.  Fixes
 ticket #1292.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 9cca9a54..f0b68d63 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -80,7 +80,7 @@ class items_rest_Core {
                        "relationships" => rest::relationships("item", $item));
     if ($item->type == "album") {
       $members = array();
-      foreach ($item->children() as $child) {
+      foreach ($item->viewable()->children() as $child) {
         $members[] = rest::url("item", $child);
       }
       $item_rest["members"] = $members;
-- 
cgit v1.2.3


From dbe595f15e9c3f359fa447cf270e914b6d6d809e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Aug 2010 16:10:32 -0700
Subject: Always use the data resource to return thumbs, resizes and full
 sizes. That way the client does not have to differentiate between RESTful
 request types and raw request types.  If there's a public raw url, return
 that as well.

---
 modules/gallery/models/item.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 1dea60e8..c4591279 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -668,9 +668,9 @@ class Item_Model extends ORM_MPTT {
   public function resize_img($extra_attrs) {
     $attrs = array_merge($extra_attrs,
             array("src" => $this->resize_url(),
-              "alt" => $this->title,
-              "width" => $this->resize_width,
-              "height" => $this->resize_height)
+                  "alt" => $this->title,
+                  "width" => $this->resize_width,
+                  "height" => $this->resize_height)
             );
     // html::image forces an absolute url which we don't want
     return "<img" . html::attributes($attrs) . "/>";
@@ -973,27 +973,25 @@ class Item_Model extends ORM_MPTT {
     }
     unset($data["album_cover_item_id"]);
 
-    if (access::can("view_full", $this) && $this->is_photo()) {
-      if (access::user_can(identity::guest(), "view_full", $this)) {
-        $data["file_url"] = $this->file_url(true);
-      } else {
-        $data["file_url"] = rest::url("data", $this, "full");
-      }
+    if (access::can("view_full", $this) && !$this->is_album()) {
+      $data["file_url"] = rest::url("data", $this, "full");
+    }
+    if (access::user_can(identity::guest(), "view_full", $this)) {
+      $data["file_url_public"] = $this->file_url(true);
     }
 
-    if (($tmp = $this->resize_url(true)) && $this->is_photo()) {
+    if ($this->is_photo()) {
+      $data["resize_url"] = rest::url("data", $this, "resize");
       if (access::user_can(identity::guest(), "view", $this)) {
-        $data["resize_url"] = $tmp;
-      } else {
-        $data["resize_url"] = rest::url("data", $this, "resize");
+        $data["resize_url_public"] = $this->resize_url(true);
       }
     }
 
+    $data["thumb_url"] = rest::url("data", $this, "thumb");
     if (access::user_can(identity::guest(), "view", $this)) {
-      $data["thumb_url"] = $this->thumb_url(true);
-    } else {
-      $data["thumb_url"] = rest::url("data", $this, "thumb");
+      $data["thumb_url_public"] = $this->thumb_url(true);
     }
+
     $data["can_edit"] = access::can("edit", $this);
 
     // Elide some internal-only data that is going to cause confusion in the client.
-- 
cgit v1.2.3


From 6563ad1393b6d9a9cde44a127355359edae54843 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Aug 2010 22:00:53 -0700
Subject: Return the right content type for album thumbnails (based on the
 album cover's mime type)

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index 3cd2f59a..98c98894 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -57,9 +57,17 @@ class data_rest_Core {
     // We don't need to save the session for this request
     Session::instance()->abort_save();
 
+    if ($item->is_album() && !$item->album_cover_item_id) {
+      // No thumbnail.  Return nothing.
+      // @todo: what should we do here?
+      return;
+    }
+
     // Dump out the image.  If the item is a movie, then its thumbnail will be a JPG.
     if ($item->is_movie() && $p->size == "thumb") {
       header("Content-Type: image/jpeg");
+    } else if ($item->is_album()) {
+      header("Content-Type: " . $item->album_cover()->mime_type);
     } else {
       header("Content-Type: {$item->mime_type}");
     }
-- 
cgit v1.2.3


From d2c59740b11c0764967410b233f3b01fc3dab85d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Aug 2010 00:00:31 -0700
Subject: Updated organize SWF to understand data resources.

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 147776 -> 145197 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index 40249a73..b37a74c3 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From a1be33f6ab9672cd4886e5b607001d30368613a1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Aug 2010 00:46:02 -0700
Subject: Verified.

---
 modules/gallery/tests/controller_auth_data.txt |  2 +
 modules/gallery/tests/xss_data.txt             | 95 +++++++++++++-------------
 2 files changed, 51 insertions(+), 46 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 0864a928..8b776fb9 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -25,6 +25,8 @@ modules/gallery/controllers/welcome_message.php              index
 modules/organize/controllers/organize.php                    dialog               DIRTY_CSRF
 modules/organize/controllers/organize.php                    add_album_fields     DIRTY_AUTH
 modules/rest/controllers/rest.php                            index                DIRTY_CSRF|DIRTY_AUTH
+modules/rest/controllers/rest.php                            reset_api_key_confirm DIRTY_AUTH
+modules/rest/controllers/rest.php                            reset_api_key        DIRTY_AUTH
 modules/rest/controllers/rest.php                            __call               DIRTY_CSRF|DIRTY_AUTH
 modules/rss/controllers/rss.php                              feed                 DIRTY_CSRF|DIRTY_AUTH
 modules/search/controllers/search.php                        index                DIRTY_CSRF|DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index ef92970b..3eae3d07 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -122,50 +122,52 @@ modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info-
 modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
 modules/gallery/views/admin_themes_preview.html.php          8   DIRTY_ATTR $url
 modules/gallery/views/error_404.html.php                     14  DIRTY    $login_form
-modules/gallery/views/error_admin.html.php                   183 DIRTY    $type
-modules/gallery/views/error_admin.html.php                   183 DIRTY    $code
-modules/gallery/views/error_admin.html.php                   186 DIRTY    $message
-modules/gallery/views/error_admin.html.php                   189 DIRTY_ATTR $error_id
-modules/gallery/views/error_admin.html.php                   194 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   194 DIRTY    $line
-modules/gallery/views/error_admin.html.php                   199 DIRTY_ATTR ($num==$line)?"highlight":""
-modules/gallery/views/error_admin.html.php                   199 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   199 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   211 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   211 DIRTY_JS $source_id
-modules/gallery/views/error_admin.html.php                   211 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   211 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   213 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   213 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   220 DIRTY    $step["function"]
-modules/gallery/views/error_admin.html.php                   221 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   221 DIRTY_JS $args_id
-modules/gallery/views/error_admin.html.php                   225 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   230 DIRTY    $name
-modules/gallery/views/error_admin.html.php                   233 DIRTY    Kohana_Exception::safe_dump($arg,$name)
-modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR ($num==$step["line"])?"highlight":""
-modules/gallery/views/error_admin.html.php                   241 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   241 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id=$error_id."environment"
-modules/gallery/views/error_admin.html.php                   251 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   253 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   255 DIRTY_ATTR $env_id=$error_id."environment_included"
-modules/gallery/views/error_admin.html.php                   255 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   255 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   256 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   268 DIRTY_ATTR $env_id=$error_id."environment_loaded"
-modules/gallery/views/error_admin.html.php                   268 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   268 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   269 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   274 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   282 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
-modules/gallery/views/error_admin.html.php                   283 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   283 DIRTY    $var
-modules/gallery/views/error_admin.html.php                   284 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   290 DIRTY    $key
-modules/gallery/views/error_admin.html.php                   294 DIRTY    Kohana_Exception::safe_dump($value,$key)
+modules/gallery/views/error_admin.html.php                   178 DIRTY    @gallery_block::get("platform_info")
+modules/gallery/views/error_admin.html.php                   179 DIRTY    @gallery_block::get("stats")
+modules/gallery/views/error_admin.html.php                   184 DIRTY    $type
+modules/gallery/views/error_admin.html.php                   184 DIRTY    $code
+modules/gallery/views/error_admin.html.php                   187 DIRTY    $message
+modules/gallery/views/error_admin.html.php                   190 DIRTY_ATTR $error_id
+modules/gallery/views/error_admin.html.php                   195 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   195 DIRTY    $line
+modules/gallery/views/error_admin.html.php                   200 DIRTY_ATTR ($num==$line)?"highlight":""
+modules/gallery/views/error_admin.html.php                   200 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   200 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   212 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   212 DIRTY_JS $source_id
+modules/gallery/views/error_admin.html.php                   212 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   212 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   214 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   214 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   221 DIRTY    $step["function"]
+modules/gallery/views/error_admin.html.php                   222 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   222 DIRTY_JS $args_id
+modules/gallery/views/error_admin.html.php                   226 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   231 DIRTY    $name
+modules/gallery/views/error_admin.html.php                   234 DIRTY    Kohana_Exception::safe_dump($arg,$name)
+modules/gallery/views/error_admin.html.php                   242 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   242 DIRTY_ATTR ($num==$step["line"])?"highlight":""
+modules/gallery/views/error_admin.html.php                   242 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   242 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   252 DIRTY_ATTR $env_id=$error_id."environment"
+modules/gallery/views/error_admin.html.php                   252 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   254 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   256 DIRTY_ATTR $env_id=$error_id."environment_included"
+modules/gallery/views/error_admin.html.php                   256 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   256 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   257 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   262 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   269 DIRTY_ATTR $env_id=$error_id."environment_loaded"
+modules/gallery/views/error_admin.html.php                   269 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   269 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   270 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   275 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   283 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
+modules/gallery/views/error_admin.html.php                   284 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   284 DIRTY    $var
+modules/gallery/views/error_admin.html.php                   285 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   291 DIRTY    $key
+modules/gallery/views/error_admin.html.php                   295 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
 modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
@@ -294,6 +296,7 @@ modules/organize/views/organize_dialog.html.php              136 DIRTY_ATTR requ
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
+modules/rest/views/reset_api_key_confirm.html.php            6   DIRTY    $form
 modules/rss/views/feed.mrss.php                              10  DIRTY    $feed->uri
 modules/rss/views/feed.mrss.php                              13  DIRTY_JS $feed->uri
 modules/rss/views/feed.mrss.php                              16  DIRTY_JS $feed->previous_page_uri
@@ -367,8 +370,8 @@ themes/admin_wind/views/admin.html.php                       61  DIRTY    $theme
 themes/admin_wind/views/admin.html.php                       68  DIRTY    $content
 themes/admin_wind/views/admin.html.php                       74  DIRTY    $sidebar
 themes/admin_wind/views/admin.html.php                       79  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       81  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       85  DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       82  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       87  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id
-- 
cgit v1.2.3


From ff1d8aea2f2805f85ce3cc7e4079d04fb9f1bac4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 15 Aug 2010 01:59:54 -0700
Subject: We use UTF-8 everywhere.  Fixes ticket #1285.

---
 modules/gallery/controllers/user_profile.php  | 2 +-
 modules/gallery/tests/Sendmail_Test.php       | 4 ++--
 modules/gallery/views/error_admin.html.php    | 2 +-
 modules/gallery/views/error_user.html.php     | 2 +-
 modules/notification/helpers/notification.php | 6 +++---
 modules/rest/helpers/rest.php                 | 2 +-
 modules/user/controllers/password.php         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 726d3e51..e992655b 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -56,7 +56,7 @@ class User_Profile_Controller extends Controller {
         ->to($user->email)
         ->subject(html::clean($form->message->subject->value))
         ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->header("Content-type", "text/html; charset=UTF-8")
         ->reply_to($form->message->reply_to->value)
         ->message(html::purify($form->message->message->value))
         ->send();
diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index b20543d1..b9406047 100644
--- a/modules/gallery/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
@@ -65,14 +65,14 @@ class Sendmail_Test extends Gallery_Unit_Test_Case {
                 "From: from@gallery3.com\n" .
                 "Reply-To: public@gallery3.com\n" .
                 "MIME-Version: 1.0\n" .
-                "Content-type: text/html; charset=iso-8859-1\r\n" .
+                "Content-Type: text/html; charset=UTF-8\r\n" .
                 "Subject: Test Email Unit test\r\n\r\n" .
                 "<html><body><p>This is an html msg</p></body></html>";
     $result = Sendmail_For_Test::factory()
       ->to("receiver@someemail.com")
       ->subject("Test Email Unit test")
       ->header("MIME-Version", "1.0")
-      ->header("Content-type", "text/html; charset=iso-8859-1")
+      ->header("Content-Type", "text/html; charset=UTF-8")
       ->message("<html><body><p>This is an html msg</p></body></html>")
       ->send()
       ->send_text;
diff --git a/modules/gallery/views/error_admin.html.php b/modules/gallery/views/error_admin.html.php
index f5004eae..af78c59c 100644
--- a/modules/gallery/views/error_admin.html.php
+++ b/modules/gallery/views/error_admin.html.php
@@ -120,7 +120,7 @@
         font-size: 1.1em;
       }
     </style>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title><?= t("Something went wrong!") ?></title>
 
     <script type="text/javascript">
diff --git a/modules/gallery/views/error_user.html.php b/modules/gallery/views/error_user.html.php
index b64cfb53..09ab752a 100644
--- a/modules/gallery/views/error_user.html.php
+++ b/modules/gallery/views/error_user.html.php
@@ -36,7 +36,7 @@
         margin: 0 auto;
       }
     </style>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title><?= t("Something went wrong!") ?></title>
   </head>
   <body>
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 0cf536bc..e4212203 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -185,7 +185,7 @@ class notification {
           ->to($email)
           ->subject($pending->subject)
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($pending->body)
           ->send();
         $pending->delete();
@@ -199,7 +199,7 @@ class notification {
           ->to($email)
           ->subject(t("Multiple events have occurred")) // @todo fix this terrible subject line
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($text)
           ->send();
       }
@@ -213,7 +213,7 @@ class notification {
           ->to($subscribers)
           ->subject($subject)
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($text)
           ->send();
       } else {
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 3a6b2cad..d5ed0452 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -36,7 +36,7 @@ class rest_Core {
       }
 
       if (preg_match('/^[$A-Za-z_][0-9A-Za-z_]*$/', $callback) == 1) {
-        header("Content-type: application/javascript");
+        header("Content-type: application/javascript; charset=UTF-8");
         print "$callback(" . json_encode($data) . ")";
       } else {
         throw new Rest_Exception(
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 575720a8..2e5eac5f 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -61,7 +61,7 @@ class Password_Controller extends Controller {
         ->to($user->email)
         ->subject(t("Password Reset Request"))
         ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->header("Content-type", "text/html; charset=UTF-8")
         ->message($message->render())
         ->send();
 
-- 
cgit v1.2.3


From 8c2ed0d681364837ab51b35d7aeb895b8adfa470 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 16 Aug 2010 22:39:54 -0600
Subject: Added text and submit classes to search form input and submit
 buttons, respectively. Fixed the width of the search form in IE. Button
 height's off in IE 8 compatbility mode.

---
 modules/search/views/search.html.php      |  4 ++--
 modules/search/views/search_link.html.php |  4 ++--
 themes/wind/css/fix-ie.css                | 10 ++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 2e139ecf..3436a00c 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,10 +8,10 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
-        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>"/>
+        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>" class="text" />
       </li>
       <li>
-        <input type="submit" value="<?= t("Search")->for_html_attr() ?>" />
+        <input type="submit" value="<?= t("Search")->for_html_attr() ?>" class="submit" />
       </li>
     </ul>
   </fieldset>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 481d0c82..dd3a76a4 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -3,10 +3,10 @@
   <ul>
     <li>
       <label for="g-search"><?= t("Search the gallery") ?></label>
-      <input type="text" name="q" id="g-search"/>
+      <input type="text" name="q" id="g-search" class="text" />
     </li>
     <li>
-      <input type="submit" value="<?= t("Go")->for_html_attr() ?>" />
+      <input type="submit" value="<?= t("Go")->for_html_attr() ?>" class="submit" />
     </li>
   </ul>
 </form>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index ac100da4..0633ff07 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -1,5 +1,5 @@
 /**
- * Fix display in IE 6, 7
+ * Fix display in IE 6, 7, and 8
  */
 
 #g-banner {
@@ -26,11 +26,17 @@ input.submit {
   display: inline !important;
 }
 
-.g-short-form input[type='submit'] {
+.g-short-form input.text,
+.g-short-form input.submit {
+  font-size: 1em;
   line-height: 1em;
   padding: .38em .3em;
 }
 
+#g-search-form input#q {
+  width: 300px;
+}
+
 #g-add-tag-form input.textbox {
   width: 110px !important;
 }
-- 
cgit v1.2.3


From 9592f2f2e6dfff7f5a500b29511ba3bd23a0fa15 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 16 Aug 2010 21:54:32 -0700
Subject: Correct incorrect case on dialog title.

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

(limited to 'modules')

diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 4d6fe5f0..e2b86577 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -18,7 +18,8 @@
             height: 400,
             width: 500,
             position: "center",
-            title: <?= t("Confirm Module Activation")->for_js() ?>,
+            title: <?= t("Confirm module a
+ctivation")->for_js() ?>,
             buttons: {
               <?= t("Continue")->for_js() ?>: function() {
                 $("form", this).submit();
-- 
cgit v1.2.3


From ea2808f48ffe10afc6514f0d1c96fe8b3f36f8e6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 16 Aug 2010 22:03:23 -0700
Subject: Fix a typo to the case correction.

---
 modules/gallery/views/admin_modules.html.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index e2b86577..f4ae965c 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -18,8 +18,7 @@
             height: 400,
             width: 500,
             position: "center",
-            title: <?= t("Confirm module a
-ctivation")->for_js() ?>,
+            title: <?= t("Confirm module activation")->for_js() ?>,
             buttons: {
               <?= t("Continue")->for_js() ?>: function() {
                 $("form", this).submit();
-- 
cgit v1.2.3


From 387d30da764b152a9bb40ac6db7d9ce5282aa7a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 17 Aug 2010 22:32:47 -0700
Subject: use HTTP_HOST instead of SERVER_NAME so that we're sending requests
 back to the same canonical domain that we came from.  Else Flash makes
 crossdomain.xml requests, fails, and falls over.

Fixes ticket #1298.
---
 modules/organize/controllers/organize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 3005eb67..7b2ba8ef 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -38,7 +38,7 @@ class Organize_Controller extends Controller {
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
-    $v->domain = $input->server("SERVER_NAME");
+    $v->domain = $input->server("HTTP_HOST");
     $v->access_key = rest::access_key();
     $v->file_filter = addslashes($file_filter);
     $v->sort_order = addslashes(json_encode($sort_order));
-- 
cgit v1.2.3


From 68b598d4fab4f7802e1193dc8139a8f7cd17efb5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 19 Aug 2010 19:48:44 -0700
Subject: Remove style information regarding the permission dialog from the
 gallery.css to the wind/screen.css.  This should make it easier for themes to
 style the dialog.

---
 modules/gallery/css/gallery.css | 18 +-----------------
 themes/wind/css/screen.css      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 08bd4749..fb72bd48 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -81,35 +81,19 @@
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
-	clear: both;
+  clear: both;
 }
 
 #g-edit-permissions-form th {
   text-align: center;
 }
 
-#g-edit-permissions-form td {
-  background-image: none;
-}
-
-#g-edit-permissions-form fieldset {
-	border: 1px solid #ccc;
-}
-
 #g-permissions .g-denied,
 #g-permissions .g-allowed {
   text-align: center;
   vertical-align: middle;
 }
 
-#g-permissions .g-denied {
-  background-color: #fcc;
-}
-
-#g-permissions .g-allowed {
-  background-color: #cfc;
-}
-
 /* Move items ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-move ul {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 44582a92..be802976 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -319,6 +319,23 @@ td {
   background-color: #fff;
 }
 
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-edit-permissions-form td {
+  background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+  border: 1px solid #ccc;
+}
+
+#g-permissions .g-denied {
+  background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+  background-color: #cfc;
+}
+
 /** *******************************************************************
  * 5) Navigation and menus
  *********************************************************************/
@@ -465,4 +482,4 @@ td {
 .rtl #g-footer #g-credits li {
   padding-left: 1.2em !important;
   padding-right: 0;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 33e76f5e337cc147330dd7b51977067030726eb5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 16 Aug 2010 21:54:32 -0700
Subject: Correct incorrect case on dialog title.

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

(limited to 'modules')

diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 4d6fe5f0..e2b86577 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -18,7 +18,8 @@
             height: 400,
             width: 500,
             position: "center",
-            title: <?= t("Confirm Module Activation")->for_js() ?>,
+            title: <?= t("Confirm module a
+ctivation")->for_js() ?>,
             buttons: {
               <?= t("Continue")->for_js() ?>: function() {
                 $("form", this).submit();
-- 
cgit v1.2.3


From 3fc08dfd4ceff9eb4726e7049e332b1c40b50072 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 16 Aug 2010 22:39:54 -0600
Subject: Added text and submit classes to search form input and submit
 buttons, respectively. Fixed the width of the search form in IE. Button
 height's off in IE 8 compatbility mode.

---
 modules/search/views/search.html.php      |  4 ++--
 modules/search/views/search_link.html.php |  4 ++--
 themes/wind/css/fix-ie.css                | 10 ++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 2e139ecf..3436a00c 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,10 +8,10 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
-        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>"/>
+        <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>" class="text" />
       </li>
       <li>
-        <input type="submit" value="<?= t("Search")->for_html_attr() ?>" />
+        <input type="submit" value="<?= t("Search")->for_html_attr() ?>" class="submit" />
       </li>
     </ul>
   </fieldset>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 481d0c82..dd3a76a4 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -3,10 +3,10 @@
   <ul>
     <li>
       <label for="g-search"><?= t("Search the gallery") ?></label>
-      <input type="text" name="q" id="g-search"/>
+      <input type="text" name="q" id="g-search" class="text" />
     </li>
     <li>
-      <input type="submit" value="<?= t("Go")->for_html_attr() ?>" />
+      <input type="submit" value="<?= t("Go")->for_html_attr() ?>" class="submit" />
     </li>
   </ul>
 </form>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index ac100da4..0633ff07 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -1,5 +1,5 @@
 /**
- * Fix display in IE 6, 7
+ * Fix display in IE 6, 7, and 8
  */
 
 #g-banner {
@@ -26,11 +26,17 @@ input.submit {
   display: inline !important;
 }
 
-.g-short-form input[type='submit'] {
+.g-short-form input.text,
+.g-short-form input.submit {
+  font-size: 1em;
   line-height: 1em;
   padding: .38em .3em;
 }
 
+#g-search-form input#q {
+  width: 300px;
+}
+
 #g-add-tag-form input.textbox {
   width: 110px !important;
 }
-- 
cgit v1.2.3


From 65801cf2e0d1b107925b2dc8fe3fb346cbccd972 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 16 Aug 2010 22:03:23 -0700
Subject: Fix a typo to the case correction.

---
 modules/gallery/views/admin_modules.html.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index e2b86577..f4ae965c 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -18,8 +18,7 @@
             height: 400,
             width: 500,
             position: "center",
-            title: <?= t("Confirm module a
-ctivation")->for_js() ?>,
+            title: <?= t("Confirm module activation")->for_js() ?>,
             buttons: {
               <?= t("Continue")->for_js() ?>: function() {
                 $("form", this).submit();
-- 
cgit v1.2.3


From 3e0b42573e83e2763f9f4cf6ac4790b0ad8514c3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 21 Aug 2010 14:06:30 -0700
Subject: Set the "secure" bit on cookies if we're using HTTPS.  Fixes ticket
 #1217.

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

(limited to 'modules')

diff --git a/modules/gallery/config/cookie.php b/modules/gallery/config/cookie.php
index ded3bdaa..7f6ea265 100644
--- a/modules/gallery/config/cookie.php
+++ b/modules/gallery/config/cookie.php
@@ -37,10 +37,9 @@ $config['path'] = '/';
 $config['expire'] = 0;
 
 /**
- * Enable this option to only allow the cookie to be read when using the a
- * secure protocol.
+ * Set the secure bit on the cookie if we're using HTTPS.
  */
-$config['secure'] = false;
+$config['secure'] = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
 
 /**
  * Enable this option to disable the cookie from being accessed when using a
-- 
cgit v1.2.3


From 4a01aaddc9fa443ca9e022666078d8a2d0578d8a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 21 Aug 2010 15:10:46 -0700
Subject: Verify that the ffmpeg path still exists by using file_exists(). 
 This is a lightweight way to catch the case where ffmpeg gets deleted. Fixes
 ticket #1303.

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

(limited to 'modules')

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 4ff29a7b..3e55eefe 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -84,7 +84,7 @@ class movie_Core {
   }
 
   static function find_ffmpeg() {
-    if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
+    if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
       $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
 
       putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-- 
cgit v1.2.3


From c6a28a93ddfcf692e67342707d2b4a41dcf19fe5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 21 Aug 2010 15:11:06 -0700
Subject: Put up a warning and don't accept movie files if we don't have
 ffmpeg. This fixes ticket #973.

---
 modules/gallery/libraries/Form_Uploadify.php  |  2 ++
 modules/gallery/views/form_uploadify.html.php | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index e5b6d819..79477763 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -46,6 +46,8 @@ class Form_Uploadify_Core extends Form_Input {
     $v->album = $this->data["album"];
     $v->script_data = $this->data["script_data"];
     $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit");
+    $v->movies_allowed = (bool) movie::find_ffmpeg();
+    $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt");
     return $v;
   }
 
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 4f564b07..9bd02f9b 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -9,7 +9,7 @@
       uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
       script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
       scriptData: <?= json_encode($script_data) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.m4v;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4;*.M4V",
+      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
       fileDesc: <?= t("Photos and movies")->for_js() ?>,
       cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
       simUploadLimit: <?= $simultaneous_upload_limit ?>,
@@ -78,14 +78,22 @@
   });
 </script>
 
-<? if (ini_get("suhosin.session.encrypt")): ?>
-<ul id="g-action-status" class="g-message-block">
-  <li class="g-error">
+<? if ($suhosin_session_encrypt || !$movies_allowed): ?>
+<div class="g-message-block g-info">
+  <? if ($suhosin_session_encrypt): ?>
+  <p class="g-error">
     <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
         array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
     "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
-  </li>
-</ul>
+  </p>
+  <? endif ?>
+
+  <? if (!$movies_allowed): ?>
+  <p class="g-warning">
+    <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
+  </p>
+  <? endif ?>
+</div>
 <? endif ?>
 
 <div>
-- 
cgit v1.2.3


From ae618840b6672444c1e3a92d1907b4a1306146df Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 21 Aug 2010 15:25:06 -0700
Subject: Tighten up whitespace.

---
 modules/organize/controllers/organize.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 7b2ba8ef..d2f3fbf5 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -31,10 +31,9 @@ class Organize_Controller extends Controller {
       $sort_fields[$field] = (string)$description;
     }
     $sort_order = array("ASC" => (string)t("Ascending"), "DESC" => (string)t("Descending"));
-    $file_filter = json_encode(
-      array("photo" => array("label" => "Images",
-                             "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")),
-            "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v"))));
+    $file_filter = json_encode(array(
+      "photo" => array("label" => "Images", "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")),
+      "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v"))));
 
     $v = new View("organize_dialog.html");
     $v->album = $album;
-- 
cgit v1.2.3


From 4d55166eba06a968c954fd5f5dca267d131c281e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 21 Aug 2010 16:52:46 -0700
Subject: Fix a bug where we were using names in a string context resulting in
 sending the wrong custom headers back. Fixed the names of the headers to be
 slightly more meta. Fixes #1305

Implemented in gallery3-flex bea5f67efa93a3921eec8cd03a15d68f513f1dc0
---
 modules/organize/lib/Gallery3WebClient.swf | Bin 145197 -> 145257 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index b37a74c3..f90b51c4 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 91fab0fcf5fb65d9e210abb031a4ddfee31b1f9e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 22 Aug 2010 00:26:52 -0700
Subject: Compiled version of
 http://github.com/gallery/gallery3-flex/commit/88efbd77b45ae888b035295a8034229c645267c2

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 145257 -> 145162 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index f90b51c4..f64c0c26 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 04add75f6ff7596319b01c635cb62fafacf504cf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 22 Aug 2010 00:27:24 -0700
Subject: Get rid of the move dialog and move option.  Instead, replace it with
 a call to Organize with the appropriate album open.  I have not yet figured
 out how to get the SWF code to highlight the active image, but that's coming.
  Partial fix for #1204.

---
 modules/gallery/controllers/move.php            | 71 -------------------------
 modules/gallery/helpers/gallery_event.php       | 12 -----
 modules/gallery/views/move_browse.html.php      | 50 -----------------
 modules/gallery/views/move_tree.html.php        | 19 -------
 modules/organize/controllers/organize.php       |  1 +
 modules/organize/helpers/organize_event.php     | 24 ++++++---
 modules/organize/views/organize_dialog.html.php |  1 +
 7 files changed, 19 insertions(+), 159 deletions(-)
 delete mode 100644 modules/gallery/controllers/move.php
 delete mode 100644 modules/gallery/views/move_browse.html.php
 delete mode 100644 modules/gallery/views/move_tree.html.php

(limited to 'modules')

diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
deleted file mode 100644
index 7b2d6165..00000000
--- a/modules/gallery/controllers/move.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 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 Move_Controller extends Controller {
-  public function browse($source_id) {
-    $source = ORM::factory("item", $source_id);
-    access::required("view", $source);
-    access::required("edit", $source);
-
-    $view = new View("move_browse.html");
-    $view->source = $source;
-    $view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
-    print $view;
-  }
-
-  public function save($source_id) {
-    access::verify_csrf();
-    $source = ORM::factory("item", $source_id);
-    $target = ORM::factory("item", Input::instance()->post("target_id"));
-
-    access::required("view", $source);
-    access::required("edit", $source);
-    access::required("view", $target);
-    access::required("edit", $target);
-
-    item::move($source, $target);
-
-    json::reply(array("result" => "success", "location" => $target->url()));
-  }
-
-  public function show_sub_tree($source_id, $target_id) {
-    $source = ORM::factory("item", $source_id);
-    $target = ORM::factory("item", $target_id);
-    access::required("view", $source);
-    access::required("edit", $source);
-    access::required("view", $target);
-    // show targets even if they're not editable because they may contain children which *are*
-    // editable
-
-    print $this->_get_tree_html($source, $target);
-  }
-
-  private function _get_tree_html($source, $target) {
-    $view = new View("move_tree.html");
-    $view->source = $source;
-    $view->parent = $target;
-    $view->children = ORM::factory("item")
-      ->viewable()
-      ->where("type", "=", "album")
-      ->where("parent_id", "=", $target->id)
-      ->find_all();
-    return $view;
-  }
-
-}
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index e048118b..df5394c9 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -447,7 +447,6 @@ class gallery_event_Core {
         break;
       }
       $cover_title = t("Choose as the album cover");
-      $move_title = t("Move to another album");
 
       $csrf = access::csrf_token();
 
@@ -478,17 +477,6 @@ class gallery_event_Core {
             ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&amp;from_id={$theme_item->id}&amp;page_type=$page_type")));
       }
 
-      // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting
-      // after move
-      if ($theme->page_subtype() == "album") {
-        $options_menu
-          ->append(Menu::factory("dialog")
-                   ->id("move")
-                   ->label($move_title)
-                   ->css_class("ui-icon-folder-open")
-                   ->url(url::site("move/browse/$item->id")));
-      }
-
       $parent = $item->parent();
       if (access::can("edit", $parent)) {
         // We can't make this item the highlight if it's an album with no album cover, or if it's
diff --git a/modules/gallery/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
deleted file mode 100644
index f77c724c..00000000
--- a/modules/gallery/views/move_browse.html.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div>
-<script type="text/javascript">
- var load_tree = function(target_id, locked) {
-   var load_url = "<?= url::site("move/show_sub_tree/{$source->id}/__TARGETID__") ?>";
-   var node = $("#node_" + target_id);
-   $("#g-move .node a").removeClass("selected");
-   node.find("a:first").addClass("selected");
-   if (locked) {
-     $("#g-move-button").attr("disabled", "disabled");
-     $("#g-move form input[name=target_id]").attr("value", "");
-   } else {
-     $("#g-move-button").removeAttr("disabled");
-     $("#g-move form input[name=target_id]").attr("value", target_id);
-   }
-   var sub_tree = $("#tree_" + target_id);
-   if (sub_tree.length) {
-     sub_tree.toggle();
-   } else {
-     $.get(load_url.replace("__TARGETID__", target_id), {},
-           function(data) {
-             node.html(data);
-             node.find("a:first").addClass("selected");
-           });
-   }
- }
-</script>
-<h1 style="display:none" >
-  <? if ($source->type == "photo"): ?>
-  <?= t("Move this photo to a new album") ?>
-  <? elseif ($source->type == "movie"): ?>
-  <?= t("Move this movie to a new album") ?>
-  <? elseif ($source->type == "album"): ?>
-  <?= t("Move this album to a new album") ?>
-  <? endif ?>
-</h1>
-<div id="g-move">
-  <ul id="tree_0">
-    <li id="node_1" class="node">
-      <?= $tree ?>
-    </li>
-  </ul>
-  <form method="post" action="<?= url::site("move/save/$source->id") ?>">
-    <?= access::csrf_form_field() ?>
-    <input type="hidden" name="target_id" value="" />
-    <input type="submit" id="g-move-button" value="<?= t("Move")->for_html_attr() ?>"
-       disabled="disabled" class="submit" />
-  </form>
-</div>
-</div>
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
deleted file mode 100644
index e629e1bb..00000000
--- a/modules/gallery/views/move_tree.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $parent->thumb_img(array(), 25); ?>
-<? if (!access::can("edit", $parent) || $source->contains($parent)): ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= html::clean($parent->title) ?> <?= t("(locked)") ?> </a>
-<? else: ?>
-<a href="javascript:load_tree('<?= $parent->id ?>',0)"> <?= html::clean($parent->title) ?></a>
-<? endif ?>
-<ul id="tree_<?= $parent->id ?>">
-  <? foreach ($children as $child): ?>
-  <li id="node_<?= $child->id ?>" class="node">
-    <?= $child->thumb_img(array(), 25); ?>
-    <? if (!access::can("edit", $child) || $source->contains($child)): ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= html::clean($child->title) ?> <?= t("(locked)") ?></a>
-    <? else: ?>
-    <a href="javascript:load_tree('<?= $child->id ?>',0)"> <?= html::clean($child->title) ?> </a>
-    <? endif ?>
-  </li>
-  <? endforeach ?>
-</ul>
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index d2f3fbf5..2b6e4186 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -42,6 +42,7 @@ class Organize_Controller extends Controller {
     $v->file_filter = addslashes($file_filter);
     $v->sort_order = addslashes(json_encode($sort_order));
     $v->sort_fields = addslashes(json_encode($sort_fields));
+    $v->selected_id = Input::instance()->get("selected_id", null);
     $v->rest_uri = url::site("rest") . "/";
     $v->controller_uri = url::site("organize") . "/";
     $v->swf_uri = url::file("modules/organize/lib/Gallery3WebClient.swf?") .
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index ae05fb5d..1593d30e 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -32,13 +32,23 @@ class organize_event_Core {
   }
 
   static function context_menu($menu, $theme, $item) {
-    if ($item->is_album() && access::can("edit", $item)) {
-      $menu->get("options_menu")
-        ->append(Menu::factory("dialog")
-                 ->id("organize")
-                 ->label(t("Organize album"))
-                 ->css_class("ui-icon-folder-open g-organize-link")
-                 ->url(url::site("organize/dialog/{$item->id}")));
+    if (access::can("edit", $item)) {
+      if ($item->is_album()) {
+        $menu->get("options_menu")
+          ->append(Menu::factory("dialog")
+                   ->id("organize")
+                   ->label(t("Organize album"))
+                   ->css_class("ui-icon-folder-open g-organize-link")
+                   ->url(url::site("organize/dialog/{$item->id}")));
+      } else {
+        $parent = $item->parent();
+        $menu->get("options_menu")
+          ->append(Menu::factory("dialog")
+                   ->id("move")
+                   ->label(t("Move to another album"))
+                   ->css_class("ui-icon-folder-open g-organize-link")
+                   ->url(url::site("organize/dialog/{$parent->id}?selected_id={$item->id}")));
+      }
     }
   }
 
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 4cc6385e..83143f97 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -94,6 +94,7 @@
       sortOrder: "<?= $sort_order ?>",
       sortFields: "<?= $sort_fields ?>",
       albumId: "<?= $album->id ?>",
+      selectedId: "<?= $selected_id ?>",
       restUri: "<?= $rest_uri ?>",
       controllerUri: "<?= $controller_uri ?>"
     };
-- 
cgit v1.2.3


From adc4061125f8a82f7fef0dc3ebbc2fe24bcbd5ae Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 22 Aug 2010 12:49:01 -0700
Subject: Use better error messages in form validation.

---
 modules/gallery/helpers/user_profile.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
index e5ebce84..e853933f 100644
--- a/modules/gallery/helpers/user_profile.php
+++ b/modules/gallery/helpers/user_profile.php
@@ -35,18 +35,18 @@ class user_profile_Core {
     $group->input("reply_to")
       ->label(t("From:"))
       ->rules("required|length[1, 256]|valid_email")
-      ->error_messages("required", t("Field is required"))
-      ->error_messages("max_length", t("Field exceeds 256 bytes"))
-      ->error_messages("valid_email", t("Field is not a valid email address"));
+      ->error_messages("required", t("You must enter a valid email address"))
+      ->error_messages("max_length", t("Your email address is too long"))
+      ->error_messages("valid_email", t("You must enter a valid email address"));
     $group->input("subject")
       ->label(t("Subject:"))
       ->rules("required|length[1, 256]")
-      ->error_messages("required", t("Field is required"))
-      ->error_messages("max_length", t("Field exceeds 256 bytes"));
+      ->error_messages("required", t("Your message must have a subject"))
+      ->error_messages("max_length", t("Your subject is too long"));
     $group->textarea("message")
       ->label(t("Message:"))
       ->rules("required")
-      ->error_messages("required", t("Field is required"));
+      ->error_messages("required", t("You must enter a message"));
     module::event("user_profile_contact_form", $form);
     $group->submit("")->value(t("Send"));
     return $form;
-- 
cgit v1.2.3


From dc80cde379edfd8c2d5c875363e801c9228f3e5e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 22 Aug 2010 12:58:23 -0700
Subject: Add "captcha_protect_form" event that the recaptcha module grabs and
 uses to add a captcha to the end of the first group in the form.  If there
 are no groups, it adds the captcha at the end of the form. Updated
 user_profile and comment forms to use it.

---
 modules/comment/helpers/comment.php           |  1 +
 modules/gallery/helpers/user_profile.php      |  1 +
 modules/recaptcha/helpers/recaptcha_event.php | 22 +++++++++-------------
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 92a286c7..7aa007cb 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -45,6 +45,7 @@ class comment_Core {
       ->error_messages("required", t("You must enter a comment"));
     $group->hidden("item_id")->value($item->id);
     module::event("comment_add_form", $form);
+    module::event("captcha_protect_form", $form);
     $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all");
 
     return $form;
diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
index e853933f..d9cc8ace 100644
--- a/modules/gallery/helpers/user_profile.php
+++ b/modules/gallery/helpers/user_profile.php
@@ -48,6 +48,7 @@ class user_profile_Core {
       ->rules("required")
       ->error_messages("required", t("You must enter a message"));
     module::event("user_profile_contact_form", $form);
+    module::event("captcha_protect_form", $form);
     $group->submit("")->value(t("Send"));
     return $form;
   }
diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php
index fda998e1..f185f92b 100644
--- a/modules/recaptcha/helpers/recaptcha_event.php
+++ b/modules/recaptcha/helpers/recaptcha_event.php
@@ -18,21 +18,17 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class recaptcha_event_Core {
-  static function user_profile_contact_form($form) {
+  static function captcha_protect_form($form) {
     if (module::get_var("recaptcha", "public_key")) {
-      $form->message->recaptcha("recaptcha")->label("")->id("g-recaptcha");
-    }
-  }
+      foreach ($form->inputs as $input) {
+        if ($input instanceof Form_Group) {
+          $input->recaptcha("recaptcha")->label("")->id("g-recaptcha");
+          return;
+        }
+      }
 
-  static function comment_add_form($form) {
-    if (module::get_var("recaptcha", "public_key")) {
-      $form->add_comment->recaptcha("recaptcha")->label("")->id("g-recaptcha");
-    }
-  }
-
-  static function register_add_form($form) {
-    if (module::get_var("recaptcha", "public_key")) {
-      $form->register_user->recaptcha("recaptcha")->label("")->id("g-recaptcha");
+      // If we haven't returned yet, then add the captcha at the end of the form
+      $form->recaptcha("recaptcha")->label("")->id("g-recaptcha");
     }
   }
 
-- 
cgit v1.2.3


From 545c069786c1254465ed4fb3054c71e9fdb582db Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 24 Aug 2010 21:27:34 -0700
Subject: Delete old SWFupload code.  We replaced it with uploadify ages ago.

---
 lib/swfupload/swfupload.js                | 980 ------------------------------
 lib/swfupload/swfupload.queue.js          |  98 ---
 lib/swfupload/swfupload.swf               | Bin 12787 -> 0 bytes
 modules/gallery/tests/Gallery_Filters.php |   1 -
 4 files changed, 1079 deletions(-)
 delete mode 100644 lib/swfupload/swfupload.js
 delete mode 100644 lib/swfupload/swfupload.queue.js
 delete mode 100644 lib/swfupload/swfupload.swf

(limited to 'modules')

diff --git a/lib/swfupload/swfupload.js b/lib/swfupload/swfupload.js
deleted file mode 100644
index e65b19cb..00000000
--- a/lib/swfupload/swfupload.js
+++ /dev/null
@@ -1,980 +0,0 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-
-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
-var SWFUpload;
-
-if (SWFUpload == undefined) {
-	SWFUpload = function (settings) {
-		this.initSWFUpload(settings);
-	};
-}
-
-SWFUpload.prototype.initSWFUpload = function (settings) {
-	try {
-		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = settings;
-		this.eventQueue = [];
-		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-		this.movieElement = null;
-
-
-		// Setup global control tracking
-		SWFUpload.instances[this.movieName] = this;
-
-		// Load the settings.  Load the Flash movie.
-		this.initSettings();
-		this.loadFlash();
-		this.displayDebugInfo();
-	} catch (ex) {
-		delete SWFUpload.instances[this.movieName];
-		throw ex;
-	}
-};
-
-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 2009-03-25";
-SWFUpload.QUEUE_ERROR = {
-	QUEUE_LIMIT_EXCEEDED	  		: -100,
-	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
-	ZERO_BYTE_FILE			  		: -120,
-	INVALID_FILETYPE		  		: -130
-};
-SWFUpload.UPLOAD_ERROR = {
-	HTTP_ERROR				  		: -200,
-	MISSING_UPLOAD_URL	      		: -210,
-	IO_ERROR				  		: -220,
-	SECURITY_ERROR			  		: -230,
-	UPLOAD_LIMIT_EXCEEDED	  		: -240,
-	UPLOAD_FAILED			  		: -250,
-	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
-	FILE_VALIDATION_FAILED	  		: -270,
-	FILE_CANCELLED			  		: -280,
-	UPLOAD_STOPPED					: -290
-};
-SWFUpload.FILE_STATUS = {
-	QUEUED		 : -1,
-	IN_PROGRESS	 : -2,
-	ERROR		 : -3,
-	COMPLETE	 : -4,
-	CANCELLED	 : -5
-};
-SWFUpload.BUTTON_ACTION = {
-	SELECT_FILE  : -100,
-	SELECT_FILES : -110,
-	START_UPLOAD : -120
-};
-SWFUpload.CURSOR = {
-	ARROW : -1,
-	HAND : -2
-};
-SWFUpload.WINDOW_MODE = {
-	WINDOW : "window",
-	TRANSPARENT : "transparent",
-	OPAQUE : "opaque"
-};
-
-// Private: takes a URL, determines if it is relative and converts to an absolute URL
-// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function(url) {
-	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
-		return url;
-	}
-	
-	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
-	
-	var indexSlash = window.location.pathname.lastIndexOf("/");
-	if (indexSlash <= 0) {
-		path = "/";
-	} else {
-		path = window.location.pathname.substr(0, indexSlash) + "/";
-	}
-	
-	return /*currentURL +*/ path + url;
-	
-};
-
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
-	this.ensureDefault = function (settingName, defaultValue) {
-		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-	};
-	
-	// Upload backend settings
-	this.ensureDefault("upload_url", "");
-	this.ensureDefault("preserve_relative_urls", false);
-	this.ensureDefault("file_post_name", "Filedata");
-	this.ensureDefault("post_params", {});
-	this.ensureDefault("use_query_string", false);
-	this.ensureDefault("requeue_on_error", false);
-	this.ensureDefault("http_success", []);
-	this.ensureDefault("assume_success_timeout", 0);
-	
-	// File Settings
-	this.ensureDefault("file_types", "*.*");
-	this.ensureDefault("file_types_description", "All Files");
-	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
-	this.ensureDefault("file_upload_limit", 0);
-	this.ensureDefault("file_queue_limit", 0);
-
-	// Flash Settings
-	this.ensureDefault("flash_url", "swfupload.swf");
-	this.ensureDefault("prevent_swf_caching", true);
-	
-	// Button Settings
-	this.ensureDefault("button_image_url", "");
-	this.ensureDefault("button_width", 1);
-	this.ensureDefault("button_height", 1);
-	this.ensureDefault("button_text", "");
-	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-	this.ensureDefault("button_text_top_padding", 0);
-	this.ensureDefault("button_text_left_padding", 0);
-	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-	this.ensureDefault("button_disabled", false);
-	this.ensureDefault("button_placeholder_id", "");
-	this.ensureDefault("button_placeholder", null);
-	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-	
-	// Debug Settings
-	this.ensureDefault("debug", false);
-	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
-	
-	// Event Handlers
-	this.settings.return_upload_start_handler = this.returnUploadStart;
-	this.ensureDefault("swfupload_loaded_handler", null);
-	this.ensureDefault("file_dialog_start_handler", null);
-	this.ensureDefault("file_queued_handler", null);
-	this.ensureDefault("file_queue_error_handler", null);
-	this.ensureDefault("file_dialog_complete_handler", null);
-	
-	this.ensureDefault("upload_start_handler", null);
-	this.ensureDefault("upload_progress_handler", null);
-	this.ensureDefault("upload_error_handler", null);
-	this.ensureDefault("upload_success_handler", null);
-	this.ensureDefault("upload_complete_handler", null);
-	
-	this.ensureDefault("debug_handler", this.debugMessage);
-
-	this.ensureDefault("custom_settings", {});
-
-	// Other settings
-	this.customSettings = this.settings.custom_settings;
-	
-	// Update the flash url if needed
-	if (!!this.settings.prevent_swf_caching) {
-		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
-	}
-	
-	if (!this.settings.preserve_relative_urls) {
-		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
-		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
-		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
-	}
-	
-	delete this.ensureDefault;
-};
-
-// Private: loadFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.loadFlash = function () {
-	var targetElement, tempParent;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the element where we will be placing the flash movie
-	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
-
-	if (targetElement == undefined) {
-		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
-	}
-
-	// Append the container and load the flash
-	tempParent = document.createElement("div");
-	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-	// Fix IE Flash/Form bug
-	if (window[this.movieName] == undefined) {
-		window[this.movieName] = this.getMovieElement();
-	}
-	
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
-				'<param name="movie" value="', this.settings.flash_url, '" />',
-				'<param name="quality" value="high" />',
-				'<param name="menu" value="false" />',
-				'<param name="allowScriptAccess" value="always" />',
-				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
-				'</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-	// Build a string from the post param object
-	var paramString = this.buildParamString();
-	var httpSuccessString = this.settings.http_success.join(",");
-	
-	// Build the parameter string
-	return ["movieName=", encodeURIComponent(this.movieName),
-			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
-			"&amp;params=", encodeURIComponent(paramString),
-			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-		].join("");
-};
-
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-	if (this.movieElement == undefined) {
-		this.movieElement = document.getElementById(this.movieName);
-	}
-
-	if (this.movieElement === null) {
-		throw "Could not find Flash element";
-	}
-	
-	return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-	var postParams = this.settings.post_params; 
-	var paramStringPairs = [];
-
-	if (typeof(postParams) === "object") {
-		for (var name in postParams) {
-			if (postParams.hasOwnProperty(name)) {
-				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
-			}
-		}
-	}
-
-	return paramStringPairs.join("&amp;");
-};
-
-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-// Credits: Major improvements provided by steffen
-SWFUpload.prototype.destroy = function () {
-	try {
-		// Make sure Flash is done before we try to remove it
-		this.cancelUpload(null, false);
-		
-
-		// Remove the SWFUpload DOM nodes
-		var movieElement = null;
-		movieElement = this.getMovieElement();
-		
-		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
-			for (var i in movieElement) {
-				try {
-					if (typeof(movieElement[i]) === "function") {
-						movieElement[i] = null;
-					}
-				} catch (ex1) {}
-			}
-
-			// Remove the Movie Element from the page
-			try {
-				movieElement.parentNode.removeChild(movieElement);
-			} catch (ex) {}
-		}
-		
-		// Remove IE form fix reference
-		window[this.movieName] = null;
-
-		// Destroy other references
-		SWFUpload.instances[this.movieName] = null;
-		delete SWFUpload.instances[this.movieName];
-
-		this.movieElement = null;
-		this.settings = null;
-		this.customSettings = null;
-		this.eventQueue = null;
-		this.movieName = null;
-		
-		
-		return true;
-	} catch (ex2) {
-		return false;
-	}
-};
-
-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-	this.debug(
-		[
-			"---SWFUpload Instance Info---\n",
-			"Version: ", SWFUpload.version, "\n",
-			"Movie Name: ", this.movieName, "\n",
-			"Settings:\n",
-			"\t", "upload_url:               ", this.settings.upload_url, "\n",
-			"\t", "flash_url:                ", this.settings.flash_url, "\n",
-			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
-			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-			"\t", "file_types:               ", this.settings.file_types, "\n",
-			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
-			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-			"Event Handlers:\n",
-			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-		].join("")
-	);
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-	the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-	}
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-	}
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-	argumentArray = argumentArray || [];
-	
-	var movieElement = this.getMovieElement();
-	var returnValue, returnString;
-
-	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
-	try {
-		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-		returnValue = eval(returnString);
-	} catch (ex) {
-		throw "Call to " + functionName + " failed";
-	}
-	
-	// Unescape file post param values
-	if (returnValue != undefined && typeof returnValue.post === "object") {
-		returnValue = this.unescapeFilePostParams(returnValue);
-	}
-
-	return returnValue;
-};
-
-/* *****************************
-	-- Flash control methods --
-	Your UI should use these
-	to operate SWFUpload
-   ***************************** */
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-	this.callFlash("SelectFile");
-};
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.
-SWFUpload.prototype.selectFiles = function () {
-	this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-	this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-	if (triggerErrorEvent !== false) {
-		triggerErrorEvent = true;
-	}
-	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-	this.callFlash("StopUpload");
-};
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-	return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-	this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-	if (typeof(fileID) === "number") {
-		return this.callFlash("GetFileByIndex", [fileID]);
-	} else {
-		return this.callFlash("GetFile", [fileID]);
-	}
-};
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-	return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-	this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-	this.settings.upload_url = url.toString();
-	this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-	this.settings.post_params = paramsObject;
-	this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-	this.settings.post_params[name] = value;
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-	delete this.settings.post_params[name];
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-	this.settings.file_types = types;
-	this.settings.file_types_description = description;
-	this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-	this.settings.file_size_limit = fileSizeLimit;
-	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-	this.settings.file_upload_limit = fileUploadLimit;
-	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-	this.settings.file_queue_limit = fileQueueLimit;
-	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-	this.settings.file_post_name = filePostName;
-	this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-	this.settings.use_query_string = useQueryString;
-	this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-	this.settings.requeue_on_error = requeueOnError;
-	this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-	if (typeof http_status_codes === "string") {
-		http_status_codes = http_status_codes.replace(" ", "").split(",");
-	}
-	
-	this.settings.http_success = http_status_codes;
-	this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
-	this.settings.assume_success_timeout = timeout_seconds;
-	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
-};
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-	this.settings.debug_enabled = debugEnabled;
-	this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-	if (buttonImageURL == undefined) {
-		buttonImageURL = "";
-	}
-	
-	this.settings.button_image_url = buttonImageURL;
-	this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-	this.settings.button_width = width;
-	this.settings.button_height = height;
-	
-	var movie = this.getMovieElement();
-	if (movie != undefined) {
-		movie.style.width = width + "px";
-		movie.style.height = height + "px";
-	}
-	
-	this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-	this.settings.button_text = html;
-	this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-	this.settings.button_text_top_padding = top;
-	this.settings.button_text_left_padding = left;
-	this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-	this.settings.button_text_style = css;
-	this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-	this.settings.button_disabled = isDisabled;
-	this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-	this.settings.button_action = buttonAction;
-	this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-	this.settings.button_cursor = cursor;
-	this.callFlash("SetButtonCursor", [cursor]);
-};
-
-/* *******************************
-	Flash Event Interfaces
-	These functions are used by Flash to trigger the various
-	events.
-	
-	All these functions a Private.
-	
-	Because the ExternalInterface library is buggy the event calls
-	are added to a queue and the queue then executed by a setTimeout.
-	This ensures that events are executed in a determinate order and that
-	the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-	
-	if (argumentArray == undefined) {
-		argumentArray = [];
-	} else if (!(argumentArray instanceof Array)) {
-		argumentArray = [argumentArray];
-	}
-	
-	var self = this;
-	if (typeof this.settings[handlerName] === "function") {
-		// Queue the event
-		this.eventQueue.push(function () {
-			this.settings[handlerName].apply(this, argumentArray);
-		});
-		
-		// Execute the next queued event
-		setTimeout(function () {
-			self.executeNextEvent();
-		}, 0);
-		
-	} else if (this.settings[handlerName] !== null) {
-		throw "Event handler " + handlerName + " is unknown or is not a function";
-	}
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-	var  f = this.eventQueue ? this.eventQueue.shift() : null;
-	if (typeof(f) === "function") {
-		f.apply(this);
-	}
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-	var reg = /[$]([0-9a-f]{4})/i;
-	var unescapedPost = {};
-	var uk;
-
-	if (file != undefined) {
-		for (var k in file.post) {
-			if (file.post.hasOwnProperty(k)) {
-				uk = k;
-				var match;
-				while ((match = reg.exec(uk)) !== null) {
-					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-				}
-				unescapedPost[uk] = file.post[k];
-			}
-		}
-
-		file.post = unescapedPost;
-	}
-
-	return file;
-};
-
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-	try {
-		return this.callFlash("TestExternalInterface");
-	} catch (ex) {
-		return false;
-	}
-};
-
-// Private: This event is called by Flash when it has finished loading. Don't modify this.
-// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
-SWFUpload.prototype.flashReady = function () {
-	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movieElement = this.getMovieElement();
-
-	if (!movieElement) {
-		this.debug("Flash called back ready but the flash movie can't be found.");
-		return;
-	}
-
-	this.cleanUp(movieElement);
-	
-	this.queueEvent("swfupload_loaded_handler");
-};
-
-// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
-// This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function (movieElement) {
-	// Pro-actively unhook all the Flash functions
-	try {
-		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-			for (var key in movieElement) {
-				try {
-					if (typeof(movieElement[key]) === "function") {
-						movieElement[key] = null;
-					}
-				} catch (ex) {
-				}
-			}
-		}
-	} catch (ex1) {
-	
-	}
-
-	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
-	// it doesn't display errors.
-	window["__flash__removeCallback"] = function (instance, name) {
-		try {
-			if (instance) {
-				instance[name] = null;
-			}
-		} catch (flashEx) {
-		
-		}
-	};
-
-};
-
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-	this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
-	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-	var returnValue;
-	if (typeof this.settings.upload_start_handler === "function") {
-		file = this.unescapeFilePostParams(file);
-		returnValue = this.settings.upload_start_handler.call(this, file);
-	} else if (this.settings.upload_start_handler != undefined) {
-		throw "upload_start_handler must be a function";
-	}
-
-	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
-	// interpretted as 'true'.
-	if (returnValue === undefined) {
-		returnValue = true;
-	}
-	
-	returnValue = !!returnValue;
-	
-	this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-	this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-	Debug Console
-	The debug console is a self contained, in page location
-	for debug message to be sent.  The Debug Console adds
-	itself to the body if necessary.
-
-	The console is automatically scrolled as messages appear.
-	
-	If you are using your own debug handler or when you deploy to production and
-	have debug disabled you can remove these functions to reduce the file size
-	and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-	if (this.settings.debug) {
-		var exceptionMessage, exceptionValues = [];
-
-		// Check for an exception object and print it nicely
-		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-			for (var key in message) {
-				if (message.hasOwnProperty(key)) {
-					exceptionValues.push(key + ": " + message[key]);
-				}
-			}
-			exceptionMessage = exceptionValues.join("\n") || "";
-			exceptionValues = exceptionMessage.split("\n");
-			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-			SWFUpload.Console.writeLine(exceptionMessage);
-		} else {
-			SWFUpload.Console.writeLine(message);
-		}
-	}
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-	var console, documentForm;
-
-	try {
-		console = document.getElementById("SWFUpload_Console");
-
-		if (!console) {
-			documentForm = document.createElement("form");
-			document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-			console = document.createElement("textarea");
-			console.id = "SWFUpload_Console";
-			console.style.fontFamily = "monospace";
-			console.setAttribute("wrap", "off");
-			console.wrap = "off";
-			console.style.overflow = "auto";
-			console.style.width = "700px";
-			console.style.height = "350px";
-			console.style.margin = "5px";
-			documentForm.appendChild(console);
-		}
-
-		console.value += message + "\n";
-
-		console.scrollTop = console.scrollHeight - console.clientHeight;
-	} catch (ex) {
-		alert("Exception: " + ex.name + " Message: " + ex.message);
-	}
-};
diff --git a/lib/swfupload/swfupload.queue.js b/lib/swfupload/swfupload.queue.js
deleted file mode 100644
index 69e619da..00000000
--- a/lib/swfupload/swfupload.queue.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-	Queue Plug-in
-	
-	Features:
-		*Adds a cancelQueue() method for cancelling the entire queue.
-		*All queued files are uploaded when startUpload() is called.
-		*If false is returned from uploadComplete then the queue upload is stopped.
-		 If false is not returned (strict comparison) then the queue upload is continued.
-		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
-		 Set the event handler with the queue_complete_handler setting.
-		
-	*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.queue = {};
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.queueSettings = {};
-			
-			this.queueSettings.queue_cancelled_flag = false;
-			this.queueSettings.queue_upload_count = 0;
-			
-			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
-			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
-			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
-			
-			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
-		};
-	})(SWFUpload.prototype.initSettings);
-
-	SWFUpload.prototype.startUpload = function (fileID) {
-		this.queueSettings.queue_cancelled_flag = false;
-		this.callFlash("StartUpload", [fileID]);
-	};
-
-	SWFUpload.prototype.cancelQueue = function () {
-		this.queueSettings.queue_cancelled_flag = true;
-		this.stopUpload();
-		
-		var stats = this.getStats();
-		while (stats.files_queued > 0) {
-			this.cancelUpload();
-			stats = this.getStats();
-		}
-	};
-	
-	SWFUpload.queue.uploadStartHandler = function (file) {
-		var returnValue;
-		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
-			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
-		}
-		
-		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
-		returnValue = (returnValue === false) ? false : true;
-		
-		this.queueSettings.queue_cancelled_flag = !returnValue;
-
-		return returnValue;
-	};
-	
-	SWFUpload.queue.uploadCompleteHandler = function (file) {
-		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
-		var continueUpload;
-		
-		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
-			this.queueSettings.queue_upload_count++;
-		}
-
-		if (typeof(user_upload_complete_handler) === "function") {
-			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
-		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
-			// If the file was stopped and re-queued don't restart the upload
-			continueUpload = false;
-		} else {
-			continueUpload = true;
-		}
-		
-		if (continueUpload) {
-			var stats = this.getStats();
-			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
-				this.startUpload();
-			} else if (this.queueSettings.queue_cancelled_flag === false) {
-				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
-				this.queueSettings.queue_upload_count = 0;
-			} else {
-				this.queueSettings.queue_cancelled_flag = false;
-				this.queueSettings.queue_upload_count = 0;
-			}
-		}
-	};
-}
\ No newline at end of file
diff --git a/lib/swfupload/swfupload.swf b/lib/swfupload/swfupload.swf
deleted file mode 100644
index e3f76703..00000000
Binary files a/lib/swfupload/swfupload.swf and /dev/null differ
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
index 052990d5..1c07f93e 100644
--- a/modules/gallery/tests/Gallery_Filters.php
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -43,7 +43,6 @@ class GalleryCodeFilterIterator extends FilterIterator {
       strpos($path_name, MODPATH . "unit_test") !== false ||
       strpos($path_name, MODPATH . "exif/lib") !== false ||
       strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
-      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
       strpos($path_name, SYSPATH) !== false ||
       strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
       substr($path_name, -1, 1) == "~");
-- 
cgit v1.2.3


From 3ff91e5e33eee7a3f4941a8036c71089d0f2074e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Aug 2010 10:05:21 -0700
Subject: Null out Item_Model::$data_file in Item_Model::save() when we're
 creating a new item, else the item_created event will trigger subsequent
 saves which will think that they need to post an item_updated_data_file
 event.  Partial fix for #1286

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

(limited to 'modules')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index c4591279..1db766e9 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -411,7 +411,9 @@ class Item_Model extends ORM_MPTT {
         }
 
         // This will almost definitely trigger another save, so put it at the end so that we're
-        // tail recursive.
+        // tail recursive.  Null out the data file variable first, otherwise the next save will
+        // trigger an item_updated_data_file event.
+        $this->data_file = null;
         module::event("item_created", $this);
       } else {
         // Update an existing item
-- 
cgit v1.2.3


From 7a5301ba0546b9ee461689246f5ab9f86da8be03 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Aug 2010 10:09:14 -0700
Subject: Notifying on item_updated is overbroad.  Fix for ticket #1286.

---
 modules/notification/helpers/notification_event.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index df9dbe48..5cd10de8 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -21,15 +21,6 @@ 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) {
-    try {
-      notification::send_item_updated($original, $new);
-    } catch (Exception $e) {
-      Kohana_Log::add("error", "@todo notification_event::item_updated() failed");
-      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
-    }
-  }
-
   static function item_created($item) {
     try {
       notification::send_item_add($item);
-- 
cgit v1.2.3


From 922b810c56bc42a5d3df957cae82c0e70642f8fa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 28 Aug 2010 21:25:09 -0700
Subject: Oops, forgot to create an install() function and set the version of
 the organize module to 2 in 8fb56abf034dd1f5c561e7af12bf6e097a3de6f6

---
 installer/install.sql                           | 2 +-
 modules/organize/helpers/organize_installer.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index c6314aa7..058bc882 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -247,7 +247,7 @@ CREATE TABLE {modules} (
 INSERT INTO {modules} VALUES (1,1,'gallery',34,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',1,4);
+INSERT INTO {modules} VALUES (4,1,'organize',2,4);
 INSERT INTO {modules} VALUES (5,1,'info',1,5);
 INSERT INTO {modules} VALUES (6,1,'rest',3,6);
 INSERT INTO {modules} VALUES (7,1,'rss',1,7);
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index bbe6fc65..12d8147f 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -22,6 +22,10 @@ class organize_installer {
     site_status::clear("organize_needs_rest");
   }
 
+  static function install() {
+    module::set_version("organize", $version = 2);
+  }
+
   static function upgrade($version) {
     if ($version == 1) {
       if (!module::is_active("rest")) {
-- 
cgit v1.2.3


From a08cd0db4e0b90bd625b8c4c608c41a4c41721d1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 28 Aug 2010 21:57:54 -0700
Subject: Add a "visible_title_length" variable that defaults to 15 and use
 that as the max title length when we do title truncation in the wind theme.
 Bump the gallery module to 35.

---
 installer/install.sql                         |  5 +++--
 modules/gallery/helpers/gallery_installer.php |  8 +++++++-
 modules/gallery/module.info                   |  2 +-
 themes/wind/views/page.html.php               | 15 +++++++++------
 4 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 058bc882..3e67a07a 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',34,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',35,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -412,6 +412,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','simultaneous_upload_limit','5');
 INSERT INTO {vars} VALUES (NULL,'gallery','admin_area_timeout','5400');
 INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
+INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','15');
 INSERT INTO {vars} VALUES (NULL,'gallery','date_time_format','Y-M-d H:i:s');
 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\";}}');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 569c5118..9aabf22b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -300,7 +300,8 @@ class gallery_installer {
     module::set_var("gallery", "simultaneous_upload_limit", 5);
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
     module::set_var("gallery", "maintenance_mode", 0);
-    module::set_version("gallery", 34);
+    module::set_var("gallery", "visible_title_length", 15);
+    module::set_version("gallery", 35);
   }
 
   static function upgrade($version) {
@@ -584,6 +585,11 @@ class gallery_installer {
       $db->query("ALTER TABLE {access_caches} ADD KEY (`item_id`)");
       module::set_version("gallery", $version = 34);
     }
+
+    if ($version == 34) {
+      module::set_var("gallery", "visible_title_length", 15);
+      module::set_version("gallery", $version = 35);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 084a0945..94942840 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 34
+version = 35
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 9f94b04f..3c4f6ef5 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -101,19 +101,22 @@
           <? $i = 0 ?>
           <? foreach ($parents as $parent): ?>
           <li<? if ($i == 0) print " class=\"g-first\"" ?>>
-            <!-- Adding ?show=<id> causes Gallery3 to display the page
-                 containing that photo.  For now, we just do it for
-                 the immediate parent so that when you go back up a
-                 level you're on the right page. -->
+            <? // Adding ?show=<id> causes Gallery3 to display the page
+               // containing that photo.  For now, we just do it for
+               // the immediate parent so that when you go back up a
+               // level you're on the right page. ?>
             <a href="<?= $parent->url($parent == $theme->item()->parent() ?
                      "show={$theme->item()->id}" : null) ?>">
-              <?= html::purify(text::limit_chars($parent->title, 15)) ?>
+              <!-- limit the title length to something reasonable (defaults to 15) -->
+              <?= html::purify(text::limit_chars($parent->title,
+                    module::get_var("gallery", "visible_title_length"))) ?>
             </a>
           </li>
           <? $i++ ?>
           <? endforeach ?>
           <li class="g-active<? if ($i == 0) print " g-first" ?>">
-            <?= html::purify(text::limit_chars($theme->item()->title, 15)) ?>
+            <?= html::purify(text::limit_chars($theme->item()->title,
+                  module::get_var("gallery", "visible_title_length"))) ?>
           </li>
         </ul>
         <? endif ?>
-- 
cgit v1.2.3


From efa1fce9de1acc126ce0f2f607cf568e1f6a43af Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 29 Aug 2010 10:28:50 -0700
Subject: Update the Organize flash object with the fixes for ticket #1174.

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 145162 -> 148700 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index f64c0c26..87ea485c 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 6a13a238bbd2dea9198ac4682faeba18eb6af4a9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 11:45:27 -0700
Subject: Convert the "parents" variable from a result iterator to an array so
 that the theme can call empty() on it.  Fixes #1318.

---
 modules/gallery/controllers/albums.php | 2 +-
 modules/gallery/controllers/movies.php | 2 +-
 modules/gallery/controllers/photos.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index fb7d5c59..b0887195 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -68,7 +68,7 @@ class Albums_Controller extends Items_Controller {
     $template->set_global("item", $album);
     $template->set_global("children", $album->viewable()->children($page_size, $offset));
     $template->set_global("children_count", $children_count);
-    $template->set_global("parents", $album->parents());
+    $template->set_global("parents", $album->parents()->as_array()); // view calls empty() on this
     $template->content = new View("album.html");
 
     // We can't use math in ORM or the query builder, so do this by hand.  It's important
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 02d2a497..717eb8aa 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -41,7 +41,7 @@ class Movies_Controller extends Items_Controller {
     $template->set_global("item", $movie);
     $template->set_global("children", array());
     $template->set_global("children_count", 0);
-    $template->set_global("parents", $movie->parents());
+    $template->set_global("parents", $movie->parents()->as_array());
     $template->set_global("next_item", $next_item);
     $template->set_global("previous_item", $previous_item);
     $template->set_global("sibling_count", $movie->parent()->viewable()->children_count($where));
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 8377e6c7..b22ac8e5 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -41,7 +41,7 @@ class Photos_Controller extends Items_Controller {
     $template->set_global("item", $photo);
     $template->set_global("children", array());
     $template->set_global("children_count", 0);
-    $template->set_global("parents", $photo->parents());
+    $template->set_global("parents", $photo->parents()->as_array());
     $template->set_global("next_item", $next_item);
     $template->set_global("previous_item", $previous_item);
     $template->set_global("sibling_count", $photo->parent()->viewable()->children_count($where));
-- 
cgit v1.2.3


From a184142d6f3fc9b790e58d44606ff1576891a6ee Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 11:56:21 -0700
Subject: Revert "Update the Organize flash object with the fixes for ticket
 #1174."

This commit reintroduces the bug in https://sourceforge.net/apps/trac/gallery/ticket/1305

This reverts commit efa1fce9de1acc126ce0f2f607cf568e1f6a43af.
---
 modules/organize/lib/Gallery3WebClient.swf | Bin 148700 -> 145162 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index 87ea485c..f64c0c26 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From de93507d1387aa2245801ce9279b6b8985b1a250 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 12:10:20 -0700
Subject: Regenerated version from
 http://github.com/gallery/gallery3-flex/commit/1e42ddf6574d7632474b8cfbd5b9171a9bb53552

which contains fixes for both #1174 and #1305.
---
 modules/organize/lib/Gallery3WebClient.swf | Bin 145162 -> 145857 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index f64c0c26..674e775c 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 24b511b44a0f2a7bce575a6dad9c88f9ef257648 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:03:09 -0700
Subject: Move theme::get_edit_form_admin into admin_theme_options since that's
 the only place where it's used and the theme helper is loaded on every page
 view.

---
 .../gallery/controllers/admin_theme_options.php    | 37 ++++++++++++++++++++--
 modules/gallery/helpers/theme.php                  | 33 -------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 15a42ee5..781d6e62 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -22,14 +22,14 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->page_title = t("Theme options");
     $view->content = new View("admin_theme_options.html");
-    $view->content->form = theme::get_edit_form_admin();
+    $view->content->form = $this->_get_edit_form_admin();
     print $view;
   }
 
   public function save() {
     access::verify_csrf();
 
-    $form = theme::get_edit_form_admin();
+    $form = $this->_get_edit_form_admin();
     if ($form->validate()) {
       module::set_var("gallery", "page_size", $form->edit_theme->page_size->value);
 
@@ -70,5 +70,38 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       print $view;
     }
   }
+
+  private function _get_edit_form_admin() {
+    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form"));
+    $group = $form->group("edit_theme")->label(t("Theme layout"));
+    $group->input("page_size")->label(t("Items per page"))->id("g-page-size")
+      ->rules("required|valid_digit")
+      ->error_messages("required", t("You must enter a number"))
+      ->error_messages("valid_digit", t("You must enter a number"))
+      ->value(module::get_var("gallery", "page_size"));
+    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
+      ->rules("required|valid_digit")
+      ->error_messages("required", t("You must enter a number"))
+      ->error_messages("valid_digit", t("You must enter a number"))
+      ->value(module::get_var("gallery", "thumb_size"));
+    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size")
+      ->rules("required|valid_digit")
+      ->error_messages("required", t("You must enter a number"))
+      ->error_messages("valid_digit", t("You must enter a number"))
+      ->value(module::get_var("gallery", "resize_size"));
+    $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
+      ->value(module::get_var("gallery", "header_text"));
+    $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
+      ->value(module::get_var("gallery", "footer_text"));
+    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
+      ->checked(module::get_var("gallery", "show_credits"));
+
+    module::event("theme_edit_form", $form);
+
+    $group = $form->group("buttons")
+      ->set_attr("style","border: none");
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
 }
 
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 9df3eaf2..1dc1f3b6 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -77,39 +77,6 @@ class theme_Core {
     $config->set("core.modules", $modules);
   }
 
-  static function get_edit_form_admin() {
-    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form"));
-    $group = $form->group("edit_theme")->label(t("Theme layout"));
-    $group->input("page_size")->label(t("Items per page"))->id("g-page-size")
-      ->rules("required|valid_digit")
-      ->error_messages("required", t("You must enter a number"))
-      ->error_messages("valid_digit", t("You must enter a number"))
-      ->value(module::get_var("gallery", "page_size"));
-    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
-      ->rules("required|valid_digit")
-      ->error_messages("required", t("You must enter a number"))
-      ->error_messages("valid_digit", t("You must enter a number"))
-      ->value(module::get_var("gallery", "thumb_size"));
-    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size")
-      ->rules("required|valid_digit")
-      ->error_messages("required", t("You must enter a number"))
-      ->error_messages("valid_digit", t("You must enter a number"))
-      ->value(module::get_var("gallery", "resize_size"));
-    $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
-      ->value(module::get_var("gallery", "header_text"));
-    $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
-      ->value(module::get_var("gallery", "footer_text"));
-    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
-      ->checked(module::get_var("gallery", "show_credits"));
-
-    module::event("theme_edit_form", $form);
-
-    $group = $form->group("buttons")
-      ->set_attr("style","border: none");
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
   static function get_info($theme_name) {
     $theme_name = preg_replace("/[^a-zA-Z0-9\._-]/", "", $theme_name);
     $file = THEMEPATH . "$theme_name/theme.info";
-- 
cgit v1.2.3


From 4c8445852d0657d8c598d38096852b49e4672638 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:26:27 -0700
Subject: Bump gallery module to v36 and add a favicon_url variable, which we
 expose in Admin > Appearance > Theme Options and defaults to
 lib/images/favicon.ico.

Thix fixes ticket #1312.
---
 installer/install.sql                               | 5 +++--
 modules/gallery/controllers/admin_theme_options.php | 4 ++++
 modules/gallery/helpers/gallery_installer.php       | 8 +++++++-
 modules/gallery/module.info                         | 2 +-
 themes/admin_wind/views/admin.html.php              | 2 +-
 themes/wind/views/page.html.php                     | 2 +-
 6 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 3e67a07a..e08c4128 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',35,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',36,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=45 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -414,6 +414,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','maintenance_mode','0');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','visible_title_length','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','choose_default_tookit','1');
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 781d6e62..58ed723e 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -58,6 +58,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       module::set_var("gallery", "header_text", $form->edit_theme->header_text->value);
       module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
       module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
+      module::set_var("gallery", "favicon_url", $form->edit_theme->favicon_url->value);
 
       module::event("theme_edit_form_completed", $form);
 
@@ -89,6 +90,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       ->error_messages("required", t("You must enter a number"))
       ->error_messages("valid_digit", t("You must enter a number"))
       ->value(module::get_var("gallery", "resize_size"));
+    $group->input("favicon_url")->label(t("URL (or relative path) to your favicon.ico"))
+      ->id("g-favicon")
+      ->value(module::get_var("gallery", "favicon_url"));
     $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
       ->value(module::get_var("gallery", "header_text"));
     $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 9aabf22b..d1bfa656 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -301,7 +301,8 @@ class gallery_installer {
     module::set_var("gallery", "admin_area_timeout", 90 * 60);
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
-    module::set_version("gallery", 35);
+    module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
+    module::set_version("gallery", 36);
   }
 
   static function upgrade($version) {
@@ -590,6 +591,11 @@ class gallery_installer {
       module::set_var("gallery", "visible_title_length", 15);
       module::set_version("gallery", $version = 35);
     }
+
+    if ($version == 35) {
+      module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
+      module::set_version("gallery", $version = 36);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 94942840..44da9f2f 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 35
+version = 36
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 6b0c3fe5..c4b51f41 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -11,7 +11,7 @@
         <?= t("Admin dashboard") ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
 
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 3c4f6ef5..4938ed60 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -23,7 +23,7 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
-- 
cgit v1.2.3


From 201883101595d5954cf45ffac6e2c376e5ecce35 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:39:01 -0700
Subject: 1) Rename "Cancel All" -> "Cancel uploads" to clarify what we're   
 talking about and follow our capitalization standards. 2) Grey out the Done
 button when uploads are in progress. Fixes ticket #1302.

---
 modules/gallery/views/form_uploadify.html.php         | 9 +++++++++
 modules/gallery/views/form_uploadify_buttons.html.php | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 9bd02f9b..96cc0e26 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -21,12 +21,18 @@
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onClearQueue: function(event) {
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onComplete: function(event, queueID, fileObj, response, data) {
@@ -71,6 +77,9 @@
           $("#g-upload-cancel-all")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
+          $("#g-upload-done")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
         }
         return true;
       }
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index d88bb6aa..98729bd7 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -4,5 +4,5 @@
   <?= t("Done") ?>
 </button>
 <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
-  <?= t("Cancel All") ?>
+  <?= t("Cancel uploads") ?>
 </button>
-- 
cgit v1.2.3


From 0879a26e1c5a326c51064c412234b3fa540ed5a5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 19:55:21 -0700
Subject: Put a message in the logs when we find a string that's not
 concatenated.  Concatenating them is not easy because the two strings can
 have different quoting (single vs. double quotes) and may have to be treated
 separately in the code.

Fixes ticket #1321
---
 modules/gallery/helpers/l10n_scanner.php | 37 ++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 2287a7ba..843c74f7 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -74,10 +74,21 @@ class l10n_scanner_Core {
     unset($raw_tokens);
 
     if (!empty($func_token_list["t"])) {
-      l10n_scanner::_parse_t_calls($tokens, $func_token_list["t"], $cache);
+      $errors = l10n_scanner::_parse_t_calls($tokens, $func_token_list["t"], $cache);
+      foreach ($errors as $line => $error) {
+        Kohana_Log::add(
+          "error", "Translation scanner error.  " .
+          "file: " . substr($file, strlen(DOCROOT)) . ", line: $line, context: $error");
+      }
     }
+
     if (!empty($func_token_list["t2"])) {
-      l10n_scanner::_parse_plural_calls($tokens, $func_token_list["t2"], $cache);
+      $errors = l10n_scanner::_parse_plural_calls($tokens, $func_token_list["t2"], $cache);
+      foreach ($errors as $line => $error) {
+        Kohana_Log::add(
+          "error", "Translation scanner error.  " .
+          "file: " . substr($file, strlen(DOCROOT)) . ", line: $line, context: $error");
+      }
     }
   }
 
@@ -91,6 +102,7 @@ class l10n_scanner_Core {
   }
 
   private static function _parse_t_calls(&$tokens, &$call_list, &$cache) {
+    $errors = array();
     foreach ($call_list as $index) {
       $function_name = $tokens[$index++];
       $parens = $tokens[$index++];
@@ -103,14 +115,21 @@ class l10n_scanner_Core {
           $message = self::_escape_quoted_string($first_param[1]);
           l10n_scanner::process_message($message, $cache);
         } else {
-          // t() found, but inside is something which is not a string literal.
-          // @todo Call status callback with error filename/line.
+          if (is_array($first_param) && ($first_param[0] == T_CONSTANT_ENCAPSED_STRING)) {
+            // Malformed string literals; escalate this
+            $errors[$first_param[2]] =
+              var_export(array($function_name, $parens, $first_param, $next_token), 1);
+          } else {
+            // t() found, but inside is something which is not a string literal.  That's fine.
+          }
         }
       }
     }
+    return $errors;
   }
 
   private static function _parse_plural_calls(&$tokens, &$call_list, &$cache) {
+    $errors = array();
     foreach ($call_list as $index) {
       $function_name = $tokens[$index++];
       $parens = $tokens[$index++];
@@ -127,11 +146,17 @@ class l10n_scanner_Core {
           $plural = self::_escape_quoted_string($second_param[1]);
           l10n_scanner::process_message(array("one" => $singular, "other" => $plural), $cache);
         } else {
-          // t2() found, but inside is something which is not a string literal.
-          // @todo Call status callback with error filename/line.
+          if (is_array($first_param) && $first_param[0] == T_CONSTANT_ENCAPSED_STRING) {
+            $errors[$first_param[2]] = var_export(
+              array($function_name, $parens, $first_param,
+                    $first_separator, $second_param, $next_token), 1);
+          } else {
+            // t2() found, but inside is something which is not a string literal.  That's fine.
+          }
         }
       }
     }
+    return $errors;
   }
 
   /**
-- 
cgit v1.2.3


From 2c717b18d36f8d4ae6b7b94beeb0fd99a2984c9a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 20:04:02 -0700
Subject: Don't concatenate two strings together as an argument for t() or
 t2(); the l10n_scanner cannot parse it properly and drops those from the
 localization list.  Fixes ticket #1284.

---
 modules/g2_import/helpers/g2_import.php         | 3 +--
 modules/gallery/helpers/gallery_task.php        | 3 +--
 modules/gallery/helpers/graphics.php            | 6 ++----
 modules/gallery/libraries/IdentityProvider.php  | 6 ++----
 modules/organize/helpers/organize_event.php     | 3 +--
 modules/organize/helpers/organize_installer.php | 3 +--
 modules/organize/views/organize_dialog.html.php | 3 +--
 modules/slideshow/helpers/slideshow_event.php   | 3 +--
 8 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index f2e9dad9..3753c5f2 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -689,8 +689,7 @@ class g2_import_Core {
         $title = $g2_item->getTitle();
         $title or $title = $g2_item->getPathComponent();
         $messages[] =
-          t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " .
-            "(imported as <a href=\"%g3_url\">%title</a>)",
+          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" => $title));
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 6a1fc28a..0886aad0 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -58,8 +58,7 @@ class gallery_task_Core {
     $tasks[] = Task_Definition::factory()
       ->callback("gallery_task::fix")
       ->name(t("Fix your Gallery"))
-      ->description(t("Fix a variety of problems that might cause your Gallery to act " .
-                      "strangely.  Requires maintenance mode."))
+      ->description(t("Fix a variety of problems that might cause your Gallery to act strangely.  Requires maintenance mode."))
       ->severity(log::SUCCESS);
 
     return $tasks;
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cc4d2e76..bb085ea5 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -338,8 +338,7 @@ class graphics_Core {
         } else {
           $toolkits->imagemagick->installed = false;
           $toolkits->imagemagick->error =
-            t("ImageMagick is installed, but PHP's open_basedir restriction " .
-              "prevents Gallery from using it.");
+            t("ImageMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
         }
       } else {
         $toolkits->imagemagick->installed = false;
@@ -363,8 +362,7 @@ class graphics_Core {
         } else {
           $toolkits->graphicsmagick->installed = false;
           $toolkits->graphicsmagick->error =
-            t("GraphicsMagick is installed, but PHP's open_basedir restriction " .
-              "prevents Gallery from using it.");
+            t("GraphicsMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
         }
       } else {
         $toolkits->graphicsmagick->installed = false;
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 5f341c90..4ef07e1a 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -61,8 +61,7 @@ class IdentityProvider_Core {
    * Return a commen confirmation message
    */
   static function confirmation_message() {
-    return t("Are you sure you want to change your Identity Provider? " .
-             "Continuing will delete all existing users.");
+    return t("Are you sure you want to change your Identity Provider? Continuing will delete all existing users.");
   }
 
   static function change_provider($new_provider) {
@@ -113,8 +112,7 @@ class IdentityProvider_Core {
         }
           
         message::error(
-          t("Error attempting to enable \"%new_provider\" identity provider, " .
-            "reverted to \"%old_provider\" identity provider",
+          t("Error attempting to enable \"%new_provider\" identity provider, reverted to \"%old_provider\" identity provider",
             array("new_provider" => $new_provider, "old_provider" => $current_provider)));
         
         $restore_already_running = false;
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 1593d30e..2f997600 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -61,8 +61,7 @@ class organize_event_Core {
   static function module_change($changes) {
     if (!module::is_active("rest") || in_array("rest", $changes->deactivate)) {
       site_status::warning(
-        t("The Organize module requires the Rest module.  " .
-          "<a href=\"%url\">Activate the Rest module now</a>",
+        t("The Organize module requires the Rest module.  <a href=\"%url\">Activate the Rest module now</a>",
           array("url" => html::mark_clean(url::site("admin/modules")))),
         "organize_needs_rest");
     } else {
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index 12d8147f..2faa598b 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -30,8 +30,7 @@ class organize_installer {
     if ($version == 1) {
       if (!module::is_active("rest")) {
         site_status::warning(
-          t("The Organize module requires the Rest module.  " .
-            "<a href=\"%url\">Activate the Rest module now</a>",
+          t("The Organize module requires the Rest module.  <a href=\"%url\">Activate the Rest module now</a>",
             array("url" => html::mark_clean(url::site("admin/modules")))),
           "organize_needs_rest");
       }
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 83143f97..cafc4418 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -130,8 +130,7 @@
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="flashContent">
     <p>
-      <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " .
-            "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
+      <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
     </p>
     <a href="http://www.adobe.com/go/getflashplayer">
       <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index 6cb5d019..167fa7ff 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -27,8 +27,7 @@ class slideshow_event_Core {
   static function module_change($changes) {
     if (!module::is_active("rss") || in_array("rss", $changes->deactivate)) {
       site_status::warning(
-        t("The Slideshow module requires the RSS module.  " .
-          "<a href=\"%url\">Activate the RSS module now</a>",
+        t("The Slideshow module requires the RSS module.  <a href=\"%url\">Activate the RSS module now</a>",
           array("url" => html::mark_clean(url::site("admin/modules")))),
         "slideshow_needs_rss");
     } else {
-- 
cgit v1.2.3


From ab598b2931dbff1165e66bc271e6b49166fe0a7e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 21:15:58 -0700
Subject: Put the theme CSS at the end of the module CSS so that the theme has
 the final say.  Fixes ticket #1315.

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

(limited to 'modules')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 46291005..7a6bc1da 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -236,6 +236,13 @@ class Theme_View_Core extends Gallery_View {
     case "thumb_bottom":
     case "thumb_info":
     case "thumb_top":
+      if ($function == "head") {
+        // Stash any CSS we have already; that came from the theme and we want theme CSS to
+        // override module CSs
+        $save_css = $this->css;
+        $this->css = array();
+      }
+
       $blocks = array();
       if (method_exists("gallery_theme", $function)) {
         switch (count($args)) {
@@ -275,6 +282,8 @@ class Theme_View_Core extends Gallery_View {
       }
 
       if ($function == "head") {
+        // Merge the theme CSS/JS at the end
+        $this->css = array_merge($this->css, $save_css);
         array_unshift($blocks, $this->combine_files($this->css, "css"));
         array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
       }
-- 
cgit v1.2.3


From fcd4f77bb4a7dcbd90df645e52817f3ff7e87712 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 21:26:25 -0700
Subject: Reformat comment.

---
 modules/g2_import/controllers/g2.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 2c6ad1b4..d260c9b4 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -35,12 +35,9 @@ class G2_Controller extends Controller {
     $id = $input->get("g2_itemId");
 
     if ($id) {
-      // Requests by id are either core.DownloadItem or
-      // core.ShowItem requests.
-      // Later versions of Gallery 2 don't specify g2_view if
-      // it's the default (core.ShowItem).
-      // And in some cases (bbcode, embedding) people are using
-      // the id style URLs although URL rewriting is enabled.
+      // Requests by id are either core.DownloadItem or core.ShowItem requests. Later versions of
+      // Gallery 2 don't specify g2_view if it's the default (core.ShowItem). And in some cases
+      // (bbcode, embedding) people are using the id style URLs although URL rewriting is enabled.
       $where = array(array("g2_id", "=", $id));
       $view = $input->get("g2_view");
       if ($view) {
-- 
cgit v1.2.3


From e881693798224f150e577f6b71131d712faf6a7c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 21:29:36 -0700
Subject: Remember which comments we imported and don't import them a second
 time.  Fixes ticket #1282.

---
 modules/g2_import/helpers/g2_import.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 3753c5f2..f2404f60 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -845,6 +845,11 @@ class g2_import_Core {
                array("id" => $g2_comment_id, "exception" => (string)$e));
     }
 
+    if (self::map($g2_comment->getId())) {
+      // Already imported
+      return;
+    }
+
     $item_id = self::map($g2_comment->getParentId());
     if (empty($item_id)) {
       // Item was not mapped.
@@ -877,6 +882,8 @@ class g2_import_Core {
           $e);
     }
 
+    self::set_map($g2_comment->getId(), $comment->id, "comment");
+
     // Backdate the creation date.  We can't do this at creation time because
     // Comment_Model::save() will override it.
     db::update("comments")
-- 
cgit v1.2.3


From 3707d4e94fc46fb3b92c399111ef6fc7f351aaba Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 21:50:25 -0700
Subject: Properly identify the base G2 url when G2 isn't using the rewrite
 module.  Fixes ticket #1322.

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

(limited to 'modules')

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index f2404f60..c3737f8f 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -178,7 +178,17 @@ class g2_import_Core {
            "module", "rewrite", "modrewrite.embeddedLocation", $g2_embed_location));
       g2($gallery->getStorage()->checkPoint());
     }
-    self::$g2_base_url = $g2_embed_location;
+
+    if ($g2_embed_location) {
+      self::$g2_base_url = $g2_embed_location;
+    } else {
+      self::$g2_base_url = $GLOBALS["gallery"]->getUrlGenerator()->generateUrl(
+        array(),
+        array("forceSessionId" => false,
+              "htmlEntities" => false,
+              "urlEncode" => false,
+              "useAuthToken" => false));
+    }
 
     return true;
   }
-- 
cgit v1.2.3


From bc0d5e79cbf02a2b51c196c0105677a316e0c8bc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 23:09:52 -0700
Subject: Revert "Change the theme option page to display using tabs if the
 site theme has an admin page."

This reverts commit d66c496fb1007bbd0b1640496808000c573d95fd.

Conflicts:

	modules/gallery/helpers/theme.php
	modules/gallery/views/admin_theme_options.html.php
	themes/admin_wind/css/screen.css
---
 .../gallery/controllers/admin_theme_options.php    |  3 +--
 modules/gallery/views/admin_theme_options.html.php | 31 ----------------------
 themes/admin_wind/css/screen.css                   | 20 --------------
 3 files changed, 1 insertion(+), 53 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 58ed723e..57f32f96 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -102,8 +102,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
     module::event("theme_edit_form", $form);
 
-    $group = $form->group("buttons")
-      ->set_attr("style","border: none");
+    $group = $form->group("buttons");
     $group->submit("")->value(t("Save"));
     return $form;
   }
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index b4a90682..e452913e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,35 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#g-theme-options-form").ready(function() {
-     var contents = $("#g-theme-options-form fieldset:not(:last-child)");
-     if (contents.length > 1) {
-       $("<div id='g-theme-options-form-tabs'>" +
-         "  <ul class='tabnav'></ul>" +
-         "</div>").insertBefore("#g-theme-options-form fieldset:last-child");
-       $(contents).each(function(index) {
-         var text = $("legend", this).text();
-         var tabId = "tab_" + index;
-         var tabContentId = "tab_content_" + index;
-         if (text == "") {
-           text = <?= t("Tab_")->for_js() ?> + index;
-         }
-         $(".tabnav").append(
-           "<li><a id='" + tabId + "' href='#" + tabContentId + "'>" + text + "</a></li>");
-         $("#g-theme-options-form-tabs").append(
-           "<div id='" + tabContentId + "' class='tabdiv'></div>");
-         if ($("li.g-error", this).length > 0) {
-           $("#" + tabId).addClass("g-error");
-         }
-         $("#" + tabContentId).append($("ul", this));
-         $(this).remove();
-       });
-       $("#g-theme-options-form-tabs").tabs({});
-     } else {
-       $("#g-theme-options-form fieldset:first legend").hide();
-     }
-  });
-</script>
-
 <div class="g-block">
   <h1> <?= t("Theme options") ?> </h1>
   <div class="g-block-content">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2ea60402..81b1a896 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -399,26 +399,6 @@ th {
   background-color: #FFF;
 }
 
-/* Theme options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-theme-options-form {
-  border: 1px solid #a6c9e2;
-}
-#g-theme-options-form-tabs {
-  border: none !important;
-}
-#g-theme-options-form fieldset {
-  border: none;
-}
-
-.ui-tabs .ui-tabs-nav li a {
-  padding: 0 1em;
-}
-
-.ui-tabs .ui-tabs-nav li a.g-error {
-  background: none no-repeat scroll 0 0 transparent;
-  color: #FF0000 !important;
-}
-
 /* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
 #g-share-translations-form fieldset {
   border: 0px;
-- 
cgit v1.2.3


From 0f2daf29acc051e7fe79abc625406684e9da8196 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 30 Aug 2010 22:05:01 -0700
Subject: Fix for ticket #1320.  Hook the loading of the initial albums and
 check to see if the loaded item is the requested item.

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 148700 -> 148793 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index 87ea485c..eee45e08 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From 953d63555c0ddc387eed08af7f23e4180c13ecc6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 30 Aug 2010 22:19:57 -0700
Subject: Detect Flash and put up a reasonable message if your browser doesn't
 have Flash installed.  Fixes ticket #1268.

---
 modules/gallery/views/form_uploadify.html.php      | 230 +++++++++++----------
 .../gallery/views/form_uploadify_buttons.html.php  |  12 +-
 2 files changed, 131 insertions(+), 111 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 96cc0e26..2ed7912f 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -2,126 +2,144 @@
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
 <script type="text/javascript">
+  <? $flash_minimum_version = "9.0.24" ?>
   $("#g-add-photos-canvas").ready(function () {
-    $("#g-uploadify").uploadify({
-      width: 150,
-      height: 33,
-      uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
-      script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
-      scriptData: <?= json_encode($script_data) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
-      fileDesc: <?= t("Photos and movies")->for_js() ?>,
-      cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
-      simUploadLimit: <?= $simultaneous_upload_limit ?>,
-      wmode: "transparent",
-      hideButton: true, /* should be true */
-      auto: true,
-      multi: true,
-      onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
-        $("#g-upload-cancel-all")
-          .addClass("ui-state-disabled")
-          .attr("disabled", "disabled");
-        $("#g-upload-done")
-          .removeClass("ui-state-disabled")
-          .attr("disabled", null);
-        return true;
-      },
-      onClearQueue: function(event) {
-        $("#g-upload-cancel-all")
-          .addClass("ui-state-disabled")
-          .attr("disabled", "disabled");
-        $("#g-upload-done")
-          .removeClass("ui-state-disabled")
-          .attr("disabled", null);
-        return true;
-      },
-      onComplete: function(event, queueID, fileObj, response, data) {
-        var re = /^error: (.*)$/i;
-        var msg = re.exec(response);
-        if (msg) {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
-        } else {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
-        }
-        return true;
-      },
-      onError: function(event, queueID, fileObj, errorObj) {
-        var msg = " - ";
-        if (errorObj.type == "HTTP") {
-          if (errorObj.info == "500") {
-            msg += <?= t("Unable to process this file")->for_js() ?>;
-            // Server error - check server logs
-          } else if (errorObj.info == "404") {
-            msg += <?= t("The upload script was not found.")->for_js() ?>;
-            // Server script not found
-          } else {
-            // Server Error: status: errorObj.info
-            msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
-          }
-        } else if (errorObj.type == "File Size") {
-          var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
-          msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
-        } else {
-          msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
-            .replace("__INFO__", errorObj.info)
-            .replace("__TYPE__", errorObj.type));
-        }
-        $("#g-add-photos-status ul").append(
-          "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
-        $("#g-uploadify" + queueID).remove();
-      },
-      onSelect: function(event) {
-        if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
+    if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
+      $("#g-uploadify").uploadify({
+        width: 150,
+        height: 33,
+        uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
+        script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
+        scriptData: <?= json_encode($script_data) ?>,
+        fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
+        fileDesc: <?= t("Photos and movies")->for_js() ?>,
+        cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
+        simUploadLimit: <?= $simultaneous_upload_limit ?>,
+        wmode: "transparent",
+        hideButton: true, /* should be true */
+        auto: true,
+        multi: true,
+        onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
           $("#g-upload-cancel-all")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
+          $("#g-upload-done")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
-          $("#g-upload-done")
+          return true;
+        },
+        onClearQueue: function(event) {
+          $("#g-upload-cancel-all")
             .addClass("ui-state-disabled")
             .attr("disabled", "disabled");
+          $("#g-upload-done")
+            .removeClass("ui-state-disabled")
+            .attr("disabled", null);
+          return true;
+        },
+        onComplete: function(event, queueID, fileObj, response, data) {
+          var re = /^error: (.*)$/i;
+          var msg = re.exec(response);
+          if (msg) {
+            $("#g-add-photos-status ul").append(
+              "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
+          } else {
+            $("#g-add-photos-status ul").append(
+              "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
+          }
+          return true;
+        },
+        onError: function(event, queueID, fileObj, errorObj) {
+          var msg = " - ";
+          if (errorObj.type == "HTTP") {
+            if (errorObj.info == "500") {
+              msg += <?= t("Unable to process this file")->for_js() ?>;
+              // Server error - check server logs
+            } else if (errorObj.info == "404") {
+              msg += <?= t("The upload script was not found.")->for_js() ?>;
+              // Server script not found
+            } else {
+              // Server Error: status: errorObj.info
+              msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
+            }
+          } else if (errorObj.type == "File Size") {
+            var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
+            msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
+          } else {
+            msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
+              .replace("__INFO__", errorObj.info)
+              .replace("__TYPE__", errorObj.type));
+          }
+          $("#g-add-photos-status ul").append(
+            "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
+          $("#g-uploadify" + queueID).remove();
+        },
+        onSelect: function(event) {
+          if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
+            $("#g-upload-cancel-all")
+              .removeClass("ui-state-disabled")
+              .attr("disabled", null);
+            $("#g-upload-done")
+              .addClass("ui-state-disabled")
+              .attr("disabled", "disabled");
+          }
+          return true;
         }
-        return true;
-      }
-    });
+      });
+    } else {
+      $(".requires-flash").hide();
+      $(".no-flash").show();
+    }
   });
 </script>
 
-<? if ($suhosin_session_encrypt || !$movies_allowed): ?>
-<div class="g-message-block g-info">
-  <? if ($suhosin_session_encrypt): ?>
-  <p class="g-error">
-    <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
-        array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
-    "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
-  </p>
-  <? endif ?>
+<div class="requires-flash">
+  <? if ($suhosin_session_encrypt || !$movies_allowed): ?>
+  <div class="g-message-block g-info">
+    <? if ($suhosin_session_encrypt): ?>
+    <p class="g-error">
+      <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
+          array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
+      "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
+    </p>
+    <? endif ?>
 
-  <? if (!$movies_allowed): ?>
-  <p class="g-warning">
-    <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
-  </p>
+    <? if (!$movies_allowed): ?>
+    <p class="g-warning">
+      <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
+    </p>
+    <? endif ?>
+  </div>
   <? endif ?>
+
+  <div>
+    <p>
+      <?= t("Photos will be uploaded to album: ") ?>
+    </p>
+    <ul class="g-breadcrumbs ui-helper-clearfix">
+      <? foreach ($album->parents() as $i => $parent): ?>
+      <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
+      <? endforeach ?>
+      <li class="g-active"> <?= html::purify($album->title) ?> </li>
+    </ul>
+  </div>
+
+  <div id="g-add-photos-canvas">
+    <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
+    <span id="g-uploadify"></span>
+  </div>
+  <div id="g-add-photos-status">
+    <ul id="g-action-status" class="g-message-block">
+    </ul>
+  </div>
 </div>
-<? endif ?>
 
-<div>
+<div class="no-flash" style="display: none">
   <p>
-    <?= t("Photos will be uploaded to album: ") ?>
+    <?= t("Your browser must have Adobe Flash Player version %flash_minimum_version or greater installed to use this feature.", array("flash_minimum_version" => $flash_minimum_version)) ?>
   </p>
-  <ul class="g-breadcrumbs ui-helper-clearfix">
-    <? foreach ($album->parents() as $i => $parent): ?>
-    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
-    <? endforeach ?>
-    <li class="g-active"> <?= html::purify($album->title) ?> </li>
-  </ul>
-</div>
-
-<div id="g-add-photos-canvas">
-  <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
-  <span id="g-uploadify"></span>
-</div>
-<div id="g-add-photos-status">
-  <ul id="g-action-status" class="g-message-block">
-  </ul>
+  <a href="http://www.adobe.com/go/getflashplayer">
+    <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
+         alt=<?= t("Get Adobe Flash Player")->for_js() ?> />
+  </a>
 </div>
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index 98729bd7..ce4d989c 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -1,8 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<!-- Proxy the done request back to our form, since its been ajaxified -->
-<button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
+<div class="requires-flash">
+  <!-- Proxy the done request back to our form, since its been ajaxified -->
+  <button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
   <?= t("Done") ?>
-</button>
-<button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
+  </button>
+  <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
   <?= t("Cancel uploads") ?>
-</button>
+  </button>
+</div>
-- 
cgit v1.2.3


From 5568ab24decd31e185fa1b19d29838ec3b30e570 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 30 Aug 2010 22:21:00 -0700
Subject: Normalize the "flash missing" message string with the one in the
 uploader for convenient localization.

---
 modules/organize/views/organize_dialog.html.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cafc4418..b76813ad 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -1,10 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <style type="text/css" media="screen">
-  #flashContent {
-  //display:none;
-  }
-
   .g-organize {
     padding: 0;
     margins: 0;
@@ -21,10 +17,10 @@
 </style>
 
 <script type="text/javascript">
-      $("#g-dialog").bind("dialogclose", function(event, ui) {
-        // @todo do a call to organize/closing to end the batch
-        window.location.reload();
-      });
+  $("#g-dialog").bind("dialogclose", function(event, ui) {
+    // @todo do a call to organize/closing to end the batch
+    window.location.reload();
+  });
 
   function closeOrganizeDialog() {
     $("#g-dialog").dialog("close");
@@ -130,7 +126,7 @@
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="flashContent">
     <p>
-      <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
+      <?= t("Your browser must have Adobe Flash Player version %flash_minimum_version or greater installed to use this feature.", array("flash_minimum_version" => $flash_minimum_version)) ?>
     </p>
     <a href="http://www.adobe.com/go/getflashplayer">
       <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
-- 
cgit v1.2.3


From 9bc84b69863495a7977f63bf5b60fcb1e9811e49 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 30 Aug 2010 22:43:25 -0700
Subject: Clean up the default case in the OrganizeProperties::getProperty
 method

---
 modules/organize/lib/Gallery3WebClient.swf | Bin 148793 -> 148799 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'modules')

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index eee45e08..b82c8a42 100644
Binary files a/modules/organize/lib/Gallery3WebClient.swf and b/modules/organize/lib/Gallery3WebClient.swf differ
-- 
cgit v1.2.3


From db769b76ab7b7ed54579225fca836defc7afbd11 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 31 Aug 2010 00:03:46 -0700
Subject: Expire completed uploads and introduce a text message that says how
 many photos have been uploaded successfully.  This is to pave the way for
 retry code later on.

---
 modules/gallery/controllers/uploader.php           |  8 ++++++
 modules/gallery/css/gallery.css                    |  4 +++
 modules/gallery/views/form_uploadify.html.php      | 32 +++++++++++++++++-----
 .../gallery/views/form_uploadify_buttons.html.php  |  1 +
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 85d344d6..fb496f60 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -102,6 +102,14 @@ class Uploader_Controller extends Controller {
     }
   }
 
+  public function status($success_count, $error_count) {
+    // The "errors" won't be properly pluralized :-/
+    print t2("Uploaded %count photo (%error errors)",
+             "Uploaded %count photos (%error errors)",
+             $success_count,
+             array("error" => $error_count));
+  }
+
   public function finish() {
     access::verify_csrf();
 
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index fb72bd48..8012c6cc 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -78,6 +78,10 @@
   margin-bottom: 0
 }
 
+#g-add-photos-status-message {
+  float: right;
+}
+
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 2ed7912f..36f5f284 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -3,7 +3,24 @@
 <script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
 <script type="text/javascript">
   <? $flash_minimum_version = "9.0.24" ?>
+  var success_count = 0;
+  var error_count = 0;
+  var updating = 0;
   $("#g-add-photos-canvas").ready(function () {
+    var update_status = function() {
+      if (updating) {
+        // poor man's mutex
+        setTimeout(function() { update_status(); }, 500);
+      }
+      updating = 1;
+      $.get("<?= url::site("uploader/status/_S/_E") ?>"
+            .replace("_S", success_count).replace("_E", error_count),
+          function(data) {
+            $("#g-add-photos-status-message").html(data);
+            updating = 0;
+          });
+    };
+
     if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
       $("#g-uploadify").uploadify({
         width: 150,
@@ -40,13 +57,12 @@
         onComplete: function(event, queueID, fileObj, response, data) {
           var re = /^error: (.*)$/i;
           var msg = re.exec(response);
-          if (msg) {
-            $("#g-add-photos-status ul").append(
-              "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
-          } else {
-            $("#g-add-photos-status ul").append(
-              "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
-          }
+          $("#g-add-photos-status ul").append(
+            "<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " +
+            <?= t("Completed")->for_js() ?> + "</li>");
+          setTimeout(function() { $("#q" + queueID).slideUp("slow") }, 5000);
+          success_count++;
+          update_status();
           return true;
         },
         onError: function(event, queueID, fileObj, errorObj) {
@@ -73,6 +89,8 @@
           $("#g-add-photos-status ul").append(
             "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
           $("#g-uploadify" + queueID).remove();
+          error_count++;
+          update_status();
         },
         onSelect: function(event) {
           if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index ce4d989c..e002d82d 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -7,4 +7,5 @@
   <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
   <?= t("Cancel uploads") ?>
   </button>
+  <span id="g-add-photos-status-message" />
 </div>
-- 
cgit v1.2.3