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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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 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/gallery/views')

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