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.
---
 modules/gallery/helpers/gallery.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/helpers/gallery.php')

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";
-- 
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/gallery/helpers/gallery.php')

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

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

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