From 00eacd659f27df9c13246c510057c4f42c8866a2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 15 Oct 2009 14:37:57 -0700
Subject: Start simplifying the interface by moving the static methods from
 user.php and group.php.  Tried creating a identity helper, but the helper
 identity.php was confused with the library Identity.php.  So got around this
 by making the methods on Identity static and calling the instance within the
 static methods.  Also temporarily moved the user.php and group.php back into
 the user module.

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

(limited to 'modules/gallery/views/maintenance.html.php')

diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index f80b6e7a..dc8925b4 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -43,7 +43,7 @@
     <p>
       <?= t("This site is currently only accessible by site administrators.") ?>
     </p>
-    <?= user::get_login_form("login/auth_html") ?>
+    <?= Identity::get_login_form("login/auth_html") ?>
   </body>
 </html>
 
-- 
cgit v1.2.3


From 78ee4193b70329c8e0929efd18c22324dd2ad8e0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 16 Oct 2009 10:06:58 -0700
Subject: Remove all non Identity API methods from Identity.php.  Created an
 MY_Session class to provide the user state changes in the session and a
 login.php helper that has the login form.

---
 modules/comment/controllers/comments.php           |   8 +-
 modules/comment/helpers/comment.php                |   2 +-
 modules/comment/tests/Comment_Model_Test.php       |   2 +-
 modules/gallery/controllers/admin.php              |   2 +-
 modules/gallery/controllers/albums.php             |   6 +-
 modules/gallery/controllers/l10n_client.php        |   4 +-
 modules/gallery/controllers/login.php              |  13 ++-
 modules/gallery/controllers/logout.php             |  13 ++-
 modules/gallery/controllers/permissions.php        |   2 +-
 modules/gallery/controllers/upgrader.php           |   4 +-
 modules/gallery/controllers/welcome_message.php    |   4 +-
 modules/gallery/helpers/access.php                 |   2 +-
 modules/gallery/helpers/gallery.php                |   2 +-
 modules/gallery/helpers/gallery_event.php          |   6 +-
 modules/gallery/helpers/gallery_theme.php          |   2 +-
 modules/gallery/helpers/item.php                   |   4 +-
 modules/gallery/helpers/locales.php                |   2 +-
 modules/gallery/helpers/log.php                    |   2 +-
 modules/gallery/helpers/login.php                  |  31 ++++++
 modules/gallery/helpers/movie.php                  |   2 +-
 modules/gallery/helpers/photo.php                  |   2 +-
 modules/gallery/helpers/site_status.php            |   2 +-
 modules/gallery/helpers/task.php                   |   2 +-
 modules/gallery/libraries/Admin_View.php           |   4 +-
 modules/gallery/libraries/Identity.php             | 107 ---------------------
 modules/gallery/libraries/MY_Session.php           |  84 ++++++++++++++++
 modules/gallery/libraries/Theme_View.php           |   6 +-
 modules/gallery/tests/Access_Helper_Test.php       |   8 +-
 modules/gallery/tests/Item_Helper_Test.php         |   2 +-
 modules/gallery/tests/Photos_Controller_Test.php   |   2 +-
 modules/gallery/views/kohana_error_page.php        |   2 +-
 modules/gallery/views/maintenance.html.php         |   2 +-
 modules/notification/helpers/notification.php      |   8 +-
 .../notification/helpers/notification_event.php    |   2 +-
 modules/search/helpers/search.php                  |   4 +-
 modules/server_add/controllers/server_add.php      |   4 +-
 modules/server_add/helpers/server_add_event.php    |   2 +-
 modules/server_add/helpers/server_add_theme.php    |   2 +-
 modules/user/controllers/admin_users.php           |   6 +-
 modules/user/controllers/users.php                 |   4 +-
 modules/user/views/admin_users.html.php            |   2 +-
 41 files changed, 194 insertions(+), 176 deletions(-)
 create mode 100644 modules/gallery/helpers/login.php
 create mode 100644 modules/gallery/libraries/MY_Session.php

(limited to 'modules/gallery/views/maintenance.html.php')

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 84d6ca47..c0658cc1 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -65,7 +65,7 @@ class Comments_Controller extends REST_Controller {
     $form = comment::get_add_form($item);
     $valid = $form->validate();
     if ($valid) {
-      if (Identity::active()->guest && !$form->add_comment->inputs["name"]->value) {
+      if (Session::active_user()->guest && !$form->add_comment->inputs["name"]->value) {
         $form->add_comment->inputs["name"]->add_error("missing", 1);
         $valid = false;
       }
@@ -78,13 +78,13 @@ class Comments_Controller extends REST_Controller {
 
     if ($valid) {
       $comment = comment::create(
-        $item, Identity::active(),
+        $item, Session::active_user(),
         $form->add_comment->text->value,
         $form->add_comment->inputs["name"]->value,
         $form->add_comment->email->value,
         $form->add_comment->url->value);
 
-      $active = Identity::active();
+      $active = Session::active_user();
       if ($active->guest) {
         $form->add_comment->inputs["name"]->value("");
         $form->add_comment->email->value("");
@@ -192,7 +192,7 @@ class Comments_Controller extends REST_Controller {
    *  @see REST_Controller::form_edit($resource)
    */
   public function _form_edit($comment) {
-    if (!Identity::active()->admin) {
+    if (!Session::active_user()->admin) {
       access::forbidden();
     }
     print comment::get_edit_form($comment);
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 38d65db6..e741266d 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -75,7 +75,7 @@ class comment_Core {
     module::event("comment_add_form", $form);
     $group->submit("")->value(t("Add"));
 
-    $active = Identity::active();
+    $active = Session::active_user();
     if (!$active->guest) {
       $group->inputs["name"]->value($active->full_name)->disabled("disabled");
       $group->email->value($active->email)->disabled("disabled");
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index 76de2a34..84532a96 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -23,7 +23,7 @@ class Comment_Model_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), rand(), rand());
     $comment = comment::create($album, Identity::guest(), "text", "name", "email", "url");
-    Identity::set_active(Identity::guest());
+    Session::set_active_user(Identity::guest());
 
     // We can see the comment when permissions are granted on the album
     access::allow(Identity::everybody(), "view", $album);
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 8a4181a6..24eebe7d 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -21,7 +21,7 @@ class Admin_Controller extends Controller {
   private $theme;
 
   public function __construct($theme=null) {
-    if (!(Identity::active()->admin)) {
+    if (!(Session::active_user()->admin)) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index fdf06ec0..055ff22b 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -29,7 +29,7 @@ class Albums_Controller extends Items_Controller {
         $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = new View("login_ajax.html");
-        $view->content->form = Identity::get_login_form("login/auth_html");
+        $view->content->form = login::get_login_form("login/auth_html");
         print $view;
         return;
       } else {
@@ -111,7 +111,7 @@ class Albums_Controller extends Items_Controller {
         $this->input->post("name"),
         $this->input->post("title", $this->input->post("name")),
         $this->input->post("description"),
-        Identity::active()->id,
+        Session::active_user()->id,
         $this->input->post("slug"));
 
       log::success("content", "Created an album",
@@ -146,7 +146,7 @@ class Albums_Controller extends Items_Controller {
         $_FILES["file"]["name"],
         $this->input->post("title", $this->input->post("name")),
         $this->input->post("description"),
-        Identity::active()->id);
+        Session::active_user()->id);
 
       log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo"));
       message::success(t("Added photo %photo_title",
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index b3929c5d..2ab73102 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -20,7 +20,7 @@
 class L10n_Client_Controller extends Controller {
   public function save() {
     access::verify_csrf();
-    if (!Identity::active()->admin) {
+    if (!Session::active_user()->admin) {
       access::forbidden();
     }
 
@@ -85,7 +85,7 @@ class L10n_Client_Controller extends Controller {
 
   public function toggle_l10n_mode() {
     access::verify_csrf();
-    if (!Identity::active()->admin) {
+    if (!Session::active_user()->admin) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index c8b771ca..96a97a1d 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -21,7 +21,7 @@ class Login_Controller extends Controller {
 
   public function ajax() {
     $view = new View("login_ajax.html");
-    $view->form = Identity::get_login_form("login/auth_ajax");
+    $view->form = login::get_login_form("login/auth_ajax");
     print $view;
   }
 
@@ -40,7 +40,7 @@ class Login_Controller extends Controller {
   }
 
   public function html() {
-    print Identity::get_login_form("login/auth_html");
+    print login::get_login_form("login/auth_html");
   }
 
   public function auth_html() {
@@ -54,7 +54,7 @@ class Login_Controller extends Controller {
     }
   }
   private function _auth($url) {
-    $form = Identity::get_login_form($url);
+    $form = login::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
       $user = Identity::lookup_user_by_name($form->login->inputs["name"]->value);
@@ -69,7 +69,12 @@ class Login_Controller extends Controller {
     }
 
     if ($valid) {
-      Identity::login($user);
+      if (Identity::is_writable()) {
+        $user->login_count += 1;
+        $user->last_login = time();
+        $user->save();
+      }
+      Session::set_active_user($user);
       log::info("user", t("User %name logged in", array("name" => $user->name)));
     }
 
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
index 6841b870..058860fa 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -19,10 +19,15 @@
  */
 class Logout_Controller extends Controller {
   public function index() {
-    //access::verify_csrf();
-
-    $user = Identity::active();
-    Identity::logout();
+    $user = Session::active_user();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
     log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", html::clean($user->name)));
     if ($continue_url = $this->input->get("continue")) {
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 6b1e926f..7a06c3d3 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -74,7 +74,7 @@ class Permissions_Controller extends Controller {
 
       // If the active user just took away their own edit permissions, give it back.
       if ($perm->name == "edit") {
-        if (!access::user_can(Identity::active(), "edit", $item)) {
+        if (!access::user_can(Session::active_user(), "edit", $item)) {
           access::allow($group, $perm->name, $item);
         }
       }
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index f6ca4c8a..e0c5d340 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -40,7 +40,7 @@ class Upgrader_Controller extends Controller {
     }
 
     $view = new View("upgrader.html");
-    $view->can_upgrade = Identity::active()->admin || $session->get("can_upgrade");
+    $view->can_upgrade = Session::active_user()->admin || $session->get("can_upgrade");
     $view->upgrade_token = $upgrade_token;
     $view->available = module::available();
     $view->done = ($available_upgrades == 0);
@@ -52,7 +52,7 @@ class Upgrader_Controller extends Controller {
       // @todo this may screw up some module installers, but we don't have a better answer at
       // this time.
       $_SERVER["HTTP_HOST"] = "example.com";
-    } else if (!Identity::active()->admin && !Session::instance()->get("can_upgrade", false)) {
+    } else if (!Session::active_user()->admin && !Session::instance()->get("can_upgrade", false)) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/welcome_message.php b/modules/gallery/controllers/welcome_message.php
index c093b67d..cfdc3976 100644
--- a/modules/gallery/controllers/welcome_message.php
+++ b/modules/gallery/controllers/welcome_message.php
@@ -19,12 +19,12 @@
  */
 class Welcome_Message_Controller extends Controller {
   public function index() {
-    if (!Identity::active()->admin) {
+    if (!Session::active_user()->admin) {
       url::redirect(item::root()->abs_url());
     }
 
     $v = new View("welcome_message.html");
-    $v->user = Identity::active();
+    $v->user = Session::active_user();
     print $v;
   }
 }
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 0e0e749e..21f4de81 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -79,7 +79,7 @@ class access_Core {
    * @return boolean
    */
   static function can($perm_name, $item) {
-    return self::user_can(Identity::active(), $perm_name, $item);
+    return self::user_can(Session::active_user(), $perm_name, $item);
   }
 
   /**
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index e1fa2a7c..18bb2609 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -27,7 +27,7 @@ class gallery_Core {
   static function maintenance_mode() {
     $maintenance_mode = Kohana::config("core.maintenance_mode", false, false);
 
-    if (Router::$controller != "login" && !empty($maintenance_mode) && !Identity::active()->admin) {
+    if (Router::$controller != "login" && !empty($maintenance_mode) && !Session::active_user()->admin) {
       Router::$controller = "maintenance";
       Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
       Router::$method = "index";
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index abead9e3..a6aa0657 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -24,10 +24,10 @@ class gallery_event_Core {
    */
   static function gallery_ready() {
     // Call Identity::instance() now to force the load of the user interface classes.
-    // Identity::load_user will attempt to load the active user from the session and needs
+    // Session::load_user will attempt to load the active user from the session and needs
     // the user definition class, which can't be reached by Kohana's heiracrchical lookup.
     Identity::instance();
-    Identity::load_user();
+    Session::load_user();
     locales::set_request_locale();
   }
 
@@ -139,7 +139,7 @@ class gallery_event_Core {
         }
       }
 
-      if (Identity::active()->admin) {
+      if (Session::active_user()->admin) {
         $menu->append($admin_menu = Menu::factory("submenu")
                 ->id("admin_menu")
                 ->label(t("Admin")));
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index cc46a88a..d21cb124 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -54,7 +54,7 @@ class gallery_theme_Core {
   static function header_top($theme) {
     if ($theme->page_type != "login") {
       $view = new View("login.html");
-      $view->user = Identity::active();
+      $view->user = Session::active_user();
       return $view->render();
     }
   }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index bce83bb3..3d36a324 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -158,8 +158,8 @@ class item_Core {
    */
   static function viewable($model) {
     $view_restrictions = array();
-    if (!Identity::active()->admin) {
-      foreach (Identity::group_ids_for_active_user() as $id) {
+    if (!Session::active_user()->admin) {
+      foreach (Session::group_ids_for_active_user() as $id) {
         // Separate the first restriction from the rest to make it easier for us to formulate
         // our where clause below
         if (empty($view_restrictions)) {
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 2dfc7f21..f80fce03 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -141,7 +141,7 @@ class locales_Core {
     $locale = self::cookie_locale();
     // 2. Check the user's preference
     if (!$locale) {
-      $locale = Identity::active()->locale;
+      $locale = Session::active_user()->locale;
     }
     // 3. Check the browser's / OS' preference
     if (!$locale) {
diff --git a/modules/gallery/helpers/log.php b/modules/gallery/helpers/log.php
index 512723dd..d1b34e3a 100644
--- a/modules/gallery/helpers/log.php
+++ b/modules/gallery/helpers/log.php
@@ -80,7 +80,7 @@ class log_Core {
     $log->url = substr(url::abs_current(true), 0, 255);
     $log->referer = request::referrer(null);
     $log->timestamp = time();
-    $log->user_id = Identity::active()->id;
+    $log->user_id = Session::active_user()->id;
     $log->save();
   }
 
diff --git a/modules/gallery/helpers/login.php b/modules/gallery/helpers/login.php
new file mode 100644
index 00000000..d44153ad
--- /dev/null
+++ b/modules/gallery/helpers/login.php
@@ -0,0 +1,31 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class login_Core {
+  static function get_login_form($url) {
+    $form = new Forge($url, "", "post", array("id" => "g-login-form"));
+    $form->set_attr('class', "g-narrow");
+    $group = $form->group("login")->label(t("Login"));
+    $group->input("name")->label(t("Username"))->id("g-username")->class(null);
+    $group->password("password")->label(t("Password"))->id("g-password")->class(null);
+    $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
+    $group->submit("")->value(t("Login"));
+    return $form;
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index bc0efa01..9541f20e 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -77,7 +77,7 @@ class movie_Core {
     $movie->title = $title;
     $movie->description = $description;
     $movie->name = $name;
-    $movie->owner_id = $owner_id ? $owner_id : Identity::active()->id;
+    $movie->owner_id = $owner_id ? $owner_id : Session::active_user()->id;
     $movie->width = $movie_info[0];
     $movie->height = $movie_info[1];
     $movie->mime_type = strtolower($pi["extension"]) == "mp4" ? "video/mp4" : "video/x-flv";
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index ad23e322..203862cd 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -76,7 +76,7 @@ class photo_Core {
     $photo->title = $title;
     $photo->description = $description;
     $photo->name = $name;
-    $photo->owner_id = $owner_id ? $owner_id : Identity::active()->id;
+    $photo->owner_id = $owner_id ? $owner_id : Session::active_user()->id;
     $photo->width = $image_info[0];
     $photo->height = $image_info[1];
     $photo->mime_type = empty($image_info['mime']) ? "application/unknown" : $image_info['mime'];
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 3f7ff19d..06b29fda 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -95,7 +95,7 @@ class site_status_Core {
    * @return html text
    */
   static function get() {
-    if (!Identity::active()->admin) {
+    if (!Session::active_user()->admin) {
       return;
     }
     $buf = array();
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 4735c36c..f84fd10e 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -42,7 +42,7 @@ class task_Core {
     $task->percent_complete = 0;
     $task->status = "";
     $task->state = "started";
-    $task->owner_id = Identity::active()->id;
+    $task->owner_id = Session::active_user()->id;
     $task->context = serialize($context);
     $task->save();
 
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index b1bb4ada..74a08c77 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -36,12 +36,12 @@ class Admin_View_Core extends Gallery_View {
     parent::__construct($name);
 
     $this->theme_name = module::get_var("gallery", "active_admin_theme");
-    if (Identity::active()->admin) {
+    if (Session::active_user()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
     $this->sidebar = "";
     $this->set_global("theme", $this);
-    $this->set_global("user", Identity::active());
+    $this->set_global("user", Session::active_user());
   }
 
   public function admin_menu() {
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index fb553de6..f844cf8f 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -194,111 +194,4 @@ class Identity_Core {
   static function get_user_list($ids) {
     return self::instance()->driver->get_user_list($ids);
   }
-
-  static function get_login_form($url) {
-    $form = new Forge($url, "", "post", array("id" => "g-login-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("login")->label(t("Login"));
-    $group->input("name")->label(t("Username"))->id("g-username")->class(null);
-    $group->password("password")->label(t("Password"))->id("g-password")->class(null);
-    $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
-    $group->submit("")->value(t("Login"));
-    return $form;
-  }
-
-  /**
-   * Return the active user.  If there's no active user, return the guest user.
-   *
-   * @return User_Model
-   */
-  static function active() {
-    // @todo (maybe) cache this object so we're not always doing session lookups.
-    $user = Session::instance()->get("user", null);
-    if (!isset($user)) {
-      // Don't do this as a fallback in the Session::get() call because it can trigger unnecessary
-      // work.
-      $user = self::guest();
-    }
-    return $user;
-  }
-
-  /**
-   * Change the active user.
-   *
-   * @return User_Model
-   */
-  static function set_active($user) {
-    $session = Session::instance();
-    $session->set("user", $user);
-    $session->delete("group_ids");
-    self::load_user();
-  }
-
-  /**
-   * Return the array of group ids this user belongs to
-   *
-   * @return array
-   */
-  static function group_ids_for_active_user() {
-    return Session::instance()->get("group_ids", array(1));
-  }
-
-  /**
-   * Make sure that we have a session and group_ids cached in the session.  This is one
-   * of the first calls to reference the user so call the Identity::instance to load the
-   * driver classes.
-   */
-  static function load_user() {
-    $session = Session::instance();
-    if (!($user = $session->get("user"))) {
-      $session->set("user", $user = self::guest());
-    }
-
-    // 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
-    if ($user === 2) {
-      $user = self::lookup_user_by_name("admin");
-      self::login($user);
-      $session->set("user", $user);
-    }
-
-    if (!$session->get("group_ids")) {
-      $ids = array();
-      foreach ($user->groups as $group) {
-        $ids[] = $group->id;
-      }
-      $session->set("group_ids", $ids);
-    }
-  }
-
-  /**
-   * Log in as a given user.
-   * @param object $user the user object.
-   */
-  static function login($user) {
-    // @todo make this an interface call
-    $user->login_count += 1;
-    $user->last_login = time();
-    $user->save();
-
-    self::set_active($user);
-    module::event("user_login", $user);
-  }
-
-  /**
-   * Log out the active user and destroy the session.
-   * @param object $user the user object.
-   */
-  static function logout() {
-    $user = self::active();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-  }
 } // End Identity
diff --git a/modules/gallery/libraries/MY_Session.php b/modules/gallery/libraries/MY_Session.php
new file mode 100644
index 00000000..6394c0fb
--- /dev/null
+++ b/modules/gallery/libraries/MY_Session.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-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class Session extends Session_Core {
+  /**
+   * Make sure that we have a session and group_ids cached in the session.
+   */
+  static function load_user() {
+    $session = Session::instance();
+    if (!($user = $session->get("user"))) {
+      $session->set("user", $user = Identity::guest());
+    }
+
+    // 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
+    if ($user === 2) {
+      $user = Instance::lookup_user_by_name("admin");
+      self::set_active_user($user);
+      $session->set("user", $user);
+    }
+
+    if (!$session->get("group_ids")) {
+      $ids = array();
+      foreach ($user->groups as $group) {
+        $ids[] = $group->id;
+      }
+      $session->set("group_ids", $ids);
+    }
+  }
+
+  /**
+   * Return the array of group ids this user belongs to
+   *
+   * @return array
+   */
+  static function group_ids_for_active_user() {
+    return self::instance()->get("group_ids", array(1));
+  }
+
+  /**
+   * Return the active user.  If there's no active user, return the guest user.
+   *
+   * @return User_Definition
+   */
+  static function active_user() {
+    // @todo (maybe) cache this object so we're not always doing session lookups.
+    $user = self::instance()->get("user", null);
+    if (!isset($user)) {
+      // Don't do this as a fallback in the Session::get() call because it can trigger unnecessary
+      // work.
+      $user = Identity::guest();
+    }
+    return $user;
+  }
+
+  /**
+   * Change the active user.
+   * @param User_Definition $user
+   */
+  static function set_active_user($user) {
+    $session = Session::instance();
+    $session->set("user", $user);
+    $session->delete("group_ids");
+    self::load_user();
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 4e87f4fb..2fdc7531 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -37,13 +37,13 @@ class Theme_View_Core extends Gallery_View {
     parent::__construct($name);
 
     $this->theme_name = module::get_var("gallery", "active_site_theme");
-    if (Identity::active()->admin) {
+    if (Session::active_user()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
     $this->item = null;
     $this->tag = null;
     $this->set_global("theme", $this);
-    $this->set_global("user", Identity::active());
+    $this->set_global("user", Session::active_user());
     $this->set_global("page_type", $page_type);
     $this->set_global("page_title", null);
     if ($page_type == "album") {
@@ -158,7 +158,7 @@ class Theme_View_Core extends Gallery_View {
    */
   public function sidebar_blocks() {
     $sidebar = block_manager::get_html("site.sidebar", $this);
-    if (empty($sidebar) && Identity::active()->admin) {
+    if (empty($sidebar) && Session::active_user()->admin) {
       $sidebar = new View("no_sidebar.html");
     }
     return $sidebar;
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 4904887a..b3b5ed30 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -45,7 +45,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   }
 
   public function setup() {
-    Identity::set_active(Identity::guest());
+    Session::set_active_user(Identity::guest());
   }
 
   public function groups_and_permissions_are_bound_to_columns_test() {
@@ -295,7 +295,7 @@ class Access_Helper_Test extends Unit_Test_Case {
       $user->remove($group);
     }
     $user->save();
-    Identity::set_active($user);
+    Session::set_active_user($user);
 
     // This user can't edit anything
     $root = ORM::factory("item", 1);
@@ -308,7 +308,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     access::allow($group, "edit", $root);
 
     $user = Identity::lookup_user($user->id);  // reload() does not flush related columns
-    Identity::set_active($user);
+    Session::set_active_user($user);
 
     // And verify that the user can edit.
     $this->assert_true(access::can("edit", $root));
@@ -363,7 +363,7 @@ class Access_Helper_Test extends Unit_Test_Case {
   }
 
   public function moved_items_inherit_new_permissions_test() {
-    Identity::set_active(Identity::lookup_user_by_name("admin"));
+    Session::set_active_user(Identity::lookup_user_by_name("admin"));
 
     $root = ORM::factory("item", 1);
     $public_album = album::create($root, rand(), "public album");
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index d4cfebba..fc01db91 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -23,7 +23,7 @@ class Item_Helper_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), rand(), rand());
     $item = self::_create_random_item($album);
-    Identity::set_active(Identity::guest());
+    Session::set_active_user(Identity::guest());
 
     // We can see the item when permissions are granted
     access::allow(Identity::everybody(), "view", $album);
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 3f99e037..cdb4ae4f 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -31,7 +31,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
     $photo = photo::create(
       $root, MODPATH . "gallery/tests/test.jpg", "test.jpeg",
-      "test", "test", Identity::active(), "slug");
+      "test", "test", Session::active_user(), "slug");
     $orig_name = $photo->name;
 
     $_POST["filename"] = "test.jpeg";
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index bca29298..0256fabb 100644
--- a/modules/gallery/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
@@ -57,7 +57,7 @@
     <title><?= t("Something went wrong!") ?></title>
   </head>
   <body>
-    <? try { $user = Identity::active(); } catch (Exception $e) { } ?>
+    <? try { $user = Session::active_user(); } catch (Exception $e) { } ?>
     <? $admin = php_sapi_name() == "cli" || isset($user) && $user->admin ?>
     <div class="big_box" id="framework_error">
       <h1>
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index dc8925b4..0aeaaec2 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -43,7 +43,7 @@
     <p>
       <?= t("This site is currently only accessible by site administrators.") ?>
     </p>
-    <?= Identity::get_login_form("login/auth_html") ?>
+    <?= login::get_login_form("login/auth_html") ?>
   </body>
 </html>
 
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 2e22eeae..64eed8dc 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -20,7 +20,7 @@
 class notification {
   static function get_subscription($item_id, $user=null) {
     if (empty($user)) {
-      $user = Identity::active();
+      $user = Session::active_user();
     }
 
     return ORM::factory("subscription")
@@ -31,7 +31,7 @@ class notification {
 
   static function is_watching($item, $user=null) {
     if (empty($user)) {
-      $user = Identity::active();
+      $user = Session::active_user();
     }
 
     return ORM::factory("subscription")
@@ -44,7 +44,7 @@ class notification {
   static function add_watch($item, $user=null) {
     if ($item->is_album()) {
       if (empty($user)) {
-        $user = Identity::active();
+        $user = Session::active_user();
       }
       $subscription = ORM::factory("subscription");
       $subscription->item_id = $item->id;
@@ -56,7 +56,7 @@ class notification {
   static function remove_watch($item, $user=null) {
     if ($item->is_album()) {
       if (empty($user)) {
-        $user = Identity::active();
+        $user = Session::active_user();
       }
 
       $subscription = ORM::factory("subscription")
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index d519bdc4..f0530cd9 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -95,7 +95,7 @@ class notification_event_Core {
   }
 
   static function site_menu($menu, $theme) {
-    if (!Identity::active()->guest) {
+    if (!Session::active_user()->guest) {
       $item = $theme->item();
 
       if ($item && $item->is_album() && access::can("view", $item)) {
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 86107714..8b14cfa9 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -22,8 +22,8 @@ class search_Core {
     $db = Database::instance();
     $q = $db->escape_str($q);
 
-    if (!Identity::active()->admin) {
-      foreach (Identity::group_ids_for_active_user() as $id) {
+    if (!Session::active_user()->admin) {
+      foreach (Session::group_ids_for_active_user() as $id) {
         $fields[] = "`view_$id` = TRUE"; // access::ALLOW
       }
       $access_sql = "AND (" . join(" AND ", $fields) . ")";
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 701c89fd..428065f6 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -103,7 +103,7 @@ class Server_Add_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded || $task->owner_id != Identity::active()->id) {
+    if (!$task->loaded || $task->owner_id != Session::active_user()->id) {
       access::forbidden();
     }
 
@@ -207,7 +207,7 @@ class Server_Add_Controller extends Admin_Controller {
         $task->set("mode", "done");
       }
 
-      $owner_id = Identity::active()->id;
+      $owner_id = Session::active_user()->id;
       foreach ($entries as $entry) {
         if (microtime(true) - $start > 0.5) {
           break;
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index 76357871..8f8b0016 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -30,7 +30,7 @@ class server_add_event_Core {
     $item = $theme->item();
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
 
-    if ($item && Identity::active()->admin && $item->is_album() && !empty($paths) &&
+    if ($item && Session::active_user()->admin && $item->is_album() && !empty($paths) &&
         is_writable($item->is_album() ? $item->file_path() : $item->parent()->file_path())) {
       $menu->get("add_menu")
         ->append(Menu::factory("dialog")
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index cecb90b4..44681d36 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -19,7 +19,7 @@
  */
 class server_add_theme_Core {
   static function head($theme) {
-    if (Identity::active()->admin) {
+    if (Session::active_user()->admin) {
       $theme->script("server_add.js");
     }
   }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index fed872a5..258de843 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -69,7 +69,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_user($id) {
     access::verify_csrf();
 
-    if ($id == Identity::active()->id || $id == user::guest()->id) {
+    if ($id == Session::active_user()->id || $id == user::guest()->id) {
       access::forbidden();
     }
 
@@ -136,7 +136,7 @@ class Admin_Users_Controller extends Admin_Controller {
       }
 
       // An admin can change the admin status for any user but themselves
-      if ($user->id != Identity::active()->id) {
+      if ($user->id != Session::active_user()->id) {
         $user->admin = $form->edit_user->admin->checked;
       }
       $user->save();
@@ -158,7 +158,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $form = $this->_get_user_edit_form_admin($user);
     // Don't allow the user to control their own admin bit, else you can lock yourself out
-    if ($user->id == Identity::active()->id) {
+    if ($user->id == Session::active_user()->id) {
       $form->edit_user->admin->disabled(1);
     }
     print $form;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index ebce1d8d..0ccf3e2a 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -21,7 +21,7 @@ class Users_Controller extends Controller {
   public function update($id) {
     $user = user::lookup($id);
 
-    if ($user->guest || $user->id != Identity::active()->id) {
+    if ($user->guest || $user->id != Session::active_user()->id) {
       access::forbidden();
     }
 
@@ -59,7 +59,7 @@ class Users_Controller extends Controller {
 
   public function form_edit($id) {
     $user = user::lookup($id);
-    if ($user->guest || $user->id != Identity::active()->id) {
+    if ($user->guest || $user->id != Session::active_user()->id) {
       access::forbidden();
     }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 400686cc..899e0b68 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -90,7 +90,7 @@
             <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text">
               <?= t("edit") ?>
             </span></a>
-          <? if (Identity::active()->id != $user->id && !$user->guest): ?>
+          <? if (Session::active_user()->id != $user->id && !$user->guest): ?>
           <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
              class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
-- 
cgit v1.2.3


From 24bd8e4c289e999c401e77da761ccbd938707407 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 24 Oct 2009 11:32:09 -0700
Subject: Remove a redundant comment, change the name of the identity change
 event to 'identity_before_change' and change the name of
 'login::get_login_form()' to 'login::get_form()'

---
 modules/gallery/controllers/admin_identity.php |  3 +--
 modules/gallery/controllers/albums.php         |  2 +-
 modules/gallery/controllers/login.php          |  6 +++---
 modules/gallery/helpers/login.php              |  2 +-
 modules/gallery/views/maintenance.html.php     |  2 +-
 modules/user/helpers/user.php                  | 11 -----------
 6 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'modules/gallery/views/maintenance.html.php')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index dcc3edcb..520b1966 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -45,7 +45,7 @@ class Admin_Identity_Controller extends Admin_Controller {
 
     if ($new_provider != $active_provider) {
 
-      module::event("pre_identity_change", $active_provider, $new_provider);
+      module::event("identity_before_change", $active_provider, $new_provider);
 
       module::deactivate($active_provider);
       module::uninstall($active_provider);
@@ -57,7 +57,6 @@ class Admin_Identity_Controller extends Admin_Controller {
       module::install($new_provider);
       module::activate($new_provider);
 
-      // @todo this type of collation is questionable from an i18n perspective
       message::success(t("Changed to %description",
                          array("description" => $providers->$new_provider)));
 
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 24ceb0c9..d393422e 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -29,7 +29,7 @@ class Albums_Controller extends Items_Controller {
         $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = new View("login_ajax.html");
-        $view->content->form = login::get_login_form("login/auth_html");
+        $view->content->form = login::get_form("login/auth_html");
         print $view;
         return;
       } else {
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 86e2b0a4..720e6375 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -21,7 +21,7 @@ class Login_Controller extends Controller {
 
   public function ajax() {
     $view = new View("login_ajax.html");
-    $view->form = login::get_login_form("login/auth_ajax");
+    $view->form = login::get_form("login/auth_ajax");
     print $view;
   }
 
@@ -40,7 +40,7 @@ class Login_Controller extends Controller {
   }
 
   public function html() {
-    print login::get_login_form("login/auth_html");
+    print login::get_form("login/auth_html");
   }
 
   public function auth_html() {
@@ -55,7 +55,7 @@ class Login_Controller extends Controller {
   }
 
   private function _auth($url) {
-    $form = login::get_login_form($url);
+    $form = login::get_form($url);
     $valid = $form->validate();
     if ($valid) {
       $user = identity::lookup_user_by_name($form->login->inputs["name"]->value);
diff --git a/modules/gallery/helpers/login.php b/modules/gallery/helpers/login.php
index d44153ad..cb961604 100644
--- a/modules/gallery/helpers/login.php
+++ b/modules/gallery/helpers/login.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class login_Core {
-  static function get_login_form($url) {
+  static function get_form($url) {
     $form = new Forge($url, "", "post", array("id" => "g-login-form"));
     $form->set_attr('class', "g-narrow");
     $group = $form->group("login")->label(t("Login"));
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index 0aeaaec2..55395b73 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -43,7 +43,7 @@
     <p>
       <?= t("This site is currently only accessible by site administrators.") ?>
     </p>
-    <?= login::get_login_form("login/auth_html") ?>
+    <?= login::get_form("login/auth_html") ?>
   </body>
 </html>
 
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 47f57d3d..f67429c7 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -24,17 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_Core {
-  static function get_login_form($url) {
-    $form = new Forge($url, "", "post", array("id" => "g-login-form"));
-    $form->set_attr('class', "g-one-quarter");
-    $group = $form->group("login")->label(t("Login"));
-    $group->input("name")->label(t("Username"))->id("g-username")->class(null);
-    $group->password("password")->label(t("Password"))->id("g-password")->class(null);
-    $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
-    $group->submit("")->value(t("Login"));
-    return $form;
-  }
-
   /**
    * Make sure that we have a session and group_ids cached in the session.
    */
-- 
cgit v1.2.3


From 7ea13b3869dee33804606a17488bb1cd26759bdb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 28 Oct 2009 12:15:52 -0700
Subject: Normalize capitalization ticket #596

---
 modules/akismet/views/admin_akismet.html.php       |  4 ++--
 modules/comment/helpers/comment_block.php          |  4 ++--
 modules/comment/helpers/comment_rss.php            |  2 +-
 modules/comment/views/admin_comments.html.php      | 12 +++++-----
 modules/exif/views/exif_dialog.html.php            |  2 +-
 modules/exif/views/exif_sidebar.html.php           |  2 +-
 modules/g2_import/helpers/g2_import.php            |  2 +-
 modules/g2_import/views/admin_g2_import.html.php   |  2 +-
 modules/gallery/controllers/admin_languages.php    |  2 +-
 modules/gallery/helpers/gallery_block.php          | 26 +++++++++++-----------
 modules/gallery/helpers/gallery_installer.php      |  4 ++--
 modules/gallery/helpers/gallery_rss.php            |  4 ++--
 .../gallery/views/admin_advanced_settings.html.php |  4 ++--
 .../gallery/views/admin_block_platform.html.php    |  2 +-
 modules/gallery/views/admin_graphics.html.php      |  6 ++---
 modules/gallery/views/admin_graphics_none.html.php |  2 +-
 modules/gallery/views/admin_identity.html.php      |  2 +-
 modules/gallery/views/admin_languages.html.php     |  4 ++--
 modules/gallery/views/admin_maintenance.html.php   | 12 +++++-----
 modules/gallery/views/admin_sidebar.html.php       |  6 ++---
 modules/gallery/views/admin_themes.html.php        |  4 ++--
 modules/gallery/views/l10n_client.html.php         |  6 ++---
 modules/gallery/views/login.html.php               |  2 +-
 modules/gallery/views/login_ajax.html.php          |  4 ++--
 modules/gallery/views/maintenance.html.php         |  4 ++--
 modules/gallery/views/simple_uploader.html.php     |  4 ++--
 modules/gallery/views/upgrader.html.php            |  2 +-
 modules/gallery/views/welcome_message.html.php     |  4 ++--
 modules/image_block/helpers/image_block_block.php  |  4 ++--
 modules/info/helpers/info_block.php                |  2 +-
 .../notification/views/comment_published.html.php  |  4 ++--
 modules/notification/views/item_updated.html.php   |  4 ++--
 modules/recaptcha/views/admin_recaptcha.html.php   |  6 ++---
 modules/rss/helpers/rss_block.php                  |  4 ++--
 modules/search/views/search.html.php               |  2 +-
 modules/server_add/helpers/server_add_event.php    |  2 +-
 modules/server_add/views/admin_server_add.html.php |  6 ++---
 modules/tag/helpers/tag_block.php                  |  4 ++--
 modules/user/views/admin_users.html.php            | 14 ++++++------
 modules/user/views/admin_users_group.html.php      |  8 +++----
 modules/user/views/reset_password.html.php         |  4 ++--
 modules/watermark/views/admin_watermarks.html.php  |  6 ++---
 themes/admin_wind/views/admin.html.php             |  6 ++---
 themes/admin_wind/views/pager.html.php             | 16 ++++++-------
 themes/night_wind/views/movie.html.php             |  8 +++----
 themes/night_wind/views/pager.html.php             | 16 ++++++-------
 themes/wind/views/movie.html.php                   |  8 +++----
 themes/wind/views/pager.html.php                   | 16 ++++++-------
 48 files changed, 137 insertions(+), 137 deletions(-)

(limited to 'modules/gallery/views/maintenance.html.php')

diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index d273be5b..399053d8 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-akismet" class="g-block">
-  <h1> <?= t("Akismet Spam Filtering") ?> </h1>
+  <h1> <?= t("Akismet spam filtering") ?> </h1>
   <p>
   <?= t("Akismet is a free, automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"%api_key_url\">Wordpress.com API Key</a>, which is also free.  Your comments will be automatically relayed to <a href=\"%akismet_url\">Akismet.com</a> where they'll be scanned for spam.  Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.",
         array("api_key_url" => "http://wordpress.com/api-keys",
@@ -9,7 +9,7 @@
   <div class="g-block-content">
     <? if ($valid_key): ?>
     <div class="g-module-status g-success">
-      <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
+      <?= t("Your API key is valid.  Your comments will be filtered!") ?>
     </div>
     <? endif ?>
 
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index c00c6c51..7cd5d429 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -19,7 +19,7 @@
  */
 class comment_block_Core {
   static function get_admin_list() {
-    return array("recent_comments" => t("Recent Comments"));
+    return array("recent_comments" => t("Recent comments"));
   }
 
   static function get($block_id) {
@@ -27,7 +27,7 @@ class comment_block_Core {
     switch ($block_id) {
     case "recent_comments":
       $block->css_id = "g-recent-comments";
-      $block->title = t("Recent Comments");
+      $block->title = t("Recent comments");
       $block->content = new View("admin_block_recent_comments.html");
       $block->content->comments =
         ORM::factory("comment")->orderby("created", "DESC")->limit(5)->find_all();
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 4424981d..3692a30d 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -61,7 +61,7 @@ class comment_rss_Core {
     $feed->max_pages = ceil($comments->count_all() / $limit);
     $feed->title = htmlspecialchars(t("Recent Comments"));
     $feed->uri = url::abs_site("albums/" . (empty($id) ? "1" : $id));
-    $feed->description = t("Recent Comments");
+    $feed->description = t("Recent comments");
 
     return $feed;
   }
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 82e071a8..f0f5ab1c 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -35,7 +35,7 @@
 </script>
 
 <div id="g-admin-comments" class="g-block">
-  <h1> <?= t("Manage Comments") ?> </h1>
+  <h1> <?= t("Manage comments") ?> </h1>
 
   <div class="g-block-content">
     <!-- @todo: Highlight active menu option -->
@@ -46,13 +46,13 @@
     <!-- @todo: Remove after setting active option? -->
     <h2>
       <? if ($state == "published"): ?>
-      <?= t("Approved Comments") ?>
+      <?= t("Approved comments") ?>
       <? elseif ($state == "unpublished"): ?>
-      <?= t("Comments Awaiting Moderation") ?>
+      <?= t("Comments awaiting moderation") ?>
       <? elseif ($state == "spam"): ?>
-      <?= t("Spam Comments") ?>
+      <?= t("Spam comments") ?>
       <? elseif ($state == "deleted"): ?>
-      <?= t("Recently Deleted Comments") ?>
+      <?= t("Recently deleted comments") ?>
       <? endif ?>
     </h2>
 
@@ -196,6 +196,6 @@
     <div class="g-pager">
       <?= $pager ?>
     </div>
-    
+
   </div>
 </div>
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php
index b50eea1d..22744e2d 100644
--- a/modules/exif/views/exif_dialog.html.php
+++ b/modules/exif/views/exif_dialog.html.php
@@ -4,7 +4,7 @@
   .g-odd { background: #bdd2ff; }
   .g-even { background: #dfeffc; }
 </style>
-<h1 style="display: none;"><?= t("Photo Detail") ?></h1>
+<h1 style="display: none;"><?= t("Photo detail") ?></h1>
 <div id="g-exif-data">
   <table class="g-metadata" >
     <tbody>
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index 04f72b02..8af2eb12 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<a id="g-exif-data-link" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
+<a id="g-exif-data-link" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo details")->for_html_attr() ?>"
   class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
   <span class="ui-icon ui-icon-info"></span>
   <?= t("View more information") ?>
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index f55e7f32..248f8017 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -271,7 +271,7 @@ class g2_import_Core {
 
     if (g2(GalleryCoreApi::isAnonymousUser($g2_user_id))) {
       self::set_map($g2_user_id, identity::guest()->id);
-      return t("Skipping Anonymous User");
+      return t("Skipping anonymous user");
     }
 
     $g2_admin_group_id =
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index e1443aa7..b2665a5f 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-g2-import" class="g-block">
-  <h1> <?= t("Gallery 2 Import") ?> </h1>
+  <h1> <?= t("Gallery 2 import") ?> </h1>
   <p>
     <?= t("Import your Gallery 2 users, photos, movies, comments and tags into your new Gallery 3 installation.") ?>
   </p>
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index ccc631c7..27537c7f 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -115,7 +115,7 @@ class Admin_Languages_Controller extends Admin_Controller {
               ? t("This is a unique key that will allow you to send translations to the remote
                   server. To get your API key go to %server-link.",
                   array("server-link" => html::mark_clean(html::anchor($server_link))))
-              : t("API Key"))
+              : t("API key"))
       ->value($api_key)
       ->error_messages("invalid", t("The API key you provided is invalid."));
     $group->submit("save")->value(t("Save settings"));
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 6c08d39a..0052affc 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -21,15 +21,15 @@ class gallery_block_Core {
   static function get_admin_list() {
     return array(
       "welcome" => t("Welcome to Gallery 3!"),
-      "photo_stream" => t("Photo Stream"),
-      "log_entries" => t("Log Entries"),
-      "stats" => t("Gallery Stats"),
-      "platform_info" => t("Platform Information"),
-      "project_news" => t("Gallery Project News"));
+      "photo_stream" => t("Photo stream"),
+      "log_entries" => t("Log entries"),
+      "stats" => t("Gallery stats"),
+      "platform_info" => t("Platform information"),
+      "project_news" => t("Gallery project news"));
   }
 
   static function get_site_list() {
-    return array("language" => t("Language Preference"));
+    return array("language" => t("Language preference"));
   }
 
   static function get($block_id) {
@@ -43,7 +43,7 @@ class gallery_block_Core {
 
     case "photo_stream":
       $block->css_id = "g-photo-stream";
-      $block->title = t("Photo Stream");
+      $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
         ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
@@ -51,7 +51,7 @@ class gallery_block_Core {
 
     case "log_entries":
       $block->css_id = "g-log-entries";
-      $block->title = t("Log Entries");
+      $block->title = t("Log entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
         ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
@@ -59,7 +59,7 @@ class gallery_block_Core {
 
     case "stats":
       $block->css_id = "g-stats";
-      $block->title = t("Gallery Stats");
+      $block->title = t("Gallery stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count =
         ORM::factory("item")->where("type", "album")->where("id <>", 1)->count_all();
@@ -68,7 +68,7 @@ class gallery_block_Core {
 
     case "platform_info":
       $block->css_id = "g-platform";
-      $block->title = t("Platform Information");
+      $block->title = t("Platform information");
       $block->content = new View("admin_block_platform.html");
       if (is_readable("/proc/loadavg")) {
         $block->content->load_average =
@@ -80,14 +80,14 @@ class gallery_block_Core {
 
     case "project_news":
       $block->css_id = "g-project-news";
-      $block->title = t("Gallery Project News");
+      $block->title = t("Gallery project news");
       $block->content = new View("admin_block_news.html");
       $block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3);
       break;
 
     case "block_adder":
       $block->css_id = "g-block-adder";
-      $block->title = t("Dashboard Content");
+      $block->title = t("Dashboard content");
       $block->content = self::get_add_block_form();
       break;
 
@@ -99,7 +99,7 @@ class gallery_block_Core {
         }
         $block = new Block();
         $block->css_id = "g-user-language-block";
-        $block->title = t("Language Preference");
+        $block->title = t("Language preference");
         $block->content = new View("user_languages_block.html");
         $block->content->installed_locales =
           array_merge(array("" => t("« none »")), $locales);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 01a213c8..5daf1016 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -199,12 +199,12 @@ class gallery_installer {
     }
 
     access::register_permission("view", "View");
-    access::register_permission("view_full", "View Full Size");
+    access::register_permission("view_full", "View full size");
     access::register_permission("edit", "Edit");
     access::register_permission("add", "Add");
 
     // Mark for translation (must be the same strings as used above)
-    t("View Full Size");
+    t("View full size");
     t("View");
     t("Edit");
     t("Add");
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index feeab88a..155edfb5 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -39,8 +39,8 @@ class gallery_rss_Core {
         ->orderby("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
-      $feed->title = t("Recent Updates");
-      $feed->description = t("Recent Updates");
+      $feed->title = t("Recent updates");
+      $feed->description = t("Recent updates");
       return $feed;
 
     case "album":
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index e3ae5f58..32fbc2c3 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -1,10 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-advanced-settings" class="g-block">
-  <h1> <?= t("Advanced Settings") ?> </h1>
+  <h1> <?= t("Advanced settings") ?> </h1>
   <p>
     <?= t("Here are internal Gallery configuration settings.  Most of these settings are accessible elsewhere in the administrative console.") ?>
   </p>
-  
+
   <ul id="g-action-status" class="g-message-block">
     <li class="g-warning"><?= t("Change these values at your own risk!") ?></li>
   </ul>
diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index f27b9e7a..b1b8a2f9 100644
--- a/modules/gallery/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
@@ -4,7 +4,7 @@
     <?= t("Host name: %host_name", array("host_name" => php_uname("n"))) ?>
   </li>
   <li>
-    <?= t("Operating System: %os %version", array("os" => php_uname("s"), "version" => php_uname("r"))) ?>
+    <?= t("Operating system: %os %version", array("os" => php_uname("s"), "version" => php_uname("r"))) ?>
   </li>
   <li>
     <?= t("Apache: %apache_version", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?>
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 0f4c0dd8..3a48e087 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -13,13 +13,13 @@
 </script>
 
 <div id="g-admin-graphics" class="g-block ui-helper-clearfix">
-  <h1> <?= t("Graphics Settings") ?> </h1>
+  <h1> <?= t("Graphics settings") ?> </h1>
   <p>
     <?= t("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
   </p>
 
   <div class="g-block-content">
-    <h2> <?= t("Active Toolkit") ?> </h2>
+    <h2> <?= t("Active toolkit") ?> </h2>
     <? if ($active == "none"): ?>
     <?= new View("admin_graphics_none.html") ?>
     <? else: ?>
@@ -27,7 +27,7 @@
     <? endif ?>
 
     <div class="g-available">
-      <h2> <?= t("Available Toolkits") ?> </h2>
+      <h2> <?= t("Available toolkits") ?> </h2>
       <? foreach (array_keys((array)$tk) as $id): ?>
       <? if ($id != $active): ?>
       <?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index 3ac6b4fb..e0fc4170 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
 <div id="none" class="g-module-status g-warning g-block">
-  <h3> <?= t("No Active Toolkit") ?> </h3>
+  <h3> <?= t("No active toolkit") ?> </h3>
   <p>
     <?= t("We were unable to detect a graphics program.  You must install one of the toolkits below in order to use many Gallery features.") ?>
   </p>
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index 358860cf..9a34dcc4 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -34,7 +34,7 @@
 
 </script>
 <div id="g-modules">
-  <h1> <?= t("Manage Identity Providers") ?> </h1>
+  <h1> <?= t("Manage identity providers") ?> </h1>
   <p>
     <?= t("Choose a different user/group management provider.") ?>
   </p>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 311672de..908cc892 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -26,7 +26,7 @@
 </script>
 
 <div class="g-block">
-  <h1> <?= t("Languages and Translation") ?> </h1>
+  <h1> <?= t("Languages and translation") ?> </h1>
 
   <div class="g-block-content">
 
@@ -107,6 +107,6 @@
         <?= $share_translations_form ?>
       </div>
     </div>
-    
+
   </div>
 </div>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 73a4bef8..107b35cc 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,13 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-maintenance" class="g-block">
-  <h1> <?= t("Maintenance Tasks") ?> </h1>
+  <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>
 
   <div class="g-block-content">
     <div id="g-available-tasks">
-      <h2> <?= t("Available Tasks") ?> </h2>
+      <h2> <?= t("Available tasks") ?> </h2>
       <table>
         <tr>
           <th>
@@ -43,11 +43,11 @@
 
     <? if ($running_tasks->count()): ?>
     <div id="g-running-tasks">
-      <h2> <?= t("Running Tasks") ?> </h2>
+      <h2> <?= t("Running tasks") ?> </h2>
       <table>
         <tr>
           <th>
-            <?= t("Last Updated") ?>
+            <?= t("Last updated") ?>
           </th>
           <th>
             <?= t("Name") ?>
@@ -116,11 +116,11 @@
 
     <? if ($finished_tasks->count()): ?>
     <div id="g-finished-tasks">
-      <h2> <?= t("Finished Tasks") ?> </h2>
+      <h2> <?= t("Finished tasks") ?> </h2>
       <table>
         <tr>
           <th>
-            <?= t("Last Updated") ?>
+            <?= t("Last updated") ?>
           </th>
           <th>
             <?= t("Name") ?>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 7c97270c..b394aa19 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -36,7 +36,7 @@
 </script>
 
 <div id="g-block-admin" class="g-block ui-helper-clearfix">
-  <h1> <?= t("Manage Sidebar") ?> </h1>
+  <h1> <?= t("Manage sidebar") ?> </h1>
   <p>
     <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?>
   </p>
@@ -44,7 +44,7 @@
   <div class="g-block-content">
     <div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
       <div class="g-admin-blocks-list">
-        <div><h3><?= t("Available Blocks") ?></h3></div>
+        <div><h3><?= t("Available blocks") ?></h3></div>
         <div>
           <ul id="g-available-blocks" class="g-sortable-blocks">
           <?= $available ?>
@@ -52,7 +52,7 @@
         </div>
       </div>
       <div class="g-admin-blocks-list">
-        <div><h3><?= t("Active Blocks") ?></h3></div>
+        <div><h3><?= t("Active blocks") ?></h3></div>
         <div>
           <ul id="g-active-blocks" class="g-sortable-blocks">
           <?= $active ?>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index dda18265..d14e8bd4 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -8,7 +8,7 @@
 </script>
 
 <div class="g-block ui-helper-clearfix">
-  <h1> <?= t("Theme Choice") ?> </h1>
+  <h1> <?= t("Theme choice") ?> </h1>
   <p>
     <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
   </p>
@@ -89,6 +89,6 @@
         <? endif ?>
       </div>
     </div>
-    
+
   </div>
 </div>
\ No newline at end of file
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index f4da52dc..9d14bbb2 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -6,9 +6,9 @@
       <a id="g-close-l10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
          href="<?= html::clean_attribute(url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token())) ?>">X</a>
     </span>
-    <div class="label strings"><h2><?= t("Page Text") ?>
+    <div class="label strings"><h2><?= t("Page text") ?>
     <? if (!Input::instance()->get('show_all_l10n_messages')): ?>
-      <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a>
+      <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show all)") ?></a>
     <? endif; ?>
     </h2></div>
     <div class="label source"><h2><?= t("Source") ?></div>
@@ -73,7 +73,7 @@
     </div>
   </div>
   <script type="text/javascript">
-    var MSG_TRANSLATE_TEXT = <?= t("Translate Text")->for_js() ?>;
+    var MSG_TRANSLATE_TEXT = <?= t("Translate text")->for_js() ?>;
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
     var toggle_l10n_mode_url = <?= html::js_string(url::site("l10n_client/toggle_l10n_mode")) ?>;
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 971d18b8..a7734369 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -11,7 +11,7 @@
     <? if (identity::is_writable()): ?>
     <?= t('Logged in as %name', array('name' => html::mark_clean(
       '<a href="' . url::site("form/edit/users/{$user->id}") .
-      '" title="' . t("Edit Your Profile")->for_html_attr() .
+      '" title="' . t("Edit your profile")->for_html_attr() .
       '" id="g-user-profile-link" class="g-dialog-link">' .
       html::clean($user->display_name()) . '</a>'))) ?>
     <? else: ?>
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index a9a9ef11..9741db0c 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -6,7 +6,7 @@
         url: "<?= url::site("password/reset") ?>",
         success: function(data) {
           $("#g-login").html(data);
-          $("#ui-dialog-title-g-dialog").html(<?= t("Reset Password")->for_js() ?>);
+          $("#ui-dialog-title-g-dialog").html(<?= t("Reset password")->for_js() ?>);
           $(".submit").addClass("g-button ui-state-default ui-corner-all");
           $(".submit").gallery_hover_init();
           ajaxify_login_reset_form();
@@ -38,7 +38,7 @@
     </li>
     <? if (identity::is_writable()): ?>
     <li>
-      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
+      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot your password?") ?></a>
     </li>
     <? endif ?>
   </ul>
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index 55395b73..2fdc40a3 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>
-      <?= t("Gallery - Maintenance Mode") ?>
+      <?= t("Gallery - maintenance mode") ?>
     </title>
     <style>
       body {
@@ -38,7 +38,7 @@
   </head>
   <body>
     <h1>
-      <?= t("Gallery - Maintenance Mode") ?>
+      <?= t("Gallery - maintenance mode") ?>
     </h1>
     <p>
       <?= t("This site is currently only accessible by site administrators.") ?>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 9285fffe..b9c33d32 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -34,7 +34,7 @@
   </ul>
 
   <div id="g-uploadqueue-infobar">
-    <?= t("Upload Queue") ?>
+    <?= t("Upload queue") ?>
     <span id="g-uploadstatus"></span>
     <a id="g-cancelupload" title="<?= t("Cancel all the pending uploads")->for_html_attr() ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
   </div>
@@ -60,7 +60,7 @@
       "csrf" => $csrf)) ?>,
     file_size_limit: <?= html::js_string(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB") ?>,
     file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
-    file_types_description: <?= t("Photos and Movies")->for_js() ?>,
+    file_types_description: <?= t("Photos and movies")->for_js() ?>,
     file_upload_limit: 1000,
     file_queue_limit: 0,
     custom_settings: { },
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 8a01cd29..fb55c4b2 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= t("Gallery 3 Upgrader") ?></title>
+    <title><?= t("Gallery 3 upgrader") ?></title>
     <link rel="stylesheet" type="text/css" href="<?= url::file("modules/gallery/css/upgrader.css") ?>"
           media="screen,print,projection" />
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 4acdb156..b50163fa 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -16,10 +16,10 @@
 
   <p>
     <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
-      title="<?= t("Edit Your Profile")->for_html_attr() ?>"
+      title="<?= t("Edit your profile")->for_html_attr() ?>"
       id="g-after-install-change-password-link"
       class="g-button ui-state-default ui-corners-all">
-      <?= t("Change Password Now") ?>
+      <?= t("Change password now") ?>
     </a>
     <script>
       $("#g-after-install-change-password-link").gallery_dialog();
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
index eb4f7aab..79bd92ba 100644
--- a/modules/image_block/helpers/image_block_block.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -19,7 +19,7 @@
  */
 class image_block_block_Core {
   static function get_site_list() {
-    return array("random_image" => t("Random Image"));
+    return array("random_image" => t("Random image"));
   }
 
   static function get($block_id, $theme) {
@@ -28,7 +28,7 @@ class image_block_block_Core {
     case "random_image":
       $block = new Block();
       $block->css_id = "g-image-block";
-      $block->title = t("Random Image");
+      $block->title = t("Random image");
       $block->content = new View("image_block_block.html");
 
       $random = ((float)mt_rand()) / (float)mt_getrandmax();
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index d28b02e7..a86bbec9 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -29,7 +29,7 @@ class info_block_Core {
       if ($theme->item()) {
         $block = new Block();
         $block->css_id = "g-metadata";
-        $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
+        $block->title = $theme->item()->is_album() ? t("Album info") : t("Photo info");
         $block->content = new View("info_block.html");
       }
       break;
diff --git a/modules/notification/views/comment_published.html.php b/modules/notification/views/comment_published.html.php
index a8ca1899..ac36a2c1 100644
--- a/modules/notification/views/comment_published.html.php
+++ b/modules/notification/views/comment_published.html.php
@@ -11,11 +11,11 @@
   <td><?= nl2br(html::purify($comment->text)) ?></td>
       </tr>
       <tr>
-        <td><?= t("Author Name:") ?></td>
+        <td><?= t("Author name:") ?></td>
         <td><?= html::clean($comment->author_name()) ?></td>
       </tr>
       <tr>
-        <td><?= t("Author Email:") ?></td>
+        <td><?= t("Author email:") ?></td>
         <td><?= html::clean($comment->author_email()) ?></td>
       </tr>
       <tr>
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index 9c200964..47856cab 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -8,7 +8,7 @@
     <table>
       <tr>
         <? if ($item->original("title") != $item->title): ?>
-        <td><?= t("New Title:") ?></td>
+        <td><?= t("New title:") ?></td>
         <td><?= html::clean($item->title) ?></td>
         <? else: ?>
         <td><?= t("Title:") ?></td>
@@ -21,7 +21,7 @@
       </tr>
       <? if ($item->original("description") != $item->description): ?>
       <tr>
-        <td><?= t("New Description:") ?></td>
+        <td><?= t("New description:") ?></td>
         <td><?= html::clean($item->description) ?></td>
       </tr>
       <? elseif (!empty($item->description)): ?>
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index a0af3ba8..4f07fef0 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="g-block">
-  <h1> <?= t("reCAPTCHA Challenge Filtering") ?> </h1>
+  <h1> <?= t("reCAPTCHA challenge filtering") ?> </h1>
   <p>
     <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.  In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
           array("domain_url" => $form->get_key_url,
@@ -12,7 +12,7 @@
 
     <? if ($public_key && $private_key): ?>
     <div id="g-admin-recaptcha-test">
-      <h2> <?= t("reCAPTCHA Test") ?> </h2>
+      <h2> <?= t("reCAPTCHA test") ?> </h2>
       <p>
         <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
       </p>
@@ -30,6 +30,6 @@
       </div>
     </div>
     <? endif ?>
-  
+
   </div>
 </div>
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
index cfd3098d..8da45e98 100644
--- a/modules/rss/helpers/rss_block.php
+++ b/modules/rss/helpers/rss_block.php
@@ -19,7 +19,7 @@
  */
 class rss_block_Core {
   static function get_site_list() {
-    return array("rss_feeds" => t("Available RSS Feeds"));
+    return array("rss_feeds" => t("Available RSS feeds"));
   }
 
   static function get($block_id, $theme) {
@@ -37,7 +37,7 @@ class rss_block_Core {
       if (!empty($feeds)) {
         $block = new Block();
         $block->css_id = "g-rss";
-        $block->title = t("Available RSS Feeds");
+        $block->title = t("Available RSS feeds");
         $block->content = new View("rss_block.html");
         $block->content->feeds = $feeds;
       }
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index af14520b..4b67157e 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -18,7 +18,7 @@
 </form>
 
 <div id="g-search-results">
-  <h1><?= t("Search Results") ?></h1>
+  <h1><?= t("Search results") ?></h1>
 
   <? if (count($items)): ?>
   <ul id="g-album-grid" class="ui-helper-clearfix">
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index 1d883a71..e1295bd4 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -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")));
     }
   }
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 33fd81f3..6dbb8637 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,12 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="g-block">
-  <h1> <?= t("Add From Server Admininstration") ?> </h1>
+  <h1> <?= t("Add from server admininstration") ?> </h1>
   <div class="g-block-content">
     <?= $form ?>
-    <h2><?= t("Authorized Paths") ?></h2>
+    <h2><?= t("Authorized paths") ?></h2>
     <ul id="g-server-add-paths">
       <? if (empty($paths)): ?>
-      <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li>
+      <li class="g-module-status g-info"><?= t("No authorized image source paths defined yet") ?></li>
       <? endif ?>
       <? foreach ($paths as $id => $path): ?>
       <li>
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
index 37da0b16..20ef18fa 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_block.php
@@ -19,7 +19,7 @@
  */
 class tag_block_Core {
   static function get_site_list() {
-    return array("tag" => t("Popular Tags"));
+    return array("tag" => t("Popular tags"));
   }
 
   static function get($block_id, $theme) {
@@ -28,7 +28,7 @@ class tag_block_Core {
     case "tag":
       $block = new Block();
       $block->css_id = "g-tag";
-      $block->title = t("Popular Tags");
+      $block->title = t("Popular tags");
       $block->content = new View("tag_block.html");
       $block->content->cloud = tag::cloud(30);
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index b64f93b1..661f1532 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,7 +43,7 @@
 </script>
 
 <div class="g-block">
-  <h1> <?= t("Users and Groups") ?> </h1>
+  <h1> <?= t("Users and groups") ?> </h1>
 
   <div class="g-block-content">
     <div class="g-block">
@@ -54,7 +54,7 @@
         <?= t("Add a new user") ?>
       </a>
 
-      <h2> <?= t("User Admin") ?> </h2>
+      <h2> <?= t("User admin") ?> </h2>
 
       <div class="g-block-content">
         <table id="g-user-admin-list">
@@ -87,17 +87,17 @@
             </td>
             <td class="g-actions">
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-                  open_text="<?= t("close") ?>"
+                  open_text="<?= t("Close") ?>"
                   class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
-                <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a>
+                <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("Edit") ?></span></a>
               <? if (identity::active_user()->id != $user->id && !$user->guest): ?>
               <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
                   class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
-                <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+                <span class="ui-icon ui-icon-trash"></span><?= t("Delete") ?></a>
               <? else: ?>
               <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
                   class="g-button ui-state-disabled ui-corner-all ui-icon-left">
-                <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
+                <span class="ui-icon ui-icon-trash"></span><?= t("Delete") ?></span>
               <? endif ?>
             </td>
           </tr>
@@ -115,7 +115,7 @@
       </a>
 
       <h2>
-        <?= t("Group Admin") ?>
+        <?= t("Group admin") ?>
       </h2>
 
       <div class="g-block-content">
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index db3645a0..e44cbddd 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -5,11 +5,11 @@
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
     title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
     class="g-dialog-link g-button ui-state-default ui-corner-all">
-    <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
+    <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? else: ?>
   <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
      class="g-dialog-link g-button ui-state-disabled ui-corner-all ui-icon-left">
-    <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
+    <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? endif ?>
 </h4>
 
@@ -23,7 +23,7 @@
        class="g-button ui-state-default ui-corner-all ui-icon-left"
        title="<?= t("Remove %user from %group group",
               array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
-      <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
+      <span class="ui-icon ui-icon-closethick"><?= t("Remove") ?></span>
     </a>
     <? endif ?>
   </li>
@@ -32,7 +32,7 @@
 <? else: ?>
 <div>
   <p>
-    <?= t("Drag &amp; drop users from the User Admin above into this group box to add group members.") ?>
+    <?= t("Drag &amp; drop users from the \"User admin\" above into this group box to add group members.") ?>
   </p>
 </div>
 <? endif ?>
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
index 92ca4917..3afca881 100644
--- a/modules/user/views/reset_password.html.php
+++ b/modules/user/views/reset_password.html.php
@@ -1,10 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= t("Password Reset Request") ?> </title>
+    <title><?= t("Password reset request") ?> </title>
   </head>
   <body>
-    <h2><?= t("Password Reset Request") ?> </h2>
+    <h2><?= t("Password reset request") ?> </h2>
     <p>
       <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
     </p>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index af38cb41..fc634b82 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -11,7 +11,7 @@
        title="<?= t("Upload a watermark")->for_html_attr() ?>"
        class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
     <? else: ?>
-    <h2> <?= t("Active Watermark") ?> </h2>
+    <h2> <?= t("Active watermark") ?> </h2>
     <p>
       <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
     </p>
@@ -27,10 +27,10 @@
       </div>
       <div class="controls">
         <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-           title="<?= t("Edit Watermark")->for_html_attr() ?>"
+           title="<?= t("Edit watermark")->for_html_attr() ?>"
            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
         <a href="<?= url::site("admin/watermarks/form_delete") ?>"
-           title="<?= t("Delete Watermark")->for_html_attr() ?>"
+           title="<?= t("Delete watermark")->for_html_attr() ?>"
            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
       </div>
     </div>
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ef1aa1d2..e554b817 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title><?= t("Admin Dashboard") ?></title>
+    <title><?= t("Admin dashboard") ?></title>
     <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
 
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
@@ -23,7 +23,7 @@
    <?= $theme->script("gallery.common.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
-   var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
+   var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
    </script>
    <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
@@ -48,7 +48,7 @@
             <? if (identity::is_writable()): ?>
             <?= t('Logged in as %name', array('name' => html::mark_clean(
               '<a href="' . url::site("form/edit/users/{$user->id}") .
-              '" title="' . t("Edit Your Profile")->for_html_attr() .
+              '" title="' . t("Edit your profile")->for_html_attr() .
               '" id="g-user-profile-link" class="g-dialog-link">' .
               html::clean($user->display_name()) . '</a>'))) ?>
             <? else: ?>
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 555a4950..e4fbd5d5 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -11,34 +11,34 @@
   <li>
   <? if ($first_page): ?>
     <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
     <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? endif ?>
   </li>
   <li class="g-info"><?= $from_to_msg ?></li>
   <li class="g-txt-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
     <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? endif ?>
   </li>
 </ul>
diff --git a/themes/night_wind/views/movie.html.php b/themes/night_wind/views/movie.html.php
index 17b519ba..9254c7fe 100644
--- a/themes/night_wind/views/movie.html.php
+++ b/themes/night_wind/views/movie.html.php
@@ -6,20 +6,20 @@
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
       <? else: ?>
       <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
     <li class="g-txt-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
       <? else: ?>
       <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
       <? endif ?>
     </li>
   </ul>
diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php
index 337d658f..ba325d03 100644
--- a/themes/night_wind/views/pager.html.php
+++ b/themes/night_wind/views/pager.html.php
@@ -11,34 +11,34 @@
   <li>
   <? if ($first_page): ?>
     <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
     <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? endif ?>
   </li>
   <li class="g-info"><?= $from_to_msg ?></li>
   <li class="g-txt-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
     <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? endif ?>
   </li>
 </ul>
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 17b519ba..9254c7fe 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -6,20 +6,20 @@
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
       <? else: ?>
       <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
     <li class="g-txt-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
       <? else: ?>
       <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
       <? endif ?>
     </li>
   </ul>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 337d658f..ba325d03 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -11,34 +11,34 @@
   <li>
   <? if ($first_page): ?>
     <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
+      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
     <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? else: ?>
     <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
+      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
   <? endif ?>
   </li>
   <li class="g-info"><?= $from_to_msg ?></li>
   <li class="g-txt-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
+      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
     <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? else: ?>
     <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
+      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
   <? endif ?>
   </li>
 </ul>
-- 
cgit v1.2.3


From 59b5a0549635aa5c8320707cec75612746debdd0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 30 Oct 2009 09:32:18 -0700
Subject: Rename the login helper to auth.  Create a login and logout helper
 function to allow for programmically login in and out.

---
 modules/gallery/controllers/albums.php     |  2 +-
 modules/gallery/controllers/login.php      | 15 +++-----
 modules/gallery/controllers/logout.php     | 12 +------
 modules/gallery/helpers/auth.php           | 56 ++++++++++++++++++++++++++++++
 modules/gallery/helpers/login.php          | 31 -----------------
 modules/gallery/views/maintenance.html.php |  2 +-
 6 files changed, 63 insertions(+), 55 deletions(-)
 create mode 100644 modules/gallery/helpers/auth.php
 delete mode 100644 modules/gallery/helpers/login.php

(limited to 'modules/gallery/views/maintenance.html.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index d393422e..a430b14d 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -29,7 +29,7 @@ class Albums_Controller extends Items_Controller {
         $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = new View("login_ajax.html");
-        $view->content->form = login::get_form("login/auth_html");
+        $view->content->form = auth::get_login_form("login/auth_html");
         print $view;
         return;
       } else {
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 3978b64f..75ee6b9c 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -21,7 +21,7 @@ class Login_Controller extends Controller {
 
   public function ajax() {
     $view = new View("login_ajax.html");
-    $view->form = login::get_form("login/auth_ajax");
+    $view->form = auth::get_login_form("login/auth_ajax");
     print $view;
   }
 
@@ -40,7 +40,7 @@ class Login_Controller extends Controller {
   }
 
   public function html() {
-    print login::get_form("login/auth_html");
+    print auth::get_login_form("login/auth_html");
   }
 
   public function auth_html() {
@@ -55,7 +55,7 @@ class Login_Controller extends Controller {
   }
 
   private function _auth($url) {
-    $form = login::get_form($url);
+    $form = auth::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
       $user = identity::lookup_user_by_name($form->login->inputs["name"]->value);
@@ -70,14 +70,7 @@ class Login_Controller extends Controller {
     }
 
     if ($valid) {
-      if (identity::is_writable()) {
-        $user->login_count += 1;
-        $user->last_login = time();
-        $user->save();
-      }
-      identity::set_active_user($user);
-      log::info("user", t("User %name logged in", array("name" => $user->name)));
-      module::event("user_login", $user);
+      auth::login($user);
     }
 
     // Either way, regenerate the session id to avoid session trapping
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
index 1b0364fd..2b93655d 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -19,17 +19,7 @@
  */
 class Logout_Controller extends Controller {
   public function index() {
-    $user = identity::active_user();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-    log::info("user", t("User %name logged out", array("name" => $user->name)),
-              html::anchor("user/$user->id", html::clean($user->name)));
+    auth::logout();
     if ($continue_url = $this->input->get("continue")) {
       $item = url::get_item_from_uri($continue_url);
       if (access::can("view", $item)) {
diff --git a/modules/gallery/helpers/auth.php b/modules/gallery/helpers/auth.php
new file mode 100644
index 00000000..9c69cecd
--- /dev/null
+++ b/modules/gallery/helpers/auth.php
@@ -0,0 +1,56 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class auth_Core {
+  static function get_login_form($url) {
+    $form = new Forge($url, "", "post", array("id" => "g-login-form"));
+    $form->set_attr('class', "g-narrow");
+    $group = $form->group("login")->label(t("Login"));
+    $group->input("name")->label(t("Username"))->id("g-username")->class(null);
+    $group->password("password")->label(t("Password"))->id("g-password")->class(null);
+    $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
+    $group->submit("")->value(t("Login"));
+    return $form;
+  }
+
+  static function login($user) {
+    if (identity::is_writable()) {
+      $user->login_count += 1;
+      $user->last_login = time();
+      $user->save();
+    }
+    identity::set_active_user($user);
+    log::info("user", t("User %name logged in", array("name" => $user->name)));
+    module::event("user_login", $user);
+  }
+
+  static function logout() {
+    $user = identity::active_user();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
+    log::info("user", t("User %name logged out", array("name" => $user->name)),
+              html::anchor("user/$user->id", html::clean($user->name)));
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/helpers/login.php b/modules/gallery/helpers/login.php
deleted file mode 100644
index cb961604..00000000
--- a/modules/gallery/helpers/login.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class login_Core {
-  static function get_form($url) {
-    $form = new Forge($url, "", "post", array("id" => "g-login-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("login")->label(t("Login"));
-    $group->input("name")->label(t("Username"))->id("g-username")->class(null);
-    $group->password("password")->label(t("Password"))->id("g-password")->class(null);
-    $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password"));
-    $group->submit("")->value(t("Login"));
-    return $form;
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index 2fdc40a3..6351b6ab 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -43,7 +43,7 @@
     <p>
       <?= t("This site is currently only accessible by site administrators.") ?>
     </p>
-    <?= login::get_form("login/auth_html") ?>
+    <?= auth::get_login_form("login/auth_html") ?>
   </body>
 </html>
 
-- 
cgit v1.2.3