Change the focus of the user module from providing user/group management to providing the default Identity implementation.

* Remove the user_event callbacks and move them to the gallery_event callbacks. This will insure that the active user is always loaded (because the gallery callbacks are always called first) to its available to other gallery_ready handlers.  Moved the method set_request_locale to the locales helper as it is more related to locales.
* Move the user controllers and views into the gallery module.
* Move the theme and block processing out of the user module and into core.

18 files changed, 65 insertions, 135 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
index 6c72440a..6c72440a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/gallery/controllers/admin_users.php
diff --git a/modules/user/controllers/login.php b/modules/gallery/controllers/login.php
index 2c4bd557..2c4bd557 100644
--- a/modules/user/controllers/login.php
+++ b/modules/gallery/controllers/login.php
diff --git a/modules/user/controllers/logout.php b/modules/gallery/controllers/logout.php
index 45d397ad..45d397ad 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
diff --git a/modules/user/controllers/password.php b/modules/gallery/controllers/password.php
index 817ff01c..817ff01c 100644
--- a/modules/user/controllers/password.php
+++ b/modules/gallery/controllers/password.php
diff --git a/modules/user/controllers/users.php b/modules/gallery/controllers/users.php
index 4ad704f0..4ad704f0 100644
--- a/modules/user/controllers/users.php
+++ b/modules/gallery/controllers/users.php
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 5d49a9de..f43d82c9 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -28,6 +28,10 @@ class gallery_block_Core {
       "project_news" => t("Gallery Project News"));
   }
 
+  static function get_site_list() {
+    return array("language" => t("Language Preference"));
+  }
+
   static function get($block_id) {
     $block = new Block();
     switch($block_id) {
@@ -85,6 +89,25 @@ class gallery_block_Core {
       $block->css_id = "g-block-adder";
       $block->title = t("Dashboard Content");
       $block->content = self::get_add_block_form();
+      break;
+
+    case "language":
+      $locales = locales::installed();
+      if (count($locales)) {
+        foreach ($locales as $locale => $display_name) {
+          $locales[$locale] = SafeString::of_safe_html($display_name);
+        }
+        $block = new Block();
+        $block->css_id = "g-user-language-block";
+        $block->title = t("Language Preference");
+        $block->content = new View("user_languages_block.html");
+        $block->content->installed_locales =
+          array_merge(array("" => t("« none »")), $locales);
+        $block->content->selected = (string) user::cookie_locale();
+      } else {
+        $block = "";
+      }
+      break;
     }
 
     return $block;
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 290d7d12..e0de2152 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -19,6 +19,14 @@
  */
 
 class gallery_event_Core {
+  /**
+   * Initialization.
+   */
+  static function gallery_ready() {
+    user::load_user();
+    locales::set_request_locale();
+  }
+
   static function group_created($group) {
     access::add_group($group);
   }
@@ -179,6 +187,10 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage Sidebar"))
                         ->url(url::site("admin/sidebar"))))
+      ->append(Menu::factory("link")
+               ->id("users_groups")
+               ->label(t("Users/Groups"))
+               ->url(url::site("admin/users")))
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 20dfeb04..a342b4bd 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -37,6 +37,11 @@ class gallery_theme_Core {
       }
     }
 
+    if (count(locales::installed())) {
+      // Needed by the languages block
+      $theme->script("jquery.cookie.js");
+    }
+
     if ($session->get("l10n_mode", false)) {
       $theme->css("l10n_client.css");
       $theme->script("jquery.cookie.js");
@@ -46,6 +51,14 @@ class gallery_theme_Core {
     return $buf;
   }
 
+  static function header_top($theme) {
+    if ($theme->page_type != "login") {
+      $view = new View("login.html");
+      $view->user = user::active();
+      return $view->render();
+    }
+  }
+
   static function admin_head($theme) {
     $theme->script("gallery.panel.js");
     $session = Session::instance();
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index ab7f7526..faec7816 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -136,6 +136,23 @@ class locales_Core {
     return in_array($language, array("he", "fa", "ar"));
   }
 
+  static function set_request_locale() {
+    // 1. Check the session specific preference (cookie)
+    $locale = user::cookie_locale();
+    // 2. Check the user's preference
+    if (!$locale) {
+      $locale = user::active()->locale;
+    }
+    // 3. Check the browser's / OS' preference
+    if (!$locale) {
+      $locale = self::locale_from_http_request();
+    }
+    // If we have any preference, override the site's default locale
+    if ($locale) {
+      I18n::instance()->locale($locale);
+    }
+  }
+
   /**
    * Returns the best match comparing the HTTP accept-language header
    * with the installed locales.
diff --git a/modules/user/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
index 28daff29..28daff29 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/gallery/views/admin_users.html.php
diff --git a/modules/user/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
index db3645a0..db3645a0 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/gallery/views/admin_users_group.html.php
diff --git a/modules/user/views/login.html.php b/modules/gallery/views/login.html.php
index 049ba043..049ba043 100644
--- a/modules/user/views/login.html.php
+++ b/modules/gallery/views/login.html.php
diff --git a/modules/user/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index d3364b46..d3364b46 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
diff --git a/modules/user/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
index 92ca4917..92ca4917 100644
--- a/modules/user/views/reset_password.html.php
+++ b/modules/gallery/views/reset_password.html.php
diff --git a/modules/user/views/user_languages_block.html.php b/modules/gallery/views/user_languages_block.html.php
index 89185967..89185967 100644
--- a/modules/user/views/user_languages_block.html.php
+++ b/modules/gallery/views/user_languages_block.html.php
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
deleted file mode 100644
index f920b4c5..00000000
--- a/modules/user/helpers/user_block.php
+++ /dev/null
@@ -1,46 +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 user_block_Core {
-  static function get_site_list() {
-    return array("language" => t("Language Preference"));
-  }
-
-  static function get($block_id, $theme) {
-    $block = "";
-    switch ($block_id) {
-    case "language":
-      $locales = locales::installed();
-      foreach ($locales as $locale => $display_name) {
-        $locales[$locale] = SafeString::of_safe_html($display_name);
-      }
-      if (count($locales) > 1) {
-        $block = new Block();
-        $block->css_id = "g-user-language-block";
-        $block->title = t("Language Preference");
-        $block->content = new View("user_languages_block.html");
-        $block->content->installed_locales =
-          array_merge(array("" => t("« none »")), $locales);
-        $block->content->selected = (string) user::cookie_locale();
-      }
-      break;
-    }
-    return $block;
-  }
-}
\ No newline at end of file
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
deleted file mode 100644
index ede4e515..00000000
--- a/modules/user/helpers/user_event.php
+++ /dev/null
@@ -1,53 +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 user_event_Core {
-  /**
-   * Initialization.
-   */
-  static function gallery_ready() {
-    user::load_user();
-    self::set_request_locale();
-  }
-
-  static function admin_menu($menu, $theme) {
-    $menu->add_after("appearance_menu",
-                     Menu::factory("link")
-                     ->id("users_groups")
-                     ->label(t("Users/Groups"))
-                     ->url(url::site("admin/users")));
-  }
-
-  static function set_request_locale() {
-    // 1. Check the session specific preference (cookie)
-    $locale = user::cookie_locale();
-    // 2. Check the user's preference
-    if (!$locale) {
-      $locale = user::active()->locale;
-    }
-    // 3. Check the browser's / OS' preference
-    if (!$locale) {
-      $locale = locales::locale_from_http_request();
-    }
-    // If we have any preference, override the site's default locale
-    if ($locale) {
-      I18n::instance()->locale($locale);
-    }
-  }
-}
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
deleted file mode 100644
index 69d63eaf..00000000
--- a/modules/user/helpers/user_theme.php
+++ /dev/null
@@ -1,36 +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 user_theme_Core {
-  static function head($theme) {
-    if (count(locales::installed())) {
-      // Needed by the languages block
-      $theme->script("jquery.cookie.js");
-    }
-    return "";
-  }
-
-  static function header_top($theme) {
-    if ($theme->page_type != "login") {
-      $view = new View("login.html");
-      $view->user = user::active();
-      return $view->render();
-    }
-  }
-}