From daa3a2b43cd6e1458014e763e9640b8db16cc0c1 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 00:32:52 -0600
Subject: First round of CSS refactor updates. Added calls to
 gallery.common.css from wind and admin_wind. Replaced basic text align and
 block float classes. Removed section #2 from both themes screen styles.

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

(limited to 'modules/user')

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index c065e4b1..348747dd 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,7 +43,7 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
-- 
cgit v1.2.3


From 72672bda39b76dae698805c3e0e6efdbdcf21105 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 08:04:49 -0600
Subject: Replaced gButtonLink with g-button.

---
 lib/gallery.common.css                             | 12 +++++++++++
 modules/comment/views/admin_comments.html.php      | 12 +++++------
 modules/comment/views/comments.html.php            |  2 +-
 modules/exif/views/exif_sidebar.html.php           |  2 +-
 modules/g2_import/views/admin_g2_import.html.php   |  2 +-
 modules/gallery/views/admin_graphics_gd.html.php   |  4 ++--
 .../views/admin_graphics_graphicsmagick.html.php   |  2 +-
 .../views/admin_graphics_imagemagick.html.php      |  2 +-
 modules/gallery/views/admin_languages.html.php     |  2 +-
 modules/gallery/views/admin_maintenance.html.php   | 18 ++++++++--------
 modules/gallery/views/l10n_client.html.php         |  2 +-
 modules/gallery/views/welcome_message.html.php     |  2 +-
 modules/organize/views/organize_dialog.html.php    |  2 +-
 modules/tag/views/admin_tags.html.php              |  2 +-
 modules/user/views/admin_users.html.php            | 10 ++++-----
 modules/user/views/admin_users_group.html.php      |  6 +++---
 modules/watermark/views/admin_watermarks.html.php  |  6 +++---
 themes/admin_wind/css/screen.css                   | 25 ++++++++--------------
 themes/admin_wind/js/ui.init.js                    |  2 +-
 themes/admin_wind/views/pager.html.php             | 16 +++++++-------
 themes/wind/css/screen.css                         | 15 ++++---------
 themes/wind/js/ui.init.js                          |  2 +-
 themes/wind/views/movie.html.php                   |  8 +++----
 themes/wind/views/pager.html.php                   | 16 +++++++-------
 themes/wind/views/photo.html.php                   |  8 +++----
 25 files changed, 89 insertions(+), 91 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 0aa9cc29..d57e95fc 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -138,6 +138,18 @@ form .g-error {
 }
 
 .g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
 }
 
 .g-progressbar {
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 5e9ffb1a..ec5ad7b2 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -139,7 +139,7 @@
         <? if ($comment->state != "unpublished"): ?>
           <li>
             <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-check"></span>
               <?= t("Unapprove") ?>
             </a>
@@ -148,7 +148,7 @@
         <? if ($comment->state != "published"): ?>
           <li>
             <a href="javascript:set_state('published',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-check"></span>
               <?= t("Approve") ?>
             </a>
@@ -157,7 +157,7 @@
         <? if ($comment->state != "spam"): ?>
           <li>
             <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-cancel"></span>
               <?= t("Spam") ?>
             </a>
@@ -166,14 +166,14 @@
           <!--
           <li>
             <a href="javascript:reply(<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
               <?= t("Reply") ?>
             </a>
           </li>
           <li>
             <a href="javascript:Edit(<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-pencil"></span>
               <?= t("Edit") ?>
             </a>
@@ -181,7 +181,7 @@
           -->
           <li>
             <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-trash"></span>
               <?= t("Delete") ?>
             </a>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index dd706a23..ee4a8ad6 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
   <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
-   class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
+   class="g-button ui-corner-all ui-icon-left ui-state-default right">
   <span class="ui-icon ui-icon-comment"></span>
   <?= t("Add a comment") ?>
 </a>
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index 60c0e1d4..23ecab03 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
-  class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
+  class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
   <span class="ui-icon ui-icon-info"></span>
   <?= t("View more information") ?>
 </a>
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 23ff27a8..91b723ad 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -84,7 +84,7 @@
     </div>
 
     <p>
-      <a class="gButtonLink gDialogLink ui-state-default ui-corner-all"
+      <a class="g-button gDialogLink ui-state-default ui-corner-all"
          href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
         <?= t("Begin import!") ?>
       </a>
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index 010a31b4..08c19234 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -11,7 +11,7 @@
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? elseif ($tk->installed): ?>
   <? if ($tk->error): ?>
@@ -20,7 +20,7 @@
   </p>
   <? endif ?>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
   <div class="gModuleStatus gInfo">
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 97624850..6ee15bc3 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -11,7 +11,7 @@
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
   <div class="gModuleStatus gWarning">
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index cdff7c2c..aeef4919 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -11,7 +11,7 @@
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
   <div class="gModuleStatus gWarning">
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index fb30c7ba..d6f50516 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -88,7 +88,7 @@
     <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
 
     <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
-       class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
+       class="g-button ui-state-default ui-corner-all ui-icon-left">
       <span class="ui-icon ui-icon-power"></span>
       <? if (Session::instance()->get("l10n_mode", false)): ?>
       <?= t("Stop translation mode") ?>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 00ba5199..8c3917b6 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -30,7 +30,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
+            class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -62,7 +62,7 @@
         </th>
         <th>
           <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-             class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
+             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
             <?= t("cancel all") ?></a>
           <?= t("Action") ?>
         </th>
@@ -96,11 +96,11 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-             class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
+             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
             <?= t("cancel") ?>
           </a>
           <? if ($task->state == "stalled"): ?>
-          <a class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"
+          <a class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"
              href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
           </a>
@@ -135,7 +135,7 @@
         </th>
         <th>
           <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-               class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
+               class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
              <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
           <?= t("Action") ?>
         </th>
@@ -166,19 +166,19 @@
         </td>
         <td>
           <? if ($task->done): ?>
-          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
             <?= t("remove") ?>
           </a>
           <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink g-button ui-state-default ui-corner-all">
             <?= t("browse log") ?>
           </a>
           <? endif ?>
           <? else: ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink" ui-state-default ui-corner-all>
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink g-button" ui-state-default ui-corner-all>
             <?= t("resume") ?>
           </a>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
             <?= t("cancel") ?>
           </a>
           <? endif ?>
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index b0f424be..a7f001aa 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -68,7 +68,7 @@
         </div>
         <input type="submit" name="l10n-edit-save" value="<?= t("Save translation")->for_html_attr() ?>"/>
         <a href="javascript: Gallery.l10nClient.copySourceText()"
-           class="gButtonLink ui-state-default ui-corner-all"><?= t("Copy source text") ?></a>
+           class="g-button ui-state-default ui-corner-all"><?= t("Copy source text") ?></a>
       </form>
     </div>
   </div>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 5515c3dc..021e5772 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -18,7 +18,7 @@
     <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
       title="<?= t("Edit Your Profile")->for_html_attr() ?>"
       id="gAfterInstallChangePasswordLink"
-      class="gButtonLink ui-state-default ui-corners-all">
+      class="g-button ui-state-default ui-corners-all">
       <?= t("Change Password Now") ?>
     </a>
     <script>
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cbc2e4f9..87f12be9 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -31,7 +31,7 @@
         </div>
         <div id="gOrganizeControls">
           <a id="gOrganizeClose" href="#" ref="done"
-             class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+             class="g-button ui-corner-all ui-state-default"><?= t("Close") ?></a>
           <form>
             <?= t("Sort order") ?>
             <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 23a00567..b7344cda 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -50,7 +50,7 @@
             <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
             <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="gDialogLink delete-link gButtonLink">
+               class="gDialogLink delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 348747dd..5ee62fae 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,7 +43,7 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="gDialogLink gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
@@ -85,15 +85,15 @@
         <td class="gActions">
           <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
               open_text="<?= t("close") ?>"
-              class="gPanelLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+              class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
           <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+              class="gDialogLink g-button ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
           <? else: ?>
           <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
-              class="gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+              class="g-button ui-state-disabled ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
           <? endif ?>
         </td>
@@ -105,7 +105,7 @@
 
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink g-button right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 476e0817..6f2496f8 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
   <? if (!$group->special): ?>
   <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="gDialogLink gButtonLink ui-state-default ui-corner-all">
+    class="gDialogLink g-button ui-state-default ui-corner-all">
     <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="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+     class="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? endif ?>
 </h4>
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
+       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>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index ac69d21d..3790030d 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -8,7 +8,7 @@
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
      title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
+     class="gDialogLink 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>
   <p>
@@ -27,10 +27,10 @@
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
          title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+         class="gDialogLink 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() ?>"
-         class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+         class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
     </div>
   </div>
   <? endif ?>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index d006463d..737c5939 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -68,9 +68,9 @@ h3 {
 a,
 .gMenu a,
 #gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
 a.ui-state-hover,
 input.ui-state-hover,
 button.ui-state-hover {
@@ -283,11 +283,11 @@ li.gError select {
   background: #eee;
 }
 
-.gAvailable .gButtonLink {
+.gAvailable .g-button {
   width: 96%;
 }
 
-.gSelected .gButtonLink {
+.gSelected .g-button {
   display: none;
 }
 
@@ -627,7 +627,7 @@ li.gGroup h4 {
   border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
-li.gGroup .gButtonLink {
+li.gGroup .g-button {
   padding: 0;
 }
 li.gGroup ul, li.gGroup div {
@@ -644,7 +644,7 @@ li.gGroup div p {
 li.gGroup .gUser {
   padding: .2em 0 0 .5em;
 }
-li.gGroup .gUser .gButtonLink {
+li.gGroup .gUser .g-button {
   vertical-align: middle;
 }
 
@@ -838,13 +838,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
 .gButtonSet {
   padding-left: 1px;
 }
@@ -853,7 +846,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: left;
 }
 
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
   margin: 0;
 }
 
@@ -1106,7 +1099,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 	clear: both;
 }
 
-#gTranslations .gButtonLink {
+#gTranslations .g-button {
 	padding: .5em;
 }
 
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index c6379c09..d9b011bd 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -37,7 +37,7 @@ $(document).ready(function(){
   if ($("#gAdminCommentsMenu").length) {
     $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
     $("#gAdminCommentsMenu").addClass("gButtonSet");
-    $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
+    $("#gAdminCommentsMenu a").addClass("g-button ui-state-default");
     $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
     $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
   }
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 90c71446..29b9f9d0 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -10,34 +10,34 @@
                              "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <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>
   <? endif ?>
   <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <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>
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
   <li class="g-txt-right">
   <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <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>
   <? endif ?>
   <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <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>
   <? endif ?>
   </li>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 9f3a53e6..6d955481 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -68,9 +68,9 @@ h3 {
 a,
 .gMenu a,
 #gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
 a.ui-state-hover,
 input.ui-state-hover,
 button.ui-state-hover {
@@ -884,13 +884,6 @@ form .gError,
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
 .gButtonSet {
   padding-left: 1px;
 }
@@ -899,7 +892,7 @@ form .gError,
   float: left;
 }
 
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
   margin: 0;
 }
 
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index c79e91bd..4a1962c0 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
   // Apply styles and icon classes to gContextMenu
   if ($(".gContextMenu").length) {
     $(".gContextMenu li").addClass("ui-state-default");
-    $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
+    $(".gContextMenu a").addClass("g-button ui-icon-left");
     $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
     $(".gContextMenu a span").each(function() {
       var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 8b8e43a8..cf7c9b7f 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,20 +5,20 @@
   <ul class="gPager">
     <li>
       <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <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>
       <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <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>
       <? endif; ?>
     </li>
     <li class="gInfo"><?= 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="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <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>
       <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <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>
       <? endif ?>
     </li>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index b57e0c9d..155c8d16 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -10,34 +10,34 @@
                              "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <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>
   <? endif ?>
   <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <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>
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
   <li class="g-txt-right">
   <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <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>
   <? endif ?>
   <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <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>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <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>
   <? endif ?>
   </li>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index 25e1ad39..def3d8b7 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -18,20 +18,20 @@
   <ul class="gPager">
     <li>
       <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <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>
       <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <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>
       <? endif; ?>
     </li>
     <li class="gInfo"><?= 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="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <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>
       <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <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>
       <? endif ?>
     </li>
-- 
cgit v1.2.3


From 60d35b89929d9029c794f72d6a9c38b676e282f6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Sep 2009 07:31:11 -0700
Subject: Use the block_manager to manage site sidebar panels. Fixes ticket
 #110. * Extend block_manager to handle sidebar blocks. get_available has
 become get_available_admin_blocks, get_list becomes get_admin_list. * Create
 new functions get_available_site_blocks which will look for gallery_block
 get_available_site_blocks. * Refactor sidebar_blocks into a separate function
 and then call block_manager::get_html(site.sidebar). Convert image_block to
 use block management instead of theme::sidebar_blocks * Change the
 block_manager api so that the theme is passed into the get method. convert
 info to the new sidebar block approach * Convert the user module to use the
 new sidebar block structure. remove the installers for info and image_block
 modules. * Convert tag and rss modules to the new sidebar framework. reset
 the version number to 1 for info and image_block modules. * Change the
 get_html method to ignore empty blocks and change the individual handlers to
 return an empty string if no block is generated * Add a warning message if no
 sidebar blocks are active and provide a link to the admin page that
 configures the sidebar.

---
 modules/comment/helpers/comment_block.php         |  2 +-
 modules/gallery/controllers/admin_dashboard.php   |  4 +-
 modules/gallery/controllers/admin_sidebar.php     | 28 ++++++++++
 modules/gallery/helpers/block_manager.php         | 24 ++++++---
 modules/gallery/helpers/gallery_block.php         |  5 +-
 modules/gallery/libraries/Theme_View.php          | 12 ++++-
 modules/gallery/module.info                       |  2 +-
 modules/gallery/views/admin_sidebar.html.php      |  9 ++++
 modules/image_block/helpers/image_block_block.php | 63 +++++++++++++++++++++++
 modules/image_block/helpers/image_block_theme.php | 50 ------------------
 modules/info/helpers/info_block.php               | 39 ++++++++++++++
 modules/info/helpers/info_theme.php               | 10 ----
 modules/rss/helpers/rss_block.php                 | 49 ++++++++++++++++++
 modules/rss/helpers/rss_theme.php                 | 40 --------------
 modules/tag/helpers/tag_block.php                 | 45 ++++++++++++++++
 modules/tag/helpers/tag_theme.php                 | 19 -------
 modules/user/helpers/user_block.php               | 46 +++++++++++++++++
 modules/user/helpers/user_theme.php               | 17 ------
 themes/wind/views/no_sidebar.html.php             |  5 ++
 19 files changed, 319 insertions(+), 150 deletions(-)
 create mode 100644 modules/gallery/controllers/admin_sidebar.php
 create mode 100644 modules/gallery/views/admin_sidebar.html.php
 create mode 100644 modules/image_block/helpers/image_block_block.php
 delete mode 100644 modules/image_block/helpers/image_block_theme.php
 create mode 100644 modules/info/helpers/info_block.php
 create mode 100644 modules/rss/helpers/rss_block.php
 delete mode 100644 modules/rss/helpers/rss_theme.php
 create mode 100644 modules/tag/helpers/tag_block.php
 create mode 100644 modules/user/helpers/user_block.php
 create mode 100644 themes/wind/views/no_sidebar.html.php

(limited to 'modules/user')

diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index 08182905..b989be6b 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class comment_block_Core {
-  static function get_list() {
+  static function get_admin_list() {
     return array("recent_comments" => t("Recent Comments"));
   }
 
diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index 3cb97b14..6bf3b966 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -34,7 +34,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
     $form = gallery_block::get_add_block_form();
     if ($form->validate()) {
       list ($module_name, $id) = explode(":", $form->add_block->id->value);
-      $available = block_manager::get_available();
+      $available = block_manager::get_available_admin_blocks();
 
       if ($form->add_block->center->value) {
         block_manager::add("dashboard_center", $module_name, $id);
@@ -66,7 +66,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
     }
 
     if (!empty($deleted)) {
-      $available = block_manager::get_available();
+      $available = block_manager::get_available_admin_blocks();
       $title = $available[join(":", $deleted)];
       message::success(t("Removed <b>%title</b> block", array("title" => $title)));
     }
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
new file mode 100644
index 00000000..7e71426a
--- /dev/null
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -0,0 +1,28 @@
+<?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 Admin_Sidebar_Controller extends Admin_Controller {
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_sidebar.html");
+    print $view;
+  }
+
+}
+
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 20b641d4..b99a6571 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -38,13 +38,21 @@ class block_manager_Core {
     self::set_active($location, $blocks);
   }
 
-  static function get_available() {
+  static function get_available_admin_blocks() {
+    return self::_get_blocks("get_admin_list");
+  }
+
+  static function get_available_site_blocks() {
+    return self::_get_blocks("get_site_list");
+  }
+
+  private static function _get_blocks($function) {
     $blocks = array();
 
     foreach (module::active() as $module) {
       $class_name = "{$module->name}_block";
-      if (method_exists($class_name, "get_list")) {
-        foreach (call_user_func(array($class_name, "get_list")) as $id => $title) {
+      if (method_exists($class_name, $function)) {
+        foreach (call_user_func(array($class_name, $function)) as $id => $title) {
           $blocks["{$module->name}:$id"] = $title;
         }
       }
@@ -52,14 +60,16 @@ class block_manager_Core {
     return $blocks;
   }
 
-  static function get_html($location) {
+  static function get_html($location, $theme) {
     $active = self::get_active($location);
     $result = "";
     foreach ($active as $id => $desc) {
       if (method_exists("$desc[0]_block", "get")) {
-        $block = call_user_func(array("$desc[0]_block", "get"), $desc[1]);
-        $block->id = $id;
-        $result .= $block;
+        $block = call_user_func(array("$desc[0]_block", "get"), $desc[1], $theme);
+        if (!empty($block)) {
+          $block->id = $id;
+          $result .= $block;
+        }
       }
     }
     return $result;
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b7816954..f2cb8ded 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_block_Core {
-  static function get_list() {
+  static function get_admin_list() {
     return array(
       "welcome" => t("Welcome to Gallery 3!"),
       "photo_stream" => t("Photo Stream"),
@@ -94,7 +94,8 @@ class gallery_block_Core {
     $form = new Forge("admin/dashboard/add_block", "", "post",
                       array("id" => "gAddDashboardBlockForm"));
     $group = $form->group("add_block")->label(t("Add Block"));
-    $group->dropdown("id")->label(t("Available Blocks"))->options(block_manager::get_available());
+    $group->dropdown("id")->label(t("Available Blocks"))
+      ->options(block_manager::get_available_admin_blocks());
     $group->submit("center")->value(t("Add to center"));
     $group->submit("sidebar")->value(t("Add to sidebar"));
     return $form;
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 728e8bf9..ab25a4b6 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -153,6 +153,17 @@ class Theme_View_Core extends Gallery_View {
     return message::get();
   }
 
+  /**
+   * Print out the sidebar.
+   */
+  public function sidebar_blocks() {
+    $sidebar = block_manager::get_html("site.sidebar", $this);
+    if (empty($sidebar) && user::active()->admin) {
+      $sidebar = new View("no_sidebar.html");
+    }
+    return $sidebar;
+  }
+
   /**
    * Handle all theme functions that insert module content.
    */
@@ -176,7 +187,6 @@ class Theme_View_Core extends Gallery_View {
     case "photo_top":
     case "resize_bottom":
     case "resize_top":
-    case "sidebar_blocks":
     case "sidebar_bottom":
     case "sidebar_top":
     case "thumb_bottom":
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index bffcb1c6..f509ff08 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 14
+version = 15
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
new file mode 100644
index 00000000..32386f5d
--- /dev/null
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -0,0 +1,9 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<h1> <?= t("Arrange 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>
+
+<div id="gSiteBlocks">
+</div>
\ No newline at end of file
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
new file mode 100644
index 00000000..d0402eb6
--- /dev/null
+++ b/modules/image_block/helpers/image_block_block.php
@@ -0,0 +1,63 @@
+<?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 image_block_block_Core {
+  static function get_site_list() {
+    return array("random_image" => t("Random Image"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "random_image":
+      $block = new Block();
+      $block->css_id = "gImageBlock";
+      $block->title = t("Random Image");
+      $block->content = new View("image_block_block.html");
+
+      $random = ((float)mt_rand()) / (float)mt_getrandmax();
+
+      $items = ORM::factory("item")
+        ->viewable()
+        ->where("type !=", "album")
+        ->where("rand_key < ", $random)
+        ->orderby(array("rand_key" => "DESC"))
+        ->find_all(1);
+
+      if ($items->count() == 0) {
+        // Try once more.  If this fails, just ditch the block altogether
+        $items = ORM::factory("item")
+          ->viewable()
+          ->where("type !=", "album")
+          ->where("rand_key >= ", $random)
+          ->orderby(array("rand_key" => "DESC"))
+          ->find_all(1);
+      }
+
+      if ($items->count() > 0) {
+        $block->content->item = $items->current();
+      } else {
+        $block = "";
+      }
+      break;
+    }
+
+    return $block;
+  }
+}
diff --git a/modules/image_block/helpers/image_block_theme.php b/modules/image_block/helpers/image_block_theme.php
deleted file mode 100644
index 78138b23..00000000
--- a/modules/image_block/helpers/image_block_theme.php
+++ /dev/null
@@ -1,50 +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 image_block_theme_Core {
-  static function sidebar_blocks($theme) {
-    $block = new Block();
-    $block->css_id = "gImageBlock";
-    $block->title = t("Random Image");
-    $block->content = new View("image_block_block.html");
-
-    $random = ((float)mt_rand()) / (float)mt_getrandmax();
-
-    $items = ORM::factory("item")
-      ->viewable()
-      ->where("type !=", "album")
-      ->where("rand_key < ", $random)
-      ->orderby(array("rand_key" => "DESC"))
-      ->find_all(1);
-
-    if ($items->count() == 0) {
-      // Try once more.  If this fails, just ditch the block altogether
-      $items = ORM::factory("item")
-        ->viewable()
-        ->where("type !=", "album")
-        ->where("rand_key >= ", $random)
-        ->orderby(array("rand_key" => "DESC"))
-        ->find_all(1);
-    }
-
-    $block->content->item = $items->current();
-
-    return $items->count() == 0 ? "" : $block;
-  }
-}
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
new file mode 100644
index 00000000..3a853609
--- /dev/null
+++ b/modules/info/helpers/info_block.php
@@ -0,0 +1,39 @@
+<?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 info_block_Core {
+  static function get_site_list() {
+    return array("metadata" => t("Metadata"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "metadata":
+      if ($theme->item()) {
+        $block = new Block();
+        $block->css_id = "gMetadata";
+        $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
+        $block->content = new View("info_block.html");
+      }
+      break;
+    }
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 4bf894ad..8b8602a1 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -18,16 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class info_theme_Core {
-  static function sidebar_blocks($theme) {
-    if ($theme->item()) {
-      $block = new Block();
-      $block->css_id = "gMetadata";
-      $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
-      $block->content = new View("info_block.html");
-      return $block;
-    }
-  }
-
   static function thumb_info($theme, $item) {
     $results = "";
     if ($item->view_count) {
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
new file mode 100644
index 00000000..43043f5f
--- /dev/null
+++ b/modules/rss/helpers/rss_block.php
@@ -0,0 +1,49 @@
+<?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 rss_block_Core {
+  static function get_site_list() {
+    return array("rss_feeds" => t("Available RSS Feeds"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "rss_feeds":
+      $feeds = array();
+      foreach (module::active() as $module) {
+        $class_name = "{$module->name}_rss";
+        if (method_exists($class_name, "available_feeds")) {
+          $feeds = array_merge($feeds,
+            call_user_func(array($class_name, "available_feeds"), $theme->item(), $theme->tag()));
+        }
+      }
+      if (!empty($feeds)) {
+        $block = new Block();
+        $block->css_id = "gRss";
+        $block->title = t("Available RSS Feeds");
+        $block->content = new View("rss_block.html");
+        $block->content->feeds = $feeds;
+      }
+      break;
+    }
+
+    return $block;
+  }
+}
diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
deleted file mode 100644
index 3d1b9a29..00000000
--- a/modules/rss/helpers/rss_theme.php
+++ /dev/null
@@ -1,40 +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 rss_theme_Core {
-  static function sidebar_blocks($theme) {
-    $block = new Block();
-    $block->css_id = "gRss";
-    $block->title = t("Available RSS Feeds");
-    $block->content = new View("rss_block.html");
-    $block->content->feeds = array();
-    foreach (module::active() as $module) {
-      $class_name = "{$module->name}_rss";
-      if (method_exists($class_name, "available_feeds")) {
-        $block->content->feeds = array_merge(
-          $block->content->feeds,
-          call_user_func(array($class_name, "available_feeds"), $theme->item(), $theme->tag()));
-      }
-    }
-
-    if ($block->content->feeds) {
-      return $block;
-    }
-  }
-}
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
new file mode 100644
index 00000000..bbcc5fd1
--- /dev/null
+++ b/modules/tag/helpers/tag_block.php
@@ -0,0 +1,45 @@
+<?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 tag_block_Core {
+  static function get_site_list() {
+    return array("tag" => t("Popular Tags"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "tag":
+      $block = new Block();
+      $block->css_id = "gTag";
+      $block->title = t("Popular Tags");
+      $block->content = new View("tag_block.html");
+      $block->content->cloud = tag::cloud(30);
+
+      if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) {
+        $controller = new Tags_Controller();
+        $block->content->form = tag::get_add_form($theme->item());
+      } else {
+        $block->content->form = "";
+      }
+      break;
+    }
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 1bce9bd8..4f22d2ac 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -28,25 +28,6 @@ class tag_theme_Core {
     $theme->script("tag.js");
   }
 
-  static function sidebar_blocks($theme) {
-    // @todo this needs to be data driven
-
-    $block = new Block();
-    $block->css_id = "gTag";
-    $block->title = t("Popular Tags");
-    $block->content = new View("tag_block.html");
-    $block->content->cloud = tag::cloud(30);
-
-    if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) {
-      $controller = new Tags_Controller();
-      $block->content->form = tag::get_add_form($theme->item());
-    } else {
-      $block->content->form = "";
-    }
-
-    return $block;
-  }
-
   static function sort_by_name($tag1, $tag2) {
     return strcasecmp($tag1->name, $tag2->name);
   }
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
new file mode 100644
index 00000000..e7671f06
--- /dev/null
+++ b/modules/user/helpers/user_block.php
@@ -0,0 +1,46 @@
+<?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 = "gUserLanguageBlock";
+        $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_theme.php b/modules/user/helpers/user_theme.php
index 098d87fd..69d63eaf 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -33,21 +33,4 @@ class user_theme_Core {
       return $view->render();
     }
   }
-
-  static function sidebar_blocks($theme) {
-    $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 = "gUserLanguageBlock";
-      $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();
-      return $block;
-    }
-  }
 }
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
new file mode 100644
index 00000000..7324cf9e
--- /dev/null
+++ b/themes/wind/views/no_sidebar.html.php
@@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="gWarning">
+  <?= t("No active sidebar panels. <a href=\"%url\">Add panels</a>",
+          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
+</div>
-- 
cgit v1.2.3


From 0c3c13d27f4c199ac23020edfa5b463f0bf64acf Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 21:12:00 -0600
Subject: Removed blank line.

---
 modules/user/views/login_ajax.html.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index 56bc1cbd..2416fe7a 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -25,7 +25,6 @@
           $("#gDialog").dialog("close");
           window.location.reload();
         }
-
       }
     });
   };
-- 
cgit v1.2.3


From 1f252f0609435b41ab085a24bafab94a0269052d Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 21:52:51 -0600
Subject: Missed g-right application on add group

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

(limited to 'modules/user')

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 5ee62fae..0741a932 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -105,7 +105,7 @@
 
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="gDialogLink g-button right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
-- 
cgit v1.2.3


From 8f3691d502555cd497af56999d3a657b096dfd15 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 22:20:34 -0600
Subject: Apply button style and hover effect to password reset button.

---
 modules/user/views/login_ajax.html.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/user')

diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index 2416fe7a..a7530134 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -7,6 +7,8 @@
         success: function(data) {
           $("div#gLoginView").html(data);
           $("#ui-dialog-title-gDialog").html(<?= t("Reset Password")->for_js() ?>);
+          $(".submit").addClass("g-button ui-state-default ui-corner-all");
+          $(".submit").gallery_hover_init();
           ajaxify_login_reset_form();
         }
       });
-- 
cgit v1.2.3


From e1e8904e4a82792effd721fc0b4c028d86cf177a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 22:49:36 -0600
Subject: Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor
 CSS id's and classes in the login/reset password dialog.

---
 lib/gallery.common.css                             | 56 ++++++++++++++---
 lib/gallery.common.js                              |  4 +-
 lib/gallery.dialog.js                              | 72 +++++++++++-----------
 modules/exif/helpers/exif.php                      |  2 +-
 modules/exif/views/exif_sidebar.html.php           |  2 +-
 modules/g2_import/views/admin_g2_import.html.php   |  2 +-
 modules/gallery/helpers/graphics.php               |  2 +-
 modules/gallery/libraries/Menu.php                 |  2 +-
 .../gallery/views/admin_advanced_settings.html.php |  2 +-
 modules/gallery/views/admin_maintenance.html.php   |  8 +--
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 modules/gallery/views/admin_themes.html.php        |  4 +-
 modules/organize/js/organize.js                    | 16 ++---
 modules/organize/views/organize_dialog.html.php    |  2 +-
 modules/search/helpers/search.php                  |  2 +-
 modules/server_add/js/server_add.js                |  4 +-
 modules/tag/js/tag.js                              |  2 +-
 modules/tag/views/admin_tags.html.php              |  2 +-
 modules/user/helpers/group.php                     |  1 +
 modules/user/helpers/user.php                      |  3 +
 modules/user/views/admin_users.html.php            |  8 +--
 modules/user/views/admin_users_group.html.php      |  4 +-
 modules/user/views/login.html.php                  |  2 +-
 modules/user/views/login_ajax.html.php             | 24 ++++----
 modules/watermark/views/admin_watermarks.html.php  |  6 +-
 themes/admin_wind/css/screen.css                   | 55 ++---------------
 themes/admin_wind/js/ui.init.js                    |  2 +-
 themes/wind/css/fix-ie.css                         |  2 +-
 themes/wind/css/screen.css                         | 63 +++----------------
 themes/wind/js/ui.init.js                          |  4 +-
 themes/wind/views/album.html.php                   |  2 +-
 31 files changed, 158 insertions(+), 204 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 601f6609..54453012 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -3,9 +3,10 @@
  *
  * Sheet organization:
  *  1)  Text
- *  2)  States and interactions
- *  3)  Positioning and order
- *  4)  Reusable containers/widgets
+ *  2)  Dimension and scale
+ *  3)  States and interactions
+ *  4)  Positioning and order
+ *  5)  Containers/widgets
  */
 
 /** *******************************************************************
@@ -24,8 +25,16 @@
   text-align: right;
 }
 
+
+/** *******************************************************************
+ * 2) Dimension and scale
+ **********************************************************************/
+
+.g-narrow {
+}
+
 /** *******************************************************************
- * 2) States and interactions
+ * 3) States and interactions
  **********************************************************************/
 
 .g-active,
@@ -105,7 +114,7 @@ form .g-error {
 }
 
 /** *******************************************************************
- * 3) Positioning and order
+ * 4) Positioning and order
  **********************************************************************/
 
 .g-left {
@@ -131,10 +140,43 @@ form .g-error {
 }
 
 /** *******************************************************************
- * 4) Reusable containers/widgets
+ * 5) Containers/widgets
  **********************************************************************/
 
-.g-dialog {
+#g-dialog {
+  text-align: left;
+}
+
+#g-dialog .g-narrow {
+  margin: 0 auto;
+  width: 270px;
+}
+
+#g-dialog fieldset {
+  border: none;
+}
+
+#g-dialog legend {
+  display: none;
+}
+
+#g-dialog form input[type="text"],
+#g-dialog form input[type="password"] {
+  width: 100%;
+}
+
+#g-dialog p {
+	margin: 0;
+}
+
+#g-dialog li {
+  padding-left: 0;
+}
+
+#g-dialog .g-cancel {
+  clear: none;
+  float: left;
+  margin: .3em 1em;
 }
 
 .g-button {
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index a91f021e..59482b22 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -53,7 +53,7 @@
     return this.each(function(i){
       var size;
       switch ($(this).attr("id")) {
-      case "#gDialog":
+      case "#g-dialog":
         case "#gPanel":
           size = "Large";
         break;
@@ -133,7 +133,7 @@
         function() {
           if (in_progress == 0) {
             $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
-            $(this).find(".gDialogLink").gallery_dialog();
+            $(this).find(".g-dialogLink").gallery_dialog();
             $(this).find(".gAjaxLink").gallery_ajax();
           }
         },
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 39c451e3..a70200f9 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -15,75 +15,75 @@
 
      _show: function(sHref) {
        var self = this;
-       var eDialog = '<div id="gDialog"></div>';
+       var eDialog = '<div id="g-dialog"></div>';
 
        $("body").append(eDialog);
 
        if (!self.options.close) {
          self.options.close = self.close_dialog;
        }
-       $("#gDialog").dialog(self.options);
+       $("#g-dialog").dialog(self.options);
 
-       $("#gDialog").gallery_show_loading();
+       $("#g-dialog").gallery_show_loading();
 
        $.get(sHref, function(data) {
-         $("#gDialog").html(data).gallery_show_loading();
+         $("#g-dialog").html(data).gallery_show_loading();
 
-         if ($("#gDialog form").length) {
-           self.form_loaded(null, $("#gDialog form"));
+         if ($("#g-dialog form").length) {
+           self.form_loaded(null, $("#g-dialog form"));
          }
          self._layout();
 
-         $("#gDialog").dialog("open");
+         $("#g-dialog").dialog("open");
          // Remove titlebar for progress dialogs or set title
-         if ($("#gDialog #gProgress").length) {
+         if ($("#g-dialog #gProgress").length) {
            $(".ui-dialog-titlebar").remove();
-         } else if ($("#gDialog h1").length) {
-           $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
-         } else if ($("#gDialog fieldset legend").length) {
-           $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
+         } else if ($("#g-dialog h1").length) {
+           $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html());
+         } else if ($("#g-dialog fieldset legend").length) {
+           $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html());
          }
 
-         if ($("#gDialog form").length) {
+         if ($("#g-dialog form").length) {
            self._ajaxify_dialog();
          }
        });
-       $("#gDialog").dialog("option", "self", self);
+       $("#g-dialog").dialog("option", "self", self);
      },
 
      _layout: function() {
        var dialogWidth;
-       var dialogHeight = $("#gDialog").height();
-       var cssWidth = new String($("#gDialog form").css("width"));
+       var dialogHeight = $("#g-dialog").height();
+       var cssWidth = new String($("#g-dialog form").css("width"));
        var childWidth = cssWidth.replace(/[^0-9]/g,"");
        var size = $.gallery_get_viewport_size();
-       if ($("#gDialog iframe").length) {
+       if ($("#g-dialog iframe").length) {
          dialogWidth = size.width() - 100;
          // Set the iframe width and height
-         $("#gDialog iframe").width("100%").height(size.height() - 100);
-       } else if ($("#gDialog .gDialogPanel").length) {
+         $("#g-dialog iframe").width("100%").height(size.height() - 100);
+       } else if ($("#g-dialog .g-dialogPanel").length) {
          dialogWidth = size.width() - 100;
-         $("#gDialog").dialog("option", "height", size.height() - 100);
+         $("#g-dialog").dialog("option", "height", size.height() - 100);
        } else if (childWidth == "" || childWidth > 300) {
          dialogWidth = 500;
        }
-       $("#gDialog").dialog('option', 'width', dialogWidth);
+       $("#g-dialog").dialog('option', 'width', dialogWidth);
      },
 
      form_loaded: function(event, ui) {
        // Should be defined (and localized) in the theme
        MSG_CANCEL = MSG_CANCEL || 'Cancel';
-       var eCancel = '<a href="#" class="gCancel">' + MSG_CANCEL + '</a>';
-       if ($("#gDialog .submit").length) {
-         $("#gDialog .submit").addClass("ui-state-default ui-corner-all");
+       var eCancel = '<a href="#" class="g-cancel">' + MSG_CANCEL + '</a>';
+       if ($("#g-dialog .submit").length) {
+         $("#g-dialog .submit").addClass("ui-state-default ui-corner-all");
          $.fn.gallery_hover_init();
-         $("#gDialog .submit").parent().append(eCancel);
-         $("#gDialog .gCancel").click(function(event) {
-           $("#gDialog").dialog("close");
+         $("#g-dialog .submit").parent().append(eCancel);
+         $("#g-dialog .g-cancel").click(function(event) {
+           $("#g-dialog").dialog("close");
            event.preventDefault();
          });
         }
-       $("#gDialog .ui-state-default").hover(
+       $("#g-dialog .ui-state-default").hover(
          function() {
            $(this).addClass("ui-state-hover");
          },
@@ -94,23 +94,23 @@
      },
 
      close_dialog: function(event, ui) {
-       var self = $("#gDialog").dialog("option", "self");
-       if ($("#gDialog form").length) {
-         self._trigger("form_closing", null, $("#gDialog form"));
+       var self = $("#g-dialog").dialog("option", "self");
+       if ($("#g-dialog form").length) {
+         self._trigger("form_closing", null, $("#g-dialog form"));
        }
-       self._trigger("dialog_closing", null, $("#gDialog"));
-       $("#gDialog").dialog("destroy").remove();
+       self._trigger("dialog_closing", null, $("#g-dialog"));
+       $("#g-dialog").dialog("destroy").remove();
      },
 
      _ajaxify_dialog: function() {
        var self = this;
-       $("#gDialog form").ajaxForm({
+       $("#g-dialog form").ajaxForm({
          dataType: "json",
          success: function(data) {
            if (data.form) {
-             $("#gDialog form").replaceWith(data.form);
+             $("#g-dialog form").replaceWith(data.form);
              self._ajaxify_dialog();
-             self.form_loaded(null, $("#gDialog form"));
+             self.form_loaded(null, $("#g-dialog form"));
              if (typeof data.reset == 'function') {
                eval(data.reset + '()');
              }
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 83540622..453690ea 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -163,7 +163,7 @@ class exif_Core {
     list ($remaining) = exif::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your Exif index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
+        t('Your Exif index needs to be updated.  <a href="%url" class="g-dialogLink">Fix this now</a>',
           array("url" => html::mark_clean(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))),
         "exif_index_out_of_date");
     }
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index 23ecab03..3c7bb517 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
-  class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
+  class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
   <span class="ui-icon ui-icon-info"></span>
   <?= t("View more information") ?>
 </a>
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 91b723ad..314f030b 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -84,7 +84,7 @@
     </div>
 
     <p>
-      <a class="g-button gDialogLink ui-state-default ui-corner-all"
+      <a class="g-button g-dialogLink ui-state-default ui-corner-all"
          href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
         <?= t("Begin import!") ?>
       </a>
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 0e32022f..f9b88638 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -249,7 +249,7 @@ class graphics_Core {
              "%count of your photos are out of date. <a %attrs>Click here to fix them</a>",
              $count,
              array("attrs" => html::mark_clean(sprintf(
-               'href="%s" class="gDialogLink"',
+               'href="%s" class="g-dialogLink"',
                url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))),
           "graphics_dirty");
     }
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 07b2b2b8..4be374a2 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -142,7 +142,7 @@ class Menu_Element_Dialog extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gDialogLink $css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"g-dialogLink $css_class\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index c3595da5..6ad265ac 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -23,7 +23,7 @@
       <td> <?= html::clean($var->name) ?> </td>
       <td>
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
-          class="gDialogLink"
+          class="g-dialogLink"
           title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
           <? if ($var->value): ?>
           <?= html::clean($var->value) ?>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 8c3917b6..977ba75b 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -30,7 +30,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
+            class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -100,7 +100,7 @@
             <?= t("cancel") ?>
           </a>
           <? if ($task->state == "stalled"): ?>
-          <a class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"
+          <a class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"
              href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
           </a>
@@ -170,12 +170,12 @@
             <?= t("remove") ?>
           </a>
           <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink g-button ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialogLink g-button ui-state-default ui-corner-all">
             <?= t("browse log") ?>
           </a>
           <? endif ?>
           <? else: ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink g-button" ui-state-default ui-corner-all>
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialogLink g-button" ui-state-default ui-corner-all>
             <?= t("resume") ?>
           </a>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 2dfef90f..c61db871 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -9,7 +9,7 @@
 appendTo('body').submit().remove();
   };
 </script>
-<div id="gTaskLogDialog">
+<div id="gTaskLog-dialog">
   <h1> <?= $task->name ?> </h1>
   <div class="gTaskLog">
     <pre><?= html::purify($task->get_log()) ?></pre>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index 0aac4717..d0ffc414 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -30,7 +30,7 @@
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
     <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
@@ -68,7 +68,7 @@
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
     <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index cfaff01c..bee42a22 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -138,19 +138,19 @@
       var self = this;
       // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
       $(".sf-menu li.sfHover ul").css("z-index", 68);
-      $("#gDialog").dialog("option", "zIndex", 70);
-      $("#gDialog").bind("dialogopen", function(event, ui) {
-        $("#gOrganize").height($("#gDialog").innerHeight() - 20);
-        $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
-        $("#gOrganizeTreeContainer").height($("#gDialog").innerHeight() - 59);
+      $("#g-dialog").dialog("option", "zIndex", 70);
+      $("#g-dialog").bind("dialogopen", function(event, ui) {
+        $("#gOrganize").height($("#g-dialog").innerHeight() - 20);
+        $("#gOrganizeMicroThumbPanel").height($("#g-dialog").innerHeight() - 90);
+        $("#gOrganizeTreeContainer").height($("#g-dialog").innerHeight() - 59);
       });
 
-      $("#gDialog").bind("dialogclose", function(event, ui) {
+      $("#g-dialog").bind("dialogclose", function(event, ui) {
         window.location.reload();
       });
 
-      $("#gDialog #gOrganizeClose").click(function(event) {
-        $("#gDialog").dialog("close");
+      $("#g-dialog #gOrganizeClose").click(function(event) {
+        $("#g-dialog").dialog("close");
       });
 
       $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) {
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 87f12be9..09720fe4 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,7 +5,7 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
   var tree_url = "<?= url::site("organize/tree/__ALBUM_ID__") ?>";
 </script>
-<div id="gOrganize" class="gDialogPanel">
+<div id="gOrganize" class="g-dialogPanel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 0080b4ce..c73eda08 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -57,7 +57,7 @@ class search_Core {
     list ($remaining) = search::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your search index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
+        t('Your search index needs to be updated.  <a href="%url" class="g-dialogLink">Fix this now</a>',
           array("url" => html::mark_clean(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))),
         "search_index_out_of_date");
     }
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 50a8c36b..86bff079 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -21,7 +21,7 @@
          self.run_add();
        });
        $("#gServerAddCloseButton", this.element).click(function(event) {
-         $("#gDialog").dialog("close");
+         $("#g-dialog").dialog("close");
          window.location.reload();
        });
        $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
@@ -33,7 +33,7 @@
        $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#gDialog").bind("dialogclose", function(event, ui) {
+       $("#g-dialog").bind("dialogclose", function(event, ui) {
          window.location.reload();
        });
      },
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 52c695c6..ab3691a6 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -24,7 +24,7 @@ function closeEditInPlaceForms() {
     $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
     li.height("");
     $(".gEditable", li).bind("click", editInPlace);
-    $(".gDialogLink", li).gallery_dialog();
+    $(".g-dialogLink", li).gallery_dialog();
   }
 }
 
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index b7344cda..a4bd5d8f 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -50,7 +50,7 @@
             <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
             <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="gDialogLink delete-link g-button">
+               class="g-dialogLink delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 04e6efd6..e0dfac8e 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -86,6 +86,7 @@ class group_Core {
 
   static function get_add_form_admin() {
     $form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm"));
+    $form->set_attr('class', "g-narrow");
     $form_group = $form->group("add_group")->label(t("Add Group"));
     $form_group->input("name")->label(t("Name"))->id("gName");
     $form_group->inputs["name"]->error_messages(
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index b9162b92..93c385a3 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,6 +26,7 @@
 class user_Core {
   static function get_edit_form($user) {
     $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gEditUserForm"));
+    $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
     $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
@@ -66,6 +67,7 @@ class user_Core {
 
   static function get_add_form_admin() {
     $form = new Forge("admin/users/add_user", "", "post", array("id" => "gAddUserForm"));
+    $form->set_attr('class', "g-narrow");
     $group = $form->group("add_user")->label(t("Add User"));
     $group->input("name")->label(t("Username"))->id("gUsername")
       ->error_messages("in_use", t("There is already a user with that username"));
@@ -112,6 +114,7 @@ class user_Core {
 
   static function get_login_form($url) {
     $form = new Forge($url, "", "post", array("id" => "gLoginForm"));
+    $form->set_attr('class', "g-narrow");
     $group = $form->group("login")->label(t("Login"));
     $group->input("name")->label(t("Username"))->id("gUsername")->class(null);
     $group->password("password")->label(t("Password"))->id("gPassword")->class(null);
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 0741a932..a46e402f 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .gDialogLink").gallery_dialog();
+            $("#group-" + group_id + " .g-dialogLink").gallery_dialog();
           });
   }
 
@@ -43,7 +43,7 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
@@ -89,7 +89,7 @@
             <span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
           <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="gDialogLink g-button ui-state-default ui-corner-all ui-icon-left">
+              class="g-dialogLink g-button ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
           <? else: ?>
           <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
@@ -105,7 +105,7 @@
 
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="gDialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 6f2496f8..e5c9fcee 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
   <? if (!$group->special): ?>
   <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="gDialogLink g-button ui-state-default ui-corner-all">
+    class="g-dialogLink g-button ui-state-default ui-corner-all">
     <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="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
+     class="g-dialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? endif ?>
 </h4>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index bb670d51..c814bbfa 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -11,7 +11,7 @@
     <?= 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() .
-      '" id="gUserProfileLink" class="gDialogLink">' .
+      '" id="gUserProfileLink" class="g-dialogLink">' .
       html::clean($user->display_name()) . '</a>'))) ?>
   </li>
   <li>
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index a7530134..d3364b46 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -1,12 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
-  $("#gLoginForm").ready(function() {
-    $("#gForgotPasswordLink").click(function() {
+  $("#g-login-form").ready(function() {
+    $("#g-password-reset").click(function() {
       $.ajax({
         url: "<?= url::site("password/reset") ?>",
         success: function(data) {
-          $("div#gLoginView").html(data);
-          $("#ui-dialog-title-gDialog").html(<?= t("Reset Password")->for_js() ?>);
+          $("#g-login").html(data);
+          $("#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();
@@ -16,30 +16,28 @@
   });
 
   function ajaxify_login_reset_form() {
-    $("#gLoginView form").ajaxForm({
+    $("#g-login form").ajaxForm({
       dataType: "json",
       success: function(data) {
         if (data.form) {
-          $("#gLoginView form").replaceWith(data.form);
+          $("#g-login form").replaceWith(data.form);
           ajaxify_login_reset_form();
         }
         if (data.result == "success") {
-          $("#gDialog").dialog("close");
+          $("#g-dialog").dialog("close");
           window.location.reload();
         }
       }
     });
   };
 </script>
-<div id="gLoginView">
+<div id="g-login">
   <ul>
-    <li>
-      <div id="gLoginViewForm">
-        <?= $form ?>
-      </div>
+    <li id="g-login-form">
+      <?= $form ?>
     </li>
     <li>
-      <a href="#" id="gForgotPasswordLink"><?= t("Forgot Your Password?") ?></a>
+      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
     </li>
   </ul>
 </div>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 3790030d..285f6407 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -8,7 +8,7 @@
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
      title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="gDialogLink 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>
+     class="g-dialogLink 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>
   <p>
@@ -27,10 +27,10 @@
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
          title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+         class="g-dialogLink 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() ?>"
-         class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+         class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
     </div>
   </div>
   <? endif ?>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2679386b..24c63756 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -67,7 +67,7 @@ h3 {
 
 a,
 .gMenu a,
-#gDialog a,
+#g-dialog a,
 .g-button,
 .g-button:hover,
 .g-button:active,
@@ -80,7 +80,7 @@ button.ui-state-hover {
 }
 
 a:hover,
-#gDialog a:hover {
+#g-dialog a:hover {
   text-decoration: underline;
 }
 
@@ -88,21 +88,6 @@ a:hover,
   text-decoration: none;
 }
 
-#gDialog .gCancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
-
-#gForgotPasswordLink {
-  float: right;
-  font-size: .9em;
-}
-
-#gDialog .gCancel {
-  float: left;
-}
-
 /* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 table {
@@ -782,7 +767,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   font-size: 0;
 }
 
-.gDialogLoadingLarge {
+.g-dialogLoadingLarge {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
@@ -836,34 +821,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   opacity: .7;
 }
 
-#gDialog {
-  text-align: left;
-}
-
-#gDialog li {
-  padding-left: 0;
-}
-
-#gDialog form input[type="text"],
-#gDialog form input[type="password"] {
-  width: 100%;
-}
-
-#gDialog #gLoginForm,
-#gDialog #gAddUserForm,
-#gDialog #gAddGroupForm {
-  margin: 0 auto;
-  width: 270px;
-}
-
-#gDialog fieldset {
-  border: none;
-}
-
-#gDialog legend {
-  display: none;
-}
-
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonSet {
@@ -1056,7 +1013,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: right;
 }
 
-#gTaskLogDialog h1 {
+#gTaskLog-dialog h1 {
   font-size: 1.1em;
 }
 
@@ -1143,7 +1100,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 .rtl caption,
 .rtl th,
-.rtl #gDialog {
+.rtl #g-dialog {
   text-align: right;
 }
 
@@ -1159,7 +1116,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: left;
 }
 
-.rtl #gDialog .gCancel,
+.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index d9b011bd..a603f87f 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
   $("#gMessage li").gallery_show_message();
 
   // Initialize modal dialogs
-  $(".gDialogLink").gallery_dialog();
+  $(".g-dialogLink").gallery_dialog();
 
   // Initialize ajax links
   $(".gAjaxLink").gallery_ajax();
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 4c13764f..8899ec59 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -23,7 +23,7 @@ input.submit {
   width: 110px;
 }
 
-#gDialog a.gCancel {
+#g-dialog a.g-cancel {
   display: inline-block !important;
   float: none !important;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 8f17e310..ec75d310 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -67,7 +67,7 @@ h3 {
 
 a,
 .gMenu a,
-#gDialog a,
+#g-dialog a,
 .g-button,
 .g-button:hover,
 .g-button:active,
@@ -81,7 +81,7 @@ button.ui-state-hover {
 }
 
 a:hover,
-#gDialog a:hover {
+#g-dialog a:hover {
   text-decoration: underline;
 }
 
@@ -89,22 +89,7 @@ a:hover,
   text-decoration: none;
 }
 
-#gDialog .gCancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
-
-#gForgotPasswordLink {
-  float: right;
-  font-size: .9em;
-}
-
-#gDialog .gCancel {
-  float: left;
-}
-
-#gDialog #gMessage li {
+#g-dialog #gMessage li {
   width: 400px;
   white-space: normal;
   padding-left: 32px;
@@ -685,13 +670,13 @@ form .gError,
   font-weight: bold;
 }
 
-#gDialog ul.gBreadcrumbs {
+#g-dialog ul.gBreadcrumbs {
   clear: both;
   margin-left: 0;
   padding-left: 0;
 }
 
-#gDialog .gBreadcrumbs li {
+#g-dialog .gBreadcrumbs li {
   font-size: .9em;
 }
 
@@ -822,7 +807,7 @@ form .gError,
   font-size: 0;
 }
 
-.gDialogLoadingLarge {
+.g-dialogLoadingLarge {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
@@ -850,38 +835,6 @@ form .gError,
   opacity: .7;
 }
 
-#gDialog {
-  text-align: left;
-}
-
-#gDialog li {
-  padding-left: 0;
-}
-
-#gDialog form input[type="text"],
-#gDialog form input[type="password"] {
-  width: 100%;
-}
-
-#gDialog #gLoginForm,
-#gDialog #gAddUserForm,
-#gDialog #gAddGroupForm {
-  margin: 0 auto;
-  width: 270px;
-}
-
-#gDialog fieldset {
-  border: none;
-}
-
-#gDialog legend {
-  display: none;
-}
-
-#gDialog p {
-	margin: 0;
-}
-
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonSet {
@@ -1097,7 +1050,7 @@ form .gError,
 
 .rtl caption,
 .rtl th,
-.rtl #gDialog {
+.rtl #g-dialog {
   text-align: right;
 }
 
@@ -1109,7 +1062,7 @@ form .gError,
   float: left;
 }
 
-.rtl #gDialog .gCancel,
+.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 4a1962c0..4b3b4306 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -26,8 +26,8 @@ $(document).ready(function() {
   $("#gMessage li").gallery_show_message();
 
   // Initialize dialogs
-  $("#gLoginLink").addClass("gDialogLink");
-  $(".gDialogLink").gallery_dialog();
+  $("#gLoginLink").addClass("g-dialogLink");
+  $(".g-dialogLink").gallery_dialog();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 01f7be50..fd647f81 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -30,7 +30,7 @@
   <? if ($user->admin || access::can("add", $item)): ?>
   <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialogLink\""))) ?></li>
   <? else: ?>
   <li><?= t("There aren't any photos here yet!") ?></li>
   <? endif; ?>
-- 
cgit v1.2.3


From 9145331fd420ec3fe86833a7b9567ec42f1d84e8 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 3 Oct 2009 12:33:53 -0600
Subject: Renamed and moved gOdd/gEven CSS classes.

---
 lib/gallery.common.css                                     |  2 ++
 modules/comment/views/admin_block_recent_comments.html.php |  2 +-
 modules/comment/views/admin_comments.html.php              |  2 +-
 modules/gallery/tests/xss_data.txt                         | 14 +++++++-------
 modules/gallery/views/admin_maintenance.html.php           |  6 +++---
 modules/gallery/views/admin_modules.html.php               |  2 +-
 modules/user/views/admin_users.html.php                    |  2 +-
 themes/admin_wind/css/screen.css                           |  8 --------
 8 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 54453012..5768e1cf 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -134,9 +134,11 @@ form .g-error {
 }
 
 .g-even-row {
+  background-color: #fff;
 }
 
 .g-odd-row {
+  background-color: #eee;
 }
 
 /** *******************************************************************
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index 2afa5bf8..ca0d1c0b 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <? foreach ($comments as $i => $comment): ?>
-  <li class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+  <li class="<?= ($i % 2 == 0) ? "g-even-row" : "g-odd-row" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
          class="gAvatar"
          alt="<?= html::clean_attribute($comment->author_name()) ?>"
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index ec5ad7b2..82de378c 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,7 +103,7 @@
       </th>
     </tr>
     <? foreach ($comments as $i => $comment): ?>
-    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
+    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
       <td>
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 7d3cf362..5fd6a390 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -1,12 +1,12 @@
 modules/akismet/views/admin_akismet.html.php                 16  DIRTY    $form
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR $api_key
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urlencode($blog_url)
-modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"gEvenRow":"gOddRow"
+modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"g-even-row":"g-odd-row"
 modules/comment/views/admin_block_recent_comments.html.php   5   DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
 modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    gallery::date_time($comment->created)
 modules/comment/views/admin_comments.html.php                42  DIRTY    $menu
 modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR $comment->id
-modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/comment/views/admin_comments.html.php                109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/admin_comments.html.php                122 DIRTY_JS $item->url()
 modules/comment/views/admin_comments.html.php                124 DIRTY_ATTR $item->thumb_url()
@@ -72,18 +72,18 @@ modules/gallery/views/admin_languages.html.php               28  DIRTY    form::
 modules/gallery/views/admin_languages.html.php               29  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               31  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               102 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
 modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
 modules/gallery/views/admin_maintenance.html.php             74  DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             77  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             92  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
 modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
 modules/gallery/views/admin_maintenance.html.php             147 DIRTY    gallery::date_time($task->updated)
@@ -93,7 +93,7 @@ modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::s
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
 modules/gallery/views/admin_modules.html.php                 9   DIRTY    access::csrf_form_field()
-modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"gOddRow":"gEvenRow"
+modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
 modules/gallery/views/admin_modules.html.php                 22  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
 modules/gallery/views/admin_modules.html.php                 24  DIRTY    $module_info->version
 modules/gallery/views/admin_theme_options.html.php           5   DIRTY    $form
@@ -267,7 +267,7 @@ modules/user/views/admin_users.html.php                      3   DIRTY_JS url::s
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("gOddRow","gEvenRow")
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("g-odd-row","g-even-row")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->admin?"admin":""
 modules/user/views/admin_users.html.php                      68  DIRTY_ATTR $user->id
 modules/user/views/admin_users.html.php                      69  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 977ba75b..4c79c25b 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -21,7 +21,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= log::severity_class($task->severity) ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= log::severity_class($task->severity) ?>">
         <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
@@ -69,7 +69,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
         <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -142,7 +142,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
         <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 9cf03cb3..058844b4 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a46e402f..46bdb65e 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -64,7 +64,7 @@
       </tr>
 
       <? foreach ($users as $i => $user): ?>
-      <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>">
+      <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("g-odd-row", "g-even-row") ?> user <?= $user->admin ? "admin" : "" ?>">
         <td id="user-<?= $user->id ?>" class="core-info gDraggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 28115149..61161967 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -281,14 +281,6 @@ li.gError select {
   opacity: 0.4;
 }
 
-.gOddRow {
-  background-color: #eee;
-}
-
-.gEvenRow {
-  background-color: #fff;
-}
-
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
-- 
cgit v1.2.3


From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 4 Oct 2009 00:27:22 -0600
Subject: Renamed most, if not all css selectors from gName to g-name. Moved a
 few shared images from wind to lib. Deleted unused images in the admin_wind.
 This will likely break a few ajax features.

---
 lib/gallery.common.css                             |  57 ++-
 lib/gallery.common.js                              |  24 +-
 lib/gallery.dialog.js                              |   4 +-
 lib/gallery.panel.js                               |  24 +-
 lib/gallery.show_full_size.js                      |  20 +-
 lib/images/ico-separator.gif                       | Bin 0 -> 106 bytes
 modules/akismet/helpers/akismet.php                |   2 +-
 modules/akismet/views/admin_akismet.html.php       |   4 +-
 modules/akismet/views/admin_akismet_stats.html.php |   6 +-
 modules/comment/helpers/comment.php                |  20 +-
 modules/comment/helpers/comment_block.php          |   2 +-
 modules/comment/helpers/comment_event.php          |   2 +-
 modules/comment/helpers/comment_theme.php          |   2 +-
 modules/comment/js/comment.js                      |  26 +-
 .../views/admin_block_recent_comments.html.php     |   4 +-
 modules/comment/views/admin_comments.html.php      |  20 +-
 modules/comment/views/comment.html.php             |   6 +-
 modules/comment/views/comments.html.php            |  14 +-
 modules/digibug/helpers/digibug_event.php          |   7 +-
 modules/digibug/js/digibug.js                      |   7 +-
 modules/digibug/views/admin_digibug.html.php       |   8 +-
 modules/exif/helpers/exif.php                      |   2 +-
 modules/exif/views/exif_dialog.html.php            |  22 +-
 modules/exif/views/exif_sidebar.html.php           |   5 +-
 modules/g2_import/controllers/admin_g2_import.php  |   2 +-
 modules/g2_import/helpers/g2_import.php            |   6 +-
 modules/g2_import/views/admin_g2_import.html.php   |  18 +-
 modules/gallery/controllers/admin_dashboard.php    |   2 +-
 modules/gallery/controllers/admin_languages.php    |   2 +-
 modules/gallery/controllers/l10n_client.php        |   4 +-
 modules/gallery/css/debug.css                      |   8 +-
 modules/gallery/css/l10n_client.css                |  28 +-
 modules/gallery/helpers/album.php                  |  10 +-
 modules/gallery/helpers/gallery_block.php          |  16 +-
 modules/gallery/helpers/gallery_event.php          |   2 +-
 modules/gallery/helpers/graphics.php               |   2 +-
 modules/gallery/helpers/item.php                   |   2 +-
 modules/gallery/helpers/log.php                    |   8 +-
 modules/gallery/helpers/message.php                |  10 +-
 modules/gallery/helpers/movie.php                  |   2 +-
 modules/gallery/helpers/photo.php                  |   4 +-
 modules/gallery/helpers/site_status.php            |  10 +-
 modules/gallery/helpers/theme.php                  |  14 +-
 modules/gallery/js/albums_form_add.js              |  20 +-
 modules/gallery/js/l10n_client.js                  |  44 +-
 modules/gallery/libraries/Admin_View.php           |   2 +-
 modules/gallery/libraries/Menu.php                 |   8 +-
 modules/gallery/libraries/Theme_View.php           |   6 +-
 modules/gallery/models/item.php                    |   2 +-
 modules/gallery/tests/DrawForm_Test.php            |  12 +-
 modules/gallery/tests/selenium/Add_Comment.html    |   8 +-
 modules/gallery/tests/selenium/Login.html          |   8 +-
 modules/gallery/tests/xss_data.txt                 |  62 +--
 .../gallery/views/admin_advanced_settings.html.php |   8 +-
 .../views/admin_block_photo_stream.html.php        |   2 +-
 modules/gallery/views/admin_dashboard.html.php     |  22 +-
 modules/gallery/views/admin_graphics.html.php      |  10 +-
 modules/gallery/views/admin_graphics_gd.html.php   |   8 +-
 .../views/admin_graphics_graphicsmagick.html.php   |   6 +-
 .../views/admin_graphics_imagemagick.html.php      |   6 +-
 modules/gallery/views/admin_graphics_none.html.php |   2 +-
 modules/gallery/views/admin_languages.html.php     |  12 +-
 modules/gallery/views/admin_maintenance.html.php   |  26 +-
 .../views/admin_maintenance_show_log.html.php      |   8 +-
 .../gallery/views/admin_maintenance_task.html.php  |  24 +-
 modules/gallery/views/admin_modules.html.php       |   4 +-
 modules/gallery/views/admin_sidebar.html.php       |  24 +-
 .../gallery/views/admin_sidebar_blocks.html.php    |   2 +-
 modules/gallery/views/admin_theme_options.html.php |   2 +-
 modules/gallery/views/admin_themes.html.php        |  20 +-
 modules/gallery/views/form.html.php                |   4 +-
 modules/gallery/views/l10n_client.html.php         |   6 +-
 modules/gallery/views/move_browse.html.php         |  14 +-
 modules/gallery/views/permissions_browse.html.php  |  14 +-
 modules/gallery/views/permissions_form.html.php    |  10 +-
 modules/gallery/views/simple_uploader.html.php     |  28 +-
 modules/gallery/views/welcome_message.html.php     |   6 +-
 .../gallery/views/welcome_message_loader.html.php  |   4 +-
 modules/image_block/helpers/image_block_block.php  |   2 +-
 .../image_block/views/image_block_block.html.php   |   4 +-
 modules/info/helpers/info_block.php                |   2 +-
 modules/info/views/info_block.html.php             |   2 +-
 .../notification/helpers/notification_event.php    |   2 +-
 modules/organize/css/organize.css                  |  50 +--
 modules/organize/helpers/organize_event.php        |   4 +-
 modules/organize/js/organize.js                    |  84 ++--
 modules/organize/views/organize_dialog.html.php    |  28 +-
 .../organize/views/organize_thumb_grid.html.php    |  10 +-
 modules/organize/views/organize_tree.html.php      |   8 +-
 modules/recaptcha/helpers/recaptcha.php            |   2 +-
 modules/recaptcha/helpers/recaptcha_event.php      |   2 +-
 modules/recaptcha/views/admin_recaptcha.html.php   |   8 +-
 modules/recaptcha/views/form_recaptcha.html.php    |   4 +-
 modules/rss/helpers/rss_block.php                  |   2 +-
 modules/rss/views/rss_block.html.php               |   2 +-
 modules/search/helpers/search.php                  |   2 +-
 modules/search/helpers/search_installer.php        |   2 +-
 modules/search/views/search.html.php               |  12 +-
 modules/search/views/search_link.html.php          |   6 +-
 .../server_add/controllers/admin_server_add.php    |   2 +-
 modules/server_add/js/admin.js                     |   2 +-
 modules/server_add/js/server_add.js                |  58 +--
 modules/server_add/views/admin_server_add.html.php |  10 +-
 modules/server_add/views/server_add_tree.html.php  |   6 +-
 .../views/server_add_tree_dialog.html.php          |  26 +-
 modules/slideshow/helpers/slideshow_event.php      |   6 +-
 modules/tag/helpers/tag.php                        |   6 +-
 modules/tag/helpers/tag_block.php                  |   2 +-
 modules/tag/js/tag.js                              |  38 +-
 modules/tag/views/admin_tags.html.php              |  14 +-
 modules/tag/views/tag_block.html.php               |  10 +-
 modules/user/controllers/password.php              |  10 +-
 modules/user/helpers/group.php                     |  10 +-
 modules/user/helpers/user.php                      |  52 +--
 modules/user/helpers/user_block.php                |   2 +-
 modules/user/views/admin_users.html.php            |  36 +-
 modules/user/views/admin_users_group.html.php      |   6 +-
 modules/user/views/login.html.php                  |   8 +-
 modules/user/views/user_languages_block.html.php   |   4 +-
 modules/watermark/helpers/watermark.php            |   6 +-
 modules/watermark/views/admin_watermarks.html.php  |   8 +-
 themes/admin_wind/css/fix-ie.css                   |  12 +-
 themes/admin_wind/css/screen.css                   | 453 ++++++++++-----------
 themes/admin_wind/images/avatar.jpg                | Bin 914 -> 0 bytes
 themes/admin_wind/images/ico-album.png             | Bin 397 -> 0 bytes
 themes/admin_wind/images/ico-print.png             | Bin 989 -> 0 bytes
 themes/admin_wind/images/ico-separator.gif         | Bin 106 -> 0 bytes
 themes/admin_wind/images/ico-view-comments.png     | Bin 768 -> 0 bytes
 themes/admin_wind/images/ico-view-fullsize.png     | Bin 1046 -> 0 bytes
 themes/admin_wind/images/ico-view-hybrid.png       | Bin 494 -> 0 bytes
 themes/admin_wind/images/ico-view-slideshow.png    | Bin 960 -> 0 bytes
 themes/admin_wind/js/ui.init.js                    |  38 +-
 themes/admin_wind/views/admin.html.php             |  20 +-
 themes/admin_wind/views/block.html.php             |   6 +-
 themes/admin_wind/views/pager.html.php             |   4 +-
 themes/wind/css/fix-ie.css                         |  18 +-
 themes/wind/css/screen.css                         | 432 +++++++++-----------
 themes/wind/images/ico-separator.gif               | Bin 106 -> 0 bytes
 themes/wind/images/ico-view-hybrid.png             | Bin 494 -> 0 bytes
 themes/wind/js/ui.init.js                          |  72 ++--
 themes/wind/views/album.html.php                   |  20 +-
 themes/wind/views/block.html.php                   |   4 +-
 themes/wind/views/dynamic.html.php                 |  12 +-
 themes/wind/views/movie.html.php                   |  12 +-
 themes/wind/views/no_sidebar.html.php              |   2 +-
 themes/wind/views/page.html.php                    |  22 +-
 themes/wind/views/pager.html.php                   |   4 +-
 themes/wind/views/photo.html.php                   |  18 +-
 themes/wind/views/sidebar.html.php                 |   4 +-
 149 files changed, 1278 insertions(+), 1317 deletions(-)
 create mode 100644 lib/images/ico-separator.gif
 delete mode 100644 themes/admin_wind/images/avatar.jpg
 delete mode 100644 themes/admin_wind/images/ico-album.png
 delete mode 100644 themes/admin_wind/images/ico-print.png
 delete mode 100644 themes/admin_wind/images/ico-separator.gif
 delete mode 100644 themes/admin_wind/images/ico-view-comments.png
 delete mode 100644 themes/admin_wind/images/ico-view-fullsize.png
 delete mode 100644 themes/admin_wind/images/ico-view-hybrid.png
 delete mode 100644 themes/admin_wind/images/ico-view-slideshow.png
 delete mode 100644 themes/wind/images/ico-separator.gif
 delete mode 100644 themes/wind/images/ico-view-hybrid.png

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 5768e1cf..c422fe6e 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -133,11 +133,11 @@ form .g-error {
 .g-last {
 }
 
-.g-even-row {
+.g-even {
   background-color: #fff;
 }
 
-.g-odd-row {
+.g-odd {
   background-color: #eee;
 }
 
@@ -211,7 +211,60 @@ form .g-error {
   margin-bottom: .4em;
 }
 
+/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-breadcrumbs {
+  padding: 0 20px;
+}
+
+.g-breadcrumbs li {
+  background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
+  float: left;
+  padding: 10px 6px 10px 16px !important;
+}
+
+.g-breadcrumbs li.root {
+  background: transparent;
+}
+
+.g-breadcrumbs li a,
+.g-breadcrumbs li span {
+  display: block;
+}
+
+.g-breadcrumbs li.active,
+.g-breadcrumbs li.active span {
+  font-weight: bold;
+}
+
+#g-dialog ul.g-breadcrumbs {
+  clear: both;
+  margin-left: 0;
+  padding-left: 0;
+}
+
+#g-dialog .g-breadcrumbs li {
+  font-size: .9em;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 .g-pager {
+  clear: both;
+  margin: 0;
+  padding: 5px 0 !important;
+  width: 100%;
+}
+
+.g-pager li {
+  float: left;
+  margin: 0;
+  width: 30%;
+}
+
+.g-pager .g-info {
+  text-align: center;
+  width: 40%;
 }
 
 .g-list-horizontal {
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 59482b22..f2de74ad 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -24,8 +24,8 @@
       if (container == null) {
         container = 'div';
       }
-      $(this).html("<" + container + " class=\"gValign\">" + $(this).html() + "</" + container + ">");
-      var el = $(this).children(container + ".gValign");
+      $(this).html("<" + container + " class=\"g-valign\">" + $(this).html() + "</" + container + ">");
+      var el = $(this).children(container + ".g-valign");
       var elh = $(el).height();
       var ph = $(this).height();
       var nh = (ph - elh) / 2;
@@ -47,21 +47,21 @@
 
   /**
    * Toggle the processing indicator, both large and small
-   * @param elementID Target ID, including #, to apply .gLoadingSize
+   * @param elementID Target ID, including #, to apply .g-loading-size
    */
   $.fn.gallery_show_loading = function() {
     return this.each(function(i){
       var size;
       switch ($(this).attr("id")) {
       case "#g-dialog":
-        case "#gPanel":
-          size = "Large";
+        case "#g-panel":
+          size = "large";
         break;
       default:
-        size = "Small";
+        size = "small";
         break;
       }
-      $(this).toggleClass("gLoading" + size);
+      $(this).toggleClass("g-loading" + size);
     });
   };
 
@@ -89,7 +89,7 @@
    */
   $.fn.gallery_get_photo = function() {
     var photo = $(this).find("img").filter(function() {
-      return this.id.match(/gPhotoId-\d+/);
+      return this.id.match(/g-photoId-\d+/);
     });
     return photo;
   };
@@ -124,8 +124,8 @@
   };
 
   $.fn.gallery_context_menu = function() {
-    if ($(".gContextMenu li").length) {  
-      var hover_target = ".gContextMenu";
+    if ($(".g-context-menu li").length) {  
+      var hover_target = ".g-context-menu";
       var in_progress = 0;
       $(hover_target + " *").removeAttr('title');
       $(hover_target + " ul").hide();
@@ -133,8 +133,8 @@
         function() {
           if (in_progress == 0) {
             $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
-            $(this).find(".g-dialogLink").gallery_dialog();
-            $(this).find(".gAjaxLink").gallery_ajax();
+            $(this).find(".g-dialog-link").gallery_dialog();
+            $(this).find(".g-ajax-link").gallery_ajax();
           }
         },
         function() {
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index a70200f9..c162ab2a 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -36,7 +36,7 @@
 
          $("#g-dialog").dialog("open");
          // Remove titlebar for progress dialogs or set title
-         if ($("#g-dialog #gProgress").length) {
+         if ($("#g-dialog #g-progress").length) {
            $(".ui-dialog-titlebar").remove();
          } else if ($("#g-dialog h1").length) {
            $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html());
@@ -61,7 +61,7 @@
          dialogWidth = size.width() - 100;
          // Set the iframe width and height
          $("#g-dialog iframe").width("100%").height(size.height() - 100);
-       } else if ($("#g-dialog .g-dialogPanel").length) {
+       } else if ($("#g-dialog .g-dialog-panel").length) {
          dialogWidth = size.width() - 100;
          $("#g-dialog").dialog("option", "height", size.height() - 100);
        } else if (childWidth == "" || childWidth > 300) {
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 6115297d..8530dd9f 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -8,7 +8,7 @@
          var parent = $(element).parent().parent();
          var sHref = $(element).attr("href");
          var parentClass = $(parent).attr("class");
-         var ePanel = "<tr id=\"gPanel\"><td colspan=\"6\"></td></tr>";
+         var ePanel = "<tr id=\"g-panel\"><td colspan=\"6\"></td></tr>";
 
 	 // We keep track of the open vs. closed state by looking to see if there'
 	 // an orig_text attr.  If that attr is missing, then the panel is closed
@@ -16,12 +16,12 @@
 	 var should_open = !$(element).attr("orig_text");
 
 	 // Close any open panels and reset their button text
-         if ($("#gPanel").length) {
-           $("#gPanel").slideUp("slow").remove();
-	   $.each($(".gPanelLink"),
+         if ($("#g-panel").length) {
+           $("#g-panel").slideUp("slow").remove();
+	   $.each($(".g-panel-link"),
 		  function() {
 		    if ($(this).attr("orig_text")) {
-		      $(this).children(".gButtonText").text($(this).attr("orig_text"));
+		      $(this).children(".g-button-text").text($(this).attr("orig_text"));
 		      $(this).attr("orig_text", "");
 		    }
 		  }
@@ -30,15 +30,15 @@
 
 	 if (should_open) {
 	   $(parent).after(ePanel);
-	   $("#gPanel td").html(sHref);
+	   $("#g-panel td").html(sHref);
 	   $.get(sHref, function(data) {
-	     $("#gPanel td").html(data);
+	     $("#g-panel td").html(data);
 	     self._ajaxify_panel();
 	     if ($(element).attr("open_text")) {
-	       $(element).attr("orig_text", $(element).children(".gButtonText").text());
-	       $(element).children(".gButtonText").text($(element).attr("open_text"));
+	       $(element).attr("orig_text", $(element).children(".g-button-text").text());
+	       $(element).children(".g-button-text").text($(element).attr("open_text"));
 	     }
-	     $("#gPanel").addClass(parentClass).show().slideDown("slow");
+	     $("#g-panel").addClass(parentClass).show().slideDown("slow");
 	   });
 	 }
 
@@ -48,11 +48,11 @@
 
      _ajaxify_panel: function () {
        var self = this;
-       $("#gPanel td form").ajaxForm({
+       $("#g-panel td form").ajaxForm({
          dataType: "json",
          success: function(data) {
            if (data.form) {
-             $("#gPanel td form").replaceWith(data.form);
+             $("#g-panel td form").replaceWith(data.form);
              self._ajaxify_panel();
            }
            if (data.result == "success") {
diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index 360ecdc2..49dc620a 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -7,7 +7,7 @@
      var height = $(document).height();
      var size = $.gallery_get_viewport_size();
 
-     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
+     $("body").append('<div id="g-fullsize-overlay" class="ui-dialog-overlay" ' +
 		      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
 		      'position: absolute; top: 0px; left: 0px; ' +
 		      'width: ' + width + 'px; height: ' + height + 'px;' +
@@ -26,32 +26,32 @@
      }
 
 
-     $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
+     $("body").append('<div id="g-fullsize" class="ui-dialog ui-widget" ' +
 		      'style="overflow: hidden; display: block; ' +
 		      'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
 		      'outline-style: none; outline-width: 0px; ' +
 		      'height: ' + image_size.height + 'px; ' +
 		      'width: ' + image_size.width + 'px; ' +
 		      'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
-		      '<img id="gFullSizeImage" src="' + image_url + '"' +
+		      '<img id="g-fullsize-image" src="' + image_url + '"' +
 		      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
      $().click(function() {
-       $("#gFullsizeOverlay*").remove();
-       $("#gFullsize").remove();
+       $("#g-fullsize-overlay*").remove();
+       $("#g-fullsize").remove();
      });
      $().bind("keypress", function() {
-       $("#gFullsizeOverlay*").remove();
-       $("#gFullsize").remove();
+       $("#g-fullsize-overlay*").remove();
+       $("#g-fullsize").remove();
      });
      $(window).resize(function() {
-       $("#gFullsizeOverlay").width($(document).width()).height($(document).height());
+       $("#g-fullsize-overlay").width($(document).width()).height($(document).height());
        image_size = $.gallery_auto_fit_window(image_width, image_height);
-       $("#gFullsize").height(image_size.height)
+       $("#g-fullsize").height(image_size.height)
 	 .width(image_size.width)
 	 .css("top", image_size.top)
 	 .css("left", image_size.left);
-       $("#gFullSizeImage").height(image_size.height).width(image_size.width);
+       $("#g-fullsize-image").height(image_size.height).width(image_size.width);
      });
    };
 })(jQuery);
diff --git a/lib/images/ico-separator.gif b/lib/images/ico-separator.gif
new file mode 100644
index 00000000..3de2d0d3
Binary files /dev/null and b/lib/images/ico-separator.gif differ
diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php
index acd5cb3e..43549ffa 100644
--- a/modules/akismet/helpers/akismet.php
+++ b/modules/akismet/helpers/akismet.php
@@ -21,7 +21,7 @@ class akismet_Core {
   public static $test_mode = TEST_MODE;
 
   static function get_configure_form() {
-    $form = new Forge("admin/akismet", "", "post", array("id" => "gConfigureAkismetForm"));
+    $form = new Forge("admin/akismet", "", "post", array("id" => "g-configure-akismet-form"));
     $group = $form->group("configure_akismet")->label(t("Configure Akismet"));
     $group->input("api_key")->label(t("API Key"))->value(module::get_var("akismet", "api_key"));
     $group->api_key->error_messages("invalid", t("The API key you provided is invalid."));
diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 009d8810..22c60c97 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminAkismet">
+<div id="g-admin-akismet">
   <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.",
@@ -8,7 +8,7 @@
   </p>
 
   <? if ($valid_key): ?>
-  <div class="gModuleStatus gSuccess">
+  <div class="g-module-status g-success">
     <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
   </div>
   <? endif ?>
diff --git a/modules/akismet/views/admin_akismet_stats.html.php b/modules/akismet/views/admin_akismet_stats.html.php
index 41bad15b..32908ba0 100644
--- a/modules/akismet/views/admin_akismet_stats.html.php
+++ b/modules/akismet/views/admin_akismet_stats.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javscript">
   $(document).ready(function() {
-    $("#gAkismetExternalStats").css("height", "600");
+    $("#g-akismet-external-stats").css("height", "600");
   });
 </script>
-<div id="gAkismetStats">
-  <iframe id="gAkismetExternalStats" width="100%" height="500" frameborder="0"
+<div id="g-akismet-stats">
+  <iframe id="g-akismet-external-stats" width="100%" height="500" frameborder="0"
           src="http://<?= $api_key ?>.web.akismet.com/1.0/user-stats.php?blog=<?= urlencode($blog_url) ?>">
   </iframe>
 </div>
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index f74a8644..7b2332a8 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -65,12 +65,12 @@ class comment_Core {
   }
 
   static function get_add_form($item) {
-    $form = new Forge("comments", "", "post", array("id" => "gAddCommentForm"));
+    $form = new Forge("comments", "", "post", array("id" => "g-comment-form"));
     $group = $form->group("add_comment")->label(t("Add comment"));
-    $group->input("name")   ->label(t("Name"))            ->id("gAuthor");
-    $group->input("email")  ->label(t("Email (hidden)"))  ->id("gEmail");
-    $group->input("url")    ->label(t("Website (hidden)"))->id("gUrl");
-    $group->textarea("text")->label(t("Comment"))         ->id("gText");
+    $group->input("name")   ->label(t("Name"))            ->id("g-author");
+    $group->input("email")  ->label(t("Email (hidden)"))  ->id("g-email");
+    $group->input("url")    ->label(t("Website (hidden)"))->id("g-url");
+    $group->textarea("text")->label(t("Comment"))         ->id("g-text");
     $group->hidden("item_id")->value($item->id);
     module::event("comment_add_form", $form);
     $group->submit("")->value(t("Add"));
@@ -90,12 +90,12 @@ class comment_Core {
 
   static function get_edit_form($comment) {
     $form = new Forge("comments/{$comment->id}?_method=put", "", "post",
-                      array("id" => "gEditCommentForm"));
+                      array("id" => "g-edit-comment-form"));
     $group = $form->group("edit_comment")->label(t("Edit comment"));
-    $group->input("name")   ->label(t("Author"))          ->id("gAuthor");
-    $group->input("email")  ->label(t("Email (hidden)"))  ->id("gEmail");
-    $group->input("url")    ->label(t("Website (hidden)"))->id("gUrl");
-    $group->textarea("text")->label(t("Comment"))         ->id("gText");
+    $group->input("name")   ->label(t("Author"))          ->id("g-author");
+    $group->input("email")  ->label(t("Email (hidden)"))  ->id("g-email");
+    $group->input("url")    ->label(t("Website (hidden)"))->id("g-url");
+    $group->textarea("text")->label(t("Comment"))         ->id("g-text");
     $group->submit("")->value(t("Edit"));
 
     $group->text = $comment->text;
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index b989be6b..c00c6c51 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -26,7 +26,7 @@ class comment_block_Core {
     $block = new Block();
     switch ($block_id) {
     case "recent_comments":
-      $block->css_id = "gRecentComments";
+      $block->css_id = "g-recent-comments";
       $block->title = t("Recent Comments");
       $block->content = new View("admin_block_recent_comments.html");
       $block->content->comments =
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 0234aea9..2199eb7f 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -36,7 +36,7 @@ class comment_event_Core {
                ->id("comments")
                ->label(t("View comments on this item"))
                ->url("#comments")
-               ->css_id("gCommentsLink"));
+               ->css_id("g-comments-link"));
   }
 
   static function item_index_data($item, $data) {
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index e9b402f6..10c855db 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -25,7 +25,7 @@ class comment_theme_Core {
 
   static function photo_bottom($theme) {
     $block = new Block;
-    $block->css_id = "gComments";
+    $block->css_id = "g-comments";
     $block->title = t("Comments");
     $block->anchor = "comments";
 
diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 6e985626..96370fb1 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,43 +1,43 @@
 $("document").ready(function() {
-  $("#gAddCommentButton").click(function(event) {
+  $("#g-admin-comment-button").click(function(event) {
     event.preventDefault();
-    if (!$("#gAddCommentForm").length) {
+    if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
 	    {},
 	    function(data) {
-	      $("#gCommentDetail").append(data);
+	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
 	    });
     }
   });
-  $("#gNoComments").click(function(event) {
+  $("#g-no-comments").click(function(event) {
     event.preventDefault();
-    if (!$("#gAddCommentForm").length) {
+    if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
 	    {},
 	    function(data) {
-	      $("#gCommentDetail").append(data);
+	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
 	    });
-      $("#gNoCommentsYet").remove();
+      $("#g-no-comments-yet").remove();
     }
   });
 });
 
 function ajaxify_comment_form() {
-  $("#gComments form").ajaxForm({
+  $("#g-comments form").ajaxForm({
     dataType: "json",
     success: function(data) {
       if (data.form) {
-        $("#gComments form").replaceWith(data.form);
+        $("#g-comments form").replaceWith(data.form);
         ajaxify_comment_form();
       }
       if (data.result == "success") {
         $.get(data.resource, function(data, textStatus) {
-          $("#gComments .gBlockContent ul:first").append("<li>"+data+"</li>");
-          $("#gComments .gBlockContent ul:first li:last").effect("highlight", {color: "#cfc"}, 8000);
-          $("#gAddCommentForm").hide(2000).remove();
-	  $("#gNoCommentsYet").hide(2000);
+          $("#g-comments .g-block-content ul:first").append("<li>"+data+"</li>");
+          $("#g-comments .g-block-content ul:first li:last").effect("highlight", {color: "#cfc"}, 8000);
+          $("#g-comment-form").hide(2000).remove();
+	  $("#g-no-comments-yet").hide(2000);
         });
       }
     }
diff --git a/modules/comment/views/admin_block_recent_comments.html.php b/modules/comment/views/admin_block_recent_comments.html.php
index ca0d1c0b..7941e02d 100644
--- a/modules/comment/views/admin_block_recent_comments.html.php
+++ b/modules/comment/views/admin_block_recent_comments.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <? foreach ($comments as $i => $comment): ?>
-  <li class="<?= ($i % 2 == 0) ? "g-even-row" : "g-odd-row" ?>">
+  <li class="<?= ($i % 2 == 0) ? "g-even" : "g-odd" ?>">
     <img src="<?= $comment->author()->avatar_url(32, $theme->url("images/avatar.jpg", true)) ?>"
-         class="gAvatar"
+         class="g-avatar"
          alt="<?= html::clean_attribute($comment->author_name()) ?>"
          width="32"
          height="32" />
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 82de378c..0e8dd525 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -6,7 +6,7 @@
     $.get(set_state_url.replace("__STATE__", state).replace("__ID__", id),
           {},
           function() {
-            $("#gComment-" + id).slideUp();
+            $("#g-comment-" + id).slideUp();
             update_menu();
           });
   }
@@ -18,7 +18,7 @@
     $.get(delete_url.replace("__ID__", id),
           {},
           function() {
-            $("#gComment-" + id).slideUp();
+            $("#g-comment-" + id).slideUp();
             update_menu();
           });
   }
@@ -27,18 +27,18 @@
     $.get(<?= html::js_string(url::site("admin/comments/menu_labels")) ?>, {},
           function(data) {
             for (var i = 0; i < data.length; i++) {
-              $("#gAdminCommentsMenu li:eq(" + i + ") a").html(data[i]);
+              $("#g-admin-comments-menu li:eq(" + i + ") a").html(data[i]);
             }
           },
           "json");
   }
 </script>
 
-<div id="gAdminComments">
+<div id="g-admin-comments">
   <h1> <?= t("Manage Comments") ?> </h1>
 
   <!-- @todo: Highlight active menu option -->
-  <div id="gAdminCommentsMenu">
+  <div id="g-admin-comments-menu">
     <?= $menu ?>
   </div>
 
@@ -90,7 +90,7 @@
   </div>
   <? endif ?>
 
-  <table id="gAdminCommentsList">
+  <table id="g-admin-commentsList">
     <tr>
       <th>
         <?= t("Author") ?>
@@ -103,11 +103,11 @@
       </th>
     </tr>
     <? foreach ($comments as $i => $comment): ?>
-    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
+    <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
       <td>
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-               class="gAvatar"
+               class="g-avatar"
                alt="<?= html::clean_attribute($comment->author_name()) ?>"
                width="40"
                height="40" />
@@ -118,7 +118,7 @@
       <td>
         <div class="g-right">
           <? $item = $comment->item() ?>
-          <div class="gItem gPhoto">
+          <div class="g-item g-photo">
             <a href="<?= $item->url() ?>">
               <? if ($item->has_thumb()): ?>
               <img src="<?= $item->thumb_url() ?>"
@@ -135,7 +135,7 @@
            <?= nl2br(html::purify($comment->text)) ?>
       </td>
       <td>
-        <ul class="gButtonSetVertical">
+        <ul class="g-buttonset-vertical">
         <? if ($comment->state != "unpublished"): ?>
           <li>
             <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
diff --git a/modules/comment/views/comment.html.php b/modules/comment/views/comment.html.php
index ce4e197d..c7957c15 100644
--- a/modules/comment/views/comment.html.php
+++ b/modules/comment/views/comment.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li id="gComment-<?= $comment->id; ?>">
-  <p class="gAuthor">
+<li id="g-comment-<?= $comment->id; ?>">
+  <p class="g-author">
     <a href="#">
       <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-           class="gAvatar"
+           class="g-avatar"
            alt="<?= html::clean_attribute($comment->author_name()) ?>"
            width="40"
            height="40" />
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index ee4a8ad6..636f1522 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,23 +1,23 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
+  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="g-admin-comment-button"
    class="g-button ui-corner-all ui-icon-left ui-state-default right">
   <span class="ui-icon ui-icon-comment"></span>
   <?= t("Add a comment") ?>
 </a>
-<div id="gCommentDetail">
+<div id="g-comment-detail">
 <? if (!$comments->count()): ?>
-<p id="gNoCommentsYet">
+<p id="g-no-comments-yet">
   <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
-        array("attrs" => html::mark_clean("id= \"gNoComments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
+        array("attrs" => html::mark_clean("id= \"g-no-comments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
 </p>
 <? endif ?>
 <ul>
   <? foreach ($comments as $comment): ?>
-  <li id="gComment-<?= $comment->id ?>">
-    <p class="gAuthor">
+  <li id="g-comment-<?= $comment->id ?>">
+    <p class="g-author">
       <a href="#">
         <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-             class="gAvatar"
+             class="g-avatar"
              alt="<?= html::clean_attribute($comment->author_name()) ?>"
              width="40"
              height="40" />
diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index d2830b80..37fa57e5 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -32,8 +32,8 @@ class digibug_event_Core {
                   ->id("digibug")
                   ->label(t("Print with Digibug"))
                   ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
-                  ->css_id("gDigibugLink")
-                    ->css_class("ui-icon-print"));
+                  ->css_id("g-print-digibug-link")
+                  ->css_class("g-print-digibug-link ui-icon-print"));
   }
 
   static function context_menu($menu, $theme, $item) {
@@ -43,8 +43,7 @@ class digibug_event_Core {
                  ->id("digibug")
                  ->label(t("Print with Digibug"))
                  ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
-                 ->css_id("gDigibugLink")
-                 ->css_class("ui-icon-print"));
+                 ->css_class("g-print-digibug-link ui-icon-print"));
     }
   }
 }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 30bff47d..46ddac52 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,10 +1,5 @@
 $(document).ready(function() {
-  $(".gDigibugPrintButton a").click(function(e) {
-    e.preventDefault();
-    return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
-  });
-
-  $("#gDigibugLink").click(function(e) {
+  $(".g-print-digibug-link").click(function(e) {
     e.preventDefault();
     return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
   });
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index cb952a8a..f75adc60 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,14 +1,14 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminDigibug">
-  <div class="gAdminDigibugIntro">
-    <img id="DigibugLogo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>">
+<div id="g-admin-digibug">
+  <div class="g-admin-digibug-intro">
+    <img id="Digibug-logo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>">
     <h2> <?= t("Digibug Photo Printing") ?> </h2>
     <p>
       <?= t("Turn your photos into a wide variety of prints, gifts and games!") ?>
     </p>
 
     <ul>
-      <li class="gModuleStatus gSuccess">
+      <li class="g-module-status g-success">
         <?= t("You're ready to print photos!") ?>
       </li>
     </ul>
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index 453690ea..5ddd09d4 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -163,7 +163,7 @@ class exif_Core {
     list ($remaining) = exif::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your Exif index needs to be updated.  <a href="%url" class="g-dialogLink">Fix this now</a>',
+        t('Your Exif index needs to be updated.  <a href="%url" class="g-dialog-link">Fix this now</a>',
           array("url" => html::mark_clean(url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__")))),
         "exif_index_out_of_date");
     }
diff --git a/modules/exif/views/exif_dialog.html.php b/modules/exif/views/exif_dialog.html.php
index 11d1e212..b50eea1d 100644
--- a/modules/exif/views/exif_dialog.html.php
+++ b/modules/exif/views/exif_dialog.html.php
@@ -1,30 +1,30 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<style>
-  #gExifData {font-size: .85em;}
-  .gOdd {background: #BDD2FF;}
-  .gEven {background: #DFEFFC;}
+<style type="text/css">
+  #g-exif-data { font-size: .85em; }
+  .g-odd { background: #bdd2ff; }
+  .g-even { background: #dfeffc; }
 </style>
 <h1 style="display: none;"><?= t("Photo Detail") ?></h1>
-<div id="gExifData">
-  <table class="gMetadata" >
+<div id="g-exif-data">
+  <table class="g-metadata" >
     <tbody>
       <? for ($i = 0; $i < count($details); $i++): ?>
       <tr>
-         <td class="gEven">
+         <td class="g-even">
          <?= $details[$i]["caption"] ?>
          </td>
-         <td class="gOdd">
+         <td class="g-odd">
          <?= html::clean($details[$i]["value"]) ?>
          </td>
          <? if (!empty($details[++$i])): ?>
-           <td class="gEven">
+           <td class="g-even">
            <?= $details[$i]["caption"] ?>
            </td>
-           <td class="gOdd">
+           <td class="g-odd">
            <?= html::clean($details[$i]["value"]) ?>
            </td>
          <? else: ?>
-           <td class="gEven"></td><td class="gOdd"></td>
+           <td class="g-even"></td><td class="g-odd"></td>
          <? endif ?>
        </tr>
        <? endfor ?>
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index 3c7bb517..04f72b02 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,7 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
-  class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
+<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") ?>
 </a>
-
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 18d09363..1c65f482 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -68,7 +68,7 @@ class Admin_g2_import_Controller extends Admin_Controller {
 
   private function _get_import_form() {
     $form = new Forge(
-      "admin/g2_import/save", "", "post", array("id" => "gAdminConfigureG2ImportForm"));
+      "admin/g2_import/save", "", "post", array("id" => "g-admin-configure-g2-import-form"));
     $group = $form->group("configure_g2_import")->label(t("Configure Gallery 2 Import"));
     $group->input("embed_path")->label(t("Filesystem path to your Gallery 2 embed.php file"))
       ->value(module::get_var("g2_import", "embed_path", ""));
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 7e5c6f75..99d56d5d 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -201,7 +201,7 @@ class g2_import_Core {
 
     if (g2_import::g2_module_active("tags") && module::is_active("tag")) {
       $result =
-        g2($gallery->search("SELECT COUNT(DISTINCT([TagItemMap::itemId])) FROM [TagItemMap]"))
+        g2($gallery->search("SELECT COUNT(DISTINCT([Tag-itemMap::itemId])) FROM [Tag-itemMap]"))
         ->nextResult();
       $stats["tags"] = $result[0];
     } else {
@@ -853,8 +853,8 @@ class g2_import_Core {
 
     $ids = array();
     $results = g2($gallery->search(
-      "SELECT DISTINCT([TagItemMap::itemId]) FROM [TagItemMap] " .
-      "WHERE [TagItemMap::itemId] > ?",
+      "SELECT DISTINCT([Tag-itemMap::itemId]) FROM [Tag-itemMap] " .
+      "WHERE [Tag-itemMap::itemId] > ?",
       array($min_id),
       array("limit" => array("count" => 100))));
     while ($result = $results->nextResult()) {
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 314f030b..51a1e245 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminG2Import">
+<div id="g-admin-g2-import">
   <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>
 
-  <div id="gAdminG2ImportNotes">
+  <div id="g-admin-g2-import-notes">
     <h2> <?= t("Notes") ?> </h2>
     <p>
       <?= t("The import process is a work in progress with some known issues:") ?>
@@ -28,14 +28,14 @@
   <?= $form ?>
 
   <? if (g2_import::is_initialized()): ?>
-  <div id="gAdminG2ImportDetails">
+  <div id="g-admin-g2-import-details">
     <h2> <?= t("Import") ?> </h2>
-    <ul id="gMessage">
-      <li class="gSuccess">
+    <ul id="g-action-status">
+      <li class="g-success">
         <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
       </li>
       <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
-      <li class="gWarning">
+      <li class="g-warning">
         <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
               array("g2_pixels" => $g2_sizes["thumb"]["size"],
                     "g3_pixels" => $thumb_size,
@@ -44,7 +44,7 @@
       <? endif ?>
 
       <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
-      <li class="gWarning">
+      <li class="g-warning">
         <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
             array("g2_pixels" => $g2_sizes["resize"]["size"],
                   "g3_pixels" => $resize_size,
@@ -53,7 +53,7 @@
       <? endif ?>
     </ul>
 
-    <div class="gInfo">
+    <div class="g-info">
       <p>
         <?= t("Your Gallery 2 has the following importable data in it") ?>
       </p>
@@ -84,7 +84,7 @@
     </div>
 
     <p>
-      <a class="g-button g-dialogLink ui-state-default ui-corner-all"
+      <a class="g-button g-dialog-link ui-state-default ui-corner-all"
          href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
         <?= t("Begin import!") ?>
       </a>
diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index 6bf3b966..7e28f625 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -22,7 +22,7 @@ class Admin_Dashboard_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_dashboard.html");
     $view->content->blocks = block_manager::get_html("dashboard_center");
-    $view->sidebar = "<div id=\"gAdminDashboardSidebar\">" .
+    $view->sidebar = "<div id=\"g-admin-dashboard-sidebar\">" .
       block_manager::get_html("dashboard_sidebar") .
       "</div>";
     print $view;
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index a9693d21..8af1dd85 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -105,7 +105,7 @@ class Admin_Languages_Controller extends Admin_Controller {
   }
 
   private function _share_translations_form() {
-    $form = new Forge("admin/languages/share", "", "post", array("id" => "gShareTranslationsForm"));
+    $form = new Forge("admin/languages/share", "", "post", array("id" => "g-share-translations-form"));
     $group = $form->group("sharing")
       ->label(t("Sharing your own translations with the Gallery community is easy. Please do!"));
     $api_key = l10n_client::api_key();
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 6e19310b..6fdbb3a1 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -102,9 +102,9 @@ class L10n_Client_Controller extends Controller {
   }
 
   private static function _l10n_client_search_form() {
-    $form = new Forge("l10n_client/search", "", "post", array("id" => "gL10nSearchForm"));
+    $form = new Forge("l10n_client/search", "", "post", array("id" => "g-l10n-search-form"));
     $group = $form->group("l10n_search");
-    $group->input("l10n-search")->id("gL10nSearch");
+    $group->input("l10n-search")->id("g-l10n-search");
     $group->submit("l10n-search-filter-clear")->value(t("X"));
 
     return $form;
diff --git a/modules/gallery/css/debug.css b/modules/gallery/css/debug.css
index fe5665ad..6808da09 100644
--- a/modules/gallery/css/debug.css
+++ b/modules/gallery/css/debug.css
@@ -1,4 +1,4 @@
-.gAnnotatedThemeBlock {
+.g-annotated-theme-block {
   border: 1px solid #C00;
   clear: both;
   margin: 1em;
@@ -6,15 +6,15 @@
   position: relative;
 }
 
-.gAnnotatedThemeBlock_album_top {
+.g-annotated-theme-block_album_top {
   float: right;
 }
 
-.gAnnotatedThemeBlock_header_bottom {
+.g-annotated-theme-block_header_bottom {
   float: right;
 }
 
-.gAnnotatedThemeBlock div.title {
+.g-annotated-theme-block div.title {
   background: #C00;
   border: 1px solid black;
   color: white;
diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 9c1b12d0..542da8e6 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -1,6 +1,8 @@
-// TODO(andy_st): Add original copyright notice from Drupal l10_client.
-// TODO(andy_st): Add G3 copyright notice.
-// TODO(andy_st): clean up formatting to match our other CSS files.
+/**
+ * TODO(andy_st): Add original copyright notice from Drupal l10_client.
+ * TODO(andy_st): Add G3 copyright notice.
+ * TODO(andy_st): clean up formatting to match our other CSS files.
+ */
 
 /* $Id: l10n_client.css,v 1.6 2008/09/09 10:48:20 goba Exp $ */
 
@@ -50,7 +52,7 @@
 	font-size: 1em;
 	padding: .5em;
 }
-#l10n-client-toggler #gMinimizeL10n {
+#l10n-client-toggler #g-minimize-l10n {
   border-right: 1px solid #ffffff;
 }
 
@@ -126,31 +128,31 @@
 #l10n-client .string-list li.active {
   font-weight:bold;}
 
-#l10n-client #gL10nSearchForm {
+#l10n-client #g-l10n-search-form {
   background:#eee;
   text-align:center;
   height:2em; line-height:2em;
   margin:0em; padding:.5em .5em;
 }
 
-#l10n-client #gL10nSearchForm .form-item,
-#l10n-client #gL10nSearchForm input.form-text,
-#l10n-client #gL10nSearchForm #search-filter-go,
-#l10n-client #gL10nSearchForm #search-filter-clear {
+#l10n-client #g-l10n-search-form .form-item,
+#l10n-client #g-l10n-search-form input.form-text,
+#l10n-client #g-l10n-search-form #search-filter-go,
+#l10n-client #g-l10n-search-form #search-filter-clear {
   display:inline;
   vertical-align:middle;
 }
 
-#l10n-client #gL10nSearchForm .form-item {
+#l10n-client #g-l10n-search-form .form-item {
   margin:0em;
   padding:0em;
 }
 
-#l10n-client #gL10nSearchForm input.form-text {
+#l10n-client #g-l10n-search-form input.form-text {
   width:80%;
 }
 
-#l10n-client #gL10nSearchForm #search-filter-clear {
+#l10n-client #g-l10n-search-form #search-filter-clear {
   width:10%;
   margin:0em;
 }
@@ -178,7 +180,7 @@
   overflow:hidden;
   width:49%; float:right;}
 
-#gL10nClientSaveForm {
+#g-l10n-client-save-form {
   padding:0em;}
 
 #l10n-client form ul,
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 65868cf2..72a79a75 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -92,7 +92,7 @@ class album_Core {
   }
 
   static function get_add_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddAlbumForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-add-album-form"));
     $group = $form->group("add_album")
       ->label(t("Add an album to %album_title", array("album_title" => $parent->title)));
     $group->input("title")->label(t("Title"));
@@ -114,7 +114,7 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-edit-album-form"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_item")->label(t("Edit Album"));
 
@@ -141,14 +141,14 @@ class album_Core {
       $group->hidden("slug")->value($parent->slug);
     }
 
-    $sort_order = $group->group("sort_order", array("id" => "gAlbumSortOrder"))
+    $sort_order = $group->group("sort_order", array("id" => "g-album-sort-order"))
       ->label(t("Sort Order"));
 
-    $sort_order->dropdown("column", array("id" => "gAlbumSortColumn"))
+    $sort_order->dropdown("column", array("id" => "g-album-sort-column"))
       ->label(t("Sort by"))
       ->options(album::get_sort_order_options())
       ->selected($parent->sort_column);
-    $sort_order->dropdown("direction", array("id" => "gAlbumSortDirection"))
+    $sort_order->dropdown("direction", array("id" => "g-album-sort-direction"))
       ->label(t("Order"))
       ->options(array("ASC" => t("Ascending"),
                       "DESC" => t("Descending")))
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index f2cb8ded..5d49a9de 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -32,13 +32,13 @@ class gallery_block_Core {
     $block = new Block();
     switch($block_id) {
     case "welcome":
-      $block->css_id = "gWelcome";
+      $block->css_id = "g-welcome";
       $block->title = t("Welcome to Gallery 3");
       $block->content = new View("admin_block_welcome.html");
       break;
 
     case "photo_stream":
-      $block->css_id = "gPhotoStream";
+      $block->css_id = "g-photo-stream";
       $block->title = t("Photo Stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
@@ -46,7 +46,7 @@ class gallery_block_Core {
       break;
 
     case "log_entries":
-      $block->css_id = "gLogEntries";
+      $block->css_id = "g-log-entries";
       $block->title = t("Log Entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
@@ -54,7 +54,7 @@ class gallery_block_Core {
       break;
 
     case "stats":
-      $block->css_id = "gStats";
+      $block->css_id = "g-stats";
       $block->title = t("Gallery Stats");
       $block->content = new View("admin_block_stats.html");
       $block->content->album_count =
@@ -63,7 +63,7 @@ class gallery_block_Core {
       break;
 
     case "platform_info":
-      $block->css_id = "gPlatform";
+      $block->css_id = "g-platform";
       $block->title = t("Platform Information");
       $block->content = new View("admin_block_platform.html");
       if (is_readable("/proc/loadavg")) {
@@ -75,14 +75,14 @@ class gallery_block_Core {
       break;
 
     case "project_news":
-      $block->css_id = "gProjectNews";
+      $block->css_id = "g-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 = "gBlockAdder";
+      $block->css_id = "g-block-adder";
       $block->title = t("Dashboard Content");
       $block->content = self::get_add_block_form();
     }
@@ -92,7 +92,7 @@ class gallery_block_Core {
 
   static function get_add_block_form() {
     $form = new Forge("admin/dashboard/add_block", "", "post",
-                      array("id" => "gAddDashboardBlockForm"));
+                      array("id" => "g-add-dashboard-block-form"));
     $group = $form->group("add_block")->label(t("Add Block"));
     $group->dropdown("id")->label(t("Available Blocks"))
       ->options(block_manager::get_available_admin_blocks());
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index c01f4135..290d7d12 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -281,7 +281,7 @@ class gallery_event_Core {
                    ->id("delete")
                    ->label($delete_title)
                    ->css_class("ui-icon-trash")
-                   ->css_id("gQuickDelete")
+                   ->css_id("g-quick-delete")
                    ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
       }
 
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index f9b88638..ecddd86b 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -249,7 +249,7 @@ class graphics_Core {
              "%count of your photos are out of date. <a %attrs>Click here to fix them</a>",
              $count,
              array("attrs" => html::mark_clean(sprintf(
-               'href="%s" class="g-dialogLink"',
+               'href="%s" class="g-dialog-link"',
                url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))),
           "graphics_dirty");
     }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 588c08d4..084bbc15 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -130,7 +130,7 @@ class item_Core {
       $page_type = "photo";
     }
     $form = new Forge(
-      "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "gConfirmDelete"));
+      "quick/delete/$item->id?page_type=$page_type", "", "post", array("id" => "g-confirm-delete"));
     $form->hidden("_method")->value("put");
     $group = $form->group("confirm_delete")->label(t("Confirm Deletion"));
     $group->submit("")->value(t("Delete"));
diff --git a/modules/gallery/helpers/log.php b/modules/gallery/helpers/log.php
index 451f985a..c8e94b45 100644
--- a/modules/gallery/helpers/log.php
+++ b/modules/gallery/helpers/log.php
@@ -93,16 +93,16 @@ class log_Core {
   static function severity_class($severity) {
     switch($severity) {
     case self::SUCCESS:
-      return "gSuccess";
+      return "g-success";
 
     case self::INFO:
-      return "gInfo";
+      return "g-info";
 
     case self::WARNING:
-      return "gWarning";
+      return "g-warning";
 
     case self::ERROR:
-      return "gError";
+      return "g-error";
     }
   }
 }
diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php
index af3b96cc..0d638571 100644
--- a/modules/gallery/helpers/message.php
+++ b/modules/gallery/helpers/message.php
@@ -81,7 +81,7 @@ class message_Core {
       $buf[] = "<li class=\"" . self::severity_class($msg[1]) . "\">$msg[0]</li>";
     }
     if ($buf) {
-      return "<ul id=\"gMessage\">" . implode("", $buf) . "</ul>";
+      return "<ul id=\"g-action-status\">" . implode("", $buf) . "</ul>";
     }
   }
 
@@ -93,16 +93,16 @@ class message_Core {
   static function severity_class($severity) {
     switch($severity) {
     case self::SUCCESS:
-      return "gSuccess";
+      return "g-success";
 
     case self::INFO:
-      return "gInfo";
+      return "g-info";
 
     case self::WARNING:
-      return "gWarning";
+      return "g-warning";
 
     case self::ERROR:
-      return "gError";
+      return "g-error";
     }
   }
 }
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 6c8c6c88..2190fc94 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -129,7 +129,7 @@ class movie_Core {
   }
 
   static function get_edit_form($movie) {
-    $form = new Forge("movies/$movie->id", "", "post", array("id" => "gEditMovieForm"));
+    $form = new Forge("movies/$movie->id", "", "post", array("id" => "g-edit-movie-form"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_item")->label(t("Edit Movie"));
     $group->input("title")->label(t("Title"))->value($movie->title);
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 065d2d31..692f7111 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -138,7 +138,7 @@ class photo_Core {
   }
 
   static function get_add_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "g-add-photo-form"));
     $group = $form->group("add_photo")->label(
       t("Add Photo to %album_title", array("album_title" => $parent->title)));
     $group->input("title")->label(t("Title"));
@@ -157,7 +157,7 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $form = new Forge("photos/$photo->id", "", "post", array("id" => "g-edit-photo-form"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_item")->label(t("Edit Photo"));
     $group->input("title")->label(t("Title"))->value($photo->title);
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 6d47e565..b7c6de9a 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -105,7 +105,7 @@ class site_status_Core {
     }
 
     if ($buf) {
-      return "<ul id=\"gSiteStatus\">" . implode("", $buf) . "</ul>";
+      return "<ul id=\"g-site-status\">" . implode("", $buf) . "</ul>";
     }
   }
 
@@ -117,16 +117,16 @@ class site_status_Core {
   static function severity_class($severity) {
     switch($severity) {
     case self::SUCCESS:
-      return "gSuccess";
+      return "g-success";
 
     case self::INFO:
-      return "gInfo";
+      return "g-info";
 
     case self::WARNING:
-      return "gWarning";
+      return "g-warning";
 
     case self::ERROR:
-      return "gError";
+      return "g-error";
     }
   }
 }
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index b46a2c14..fb8f7ca7 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -40,22 +40,22 @@ class theme_Core {
   }
 
   static function get_edit_form_admin() {
-    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"gThemeOptionsForm"));
+    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form"));
     $group = $form->group("edit_theme");
-    $group->input("page_size")->label(t("Items per page"))->id("gPageSize")
+    $group->input("page_size")->label(t("Items per page"))->id("g-page-size")
       ->rules("required|valid_digit")
       ->value(module::get_var("gallery", "page_size"));
-    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("gThumbSize")
+    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
       ->rules("required|valid_digit")
       ->value(module::get_var("gallery", "thumb_size"));
-    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("gResizeSize")
+    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size")
       ->rules("required|valid_digit")
       ->value(module::get_var("gallery", "resize_size"));
-    $group->textarea("header_text")->label(t("Header text"))->id("gHeaderText")
+    $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
       ->value(module::get_var("gallery", "header_text"));
-    $group->textarea("footer_text")->label(t("Footer text"))->id("gFooterText")
+    $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
       ->value(module::get_var("gallery", "footer_text"));
-    $group->checkbox("show_credits")->label(t("Show site credits"))->id("gFooterText")
+    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
       ->checked(module::get_var("gallery", "show_credits"));
     $group->submit("")->value(t("Save"));
     return $form;
diff --git a/modules/gallery/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js
index 43166f27..a568f35d 100644
--- a/modules/gallery/js/albums_form_add.js
+++ b/modules/gallery/js/albums_form_add.js
@@ -1,22 +1,22 @@
-$("#gAddAlbumForm input[name=title]").change(
+$("#g-add-album-form input[name=title]").change(
   function() {
-    $("#gAddAlbumForm input[name=name]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+    $("#g-add-album-form input[name=name]").attr(
+      "value", $("#g-add-album-form input[name=title]").attr("value")
         .replace(/[\s\/]+/g, "-").replace(/\.+$/, ""));
-    $("#gAddAlbumForm input[name=slug]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+    $("#g-add-album-form input[name=slug]").attr(
+      "value", $("#g-add-album-form input[name=title]").attr("value")
         .replace(/[^A-Za-z0-9-_]+/g, "-")
 	.replace(/^-+/, "")
 	.replace(/-+$/, ""));
   });
-$("#gAddAlbumForm input[name=title]").keyup(
+$("#g-add-album-form input[name=title]").keyup(
   function() {
-    $("#gAddAlbumForm input[name=name]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+    $("#g-add-album-form input[name=name]").attr(
+      "value", $("#g-add-album-form input[name=title]").attr("value")
         .replace(/[\s\/]+/g, "-")
 	.replace(/\.+$/, ""));
-    $("#gAddAlbumForm input[name=slug]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+    $("#g-add-album-form input[name=slug]").attr(
+      "value", $("#g-add-album-form input[name=title]").attr("value")
         .replace(/[^A-Za-z0-9-_]+/g, "-")
 	.replace(/^-+/, "")
 	.replace(/-+$/, ""));
diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 35986e5a..9acb6ca8 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -35,12 +35,12 @@ jQuery.extend(Gallery, {
           if(userSelection.length > 0) {
             Gallery.l10nClient.filter(userSelection);
             Gallery.l10nClient.toggle(1);
-            $('#l10n-client #gL10nSearch').focus();
+            $('#l10n-client #g-l10n-search').focus();
           } else {
             if($('#l10n-client').is('.hidden')) {
               Gallery.l10nClient.toggle(1);
               if(!$.browser.safari) {
-                $('#l10n-client #gL10nSearch').focus();
+                $('#l10n-client #g-l10n-search').focus();
               }
             } else {
               Gallery.l10nClient.toggle(0);
@@ -59,7 +59,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').show();
           $('#l10n-client').height('22em').removeClass('hidden');
 					//$('#l10n-client').slideUp();
-					$('#gMinimizeL10n').text("_");
+					$('#g-minimize-l10n').text("_");
         /*
          * This CSS clashes with Gallery's CSS, probably due to
          * YUI's grid / floats.
@@ -73,7 +73,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').hide();
           $('#l10n-client').height('2em').addClass('hidden');
           // TODO: Localize this message
-					$('#gMinimizeL10n').text(MSG_TRANSLATE_TEXT);
+					$('#g-minimize-l10n').text(MSG_TRANSLATE_TEXT);
         /*
           if(!$.browser.msie) {
             $('body').css('border-bottom', '0px');
@@ -131,13 +131,13 @@ jQuery.extend(Gallery, {
       if(search == false || search == '') {
         $('#l10n-client #l10n-search-filter-clear').focus();
         $('#l10n-client-string-select li').show();
-        $('#l10n-client #gL10nSearch').val('');
-        $('#l10n-client #gL10nSearch').focus();
+        $('#l10n-client #g-l10n-search').val('');
+        $('#l10n-client #g-l10n-search').focus();
       } else {
         if(search.length > 0) {
           $('#l10n-client-string-select li').hide();
           $('#l10n-client-string-select li:contains('+search+')').show();
-          $('#l10n-client #gL10nSearch').val(search);
+          $('#l10n-client #g-l10n-search').val(search);
         }
       }
     }
@@ -193,12 +193,12 @@ Gallery.behaviors.l10nClient = function(context) {
     var is_plural = Gallery.l10nClient.isPluralMessage(source);
     Gallery.l10nClient.showSourceMessage(source, is_plural);
     Gallery.l10nClient.updateTranslationForm(Gallery.l10nClient.getString(index, 'translation'), is_plural);
-    $("#gL10nClientSaveForm input[name='l10n-message-key']").val(key);
+    $("#g-l10n-client-save-form input[name='l10n-message-key']").val(key);
     Gallery.l10nClient.selected = index;
   });
 
   // When l10n_client window is clicked, toggle based on current state.
-  $('#gMinimizeL10n').click(function() {
+  $('#g-minimize-l10n').click(function() {
     if($('#l10n-client').is('.hidden')) {
       Gallery.l10nClient.toggle(1);
     } else {
@@ -207,7 +207,7 @@ Gallery.behaviors.l10nClient = function(context) {
   });
 	
 	// Close the l10n client using an AJAX call and refreshing the page
-  $('#gCloseL10n').click(function(event) {
+  $('#g-close-l10n').click(function(event) {
 		$.ajax({
       type: "GET",
       url: toggle_l10n_mode_url,
@@ -223,12 +223,12 @@ Gallery.behaviors.l10nClient = function(context) {
   // TODO: Either remove hotkeys code or add query.hotkeys.js.
   if($.hotkeys) {
     $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')});
-    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #gL10nSearch', type:'keyup'}, function(){Gallery.l10nClient.key('clear')});
+    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear')});
   }
 
   // Custom listener for l10n_client livesearch
-  $('#l10n-client #gL10nSearch').keyup(function(key) {
-    Gallery.l10nClient.filter($('#l10n-client #gL10nSearch').val());
+  $('#l10n-client #g-l10n-search').keyup(function(key) {
+    Gallery.l10nClient.filter($('#l10n-client #g-l10n-search').val());
   });
 
   // Clear search
@@ -238,7 +238,7 @@ Gallery.behaviors.l10nClient = function(context) {
   });
 
   // Send AJAX POST data on form submit.
-  $('#gL10nClientSaveForm').ajaxForm({
+  $('#g-l10n-client-save-form').ajaxForm({
       dataType: "json",
       success: function(data) {
               var source = Gallery.l10nClient.getString(Gallery.l10nClient.selected, 'source');
@@ -250,7 +250,7 @@ Gallery.behaviors.l10nClient = function(context) {
                   var translation = {};
                   for (var i = 0; i < num_plural_forms; i++) {
                       var form = plural_forms[i];
-                      translation[form] = $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).attr('value');
+                      translation[form] = $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).attr('value');
                   }
               } else {
                   translation = $('#l10n-edit-translation').attr('value');
@@ -262,13 +262,13 @@ Gallery.behaviors.l10nClient = function(context) {
 
               // Clear the translation form fields
               Gallery.l10nClient.showSourceMessage('', false);
-              $('#gL10nClientSaveForm #l10n-edit-translation').val('');
+              $('#g-l10n-client-save-form #l10n-edit-translation').val('');
 
               for (var i = 0; i < num_plural_forms; i++) {
                   var form = plural_forms[i];
-                  $('#gL10nClientSaveForm #l10n-edit-plural-translation-' + form).val('');
+                  $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).val('');
               }
-              $("#gL10nClientSaveForm input[name='l10n-message-key']").val('');
+              $("#g-l10n-client-save-form input[name='l10n-message-key']").val('');
           },
               error: function(xmlhttp) {
               // TODO: Localize this message
@@ -283,12 +283,12 @@ Gallery.behaviors.l10nClient = function(context) {
   // TODO: Handle plurals in copy button
 
   // Copy source text to translation field on button click.
-  $('#gL10nClientSaveForm #l10n-edit-copy').click(function() {
-    $('#gL10nClientSaveForm #l10n-edit-target').val($('#l10n-client-string-editor .source-text').text());
+  $('#g-l10n-client-save-form #l10n-edit-copy').click(function() {
+    $('#g-l10n-client-save-form #l10n-edit-target').val($('#l10n-client-string-editor .source-text').text());
   });
 
   // Clear translation field on button click.
-  $('#gL10nClientSaveForm #l10n-edit-clear').click(function() {
-    $('#gL10nClientSaveForm #l10n-edit-target').val('');
+  $('#g-l10n-client-save-form #l10n-edit-clear').click(function() {
+    $('#g-l10n-client-save-form #l10n-edit-target').val('');
   });
 };
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 9b12df7e..fa6d1dd3 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -96,7 +96,7 @@ class Admin_View_Core extends Gallery_View {
       if (Session::instance()->get("debug")) {
         if ($function != "admin_head") {
           array_unshift(
-            $blocks, "<div class=\"gAnnotatedThemeBlock gAnnotatedThemeBlock_$function\">" .
+            $blocks, "<div class=\"g-annotated-theme-block g-annotated-theme-block_$function\">" .
             "<div class=\"title\">$function</div>");
           $blocks[] = "</div>";
         }
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 4be374a2..47af8531 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -91,7 +91,7 @@ class Menu_Element_Link extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuLink $css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"g-menu-link $css_class\" href=\"$this->url\" " .
       "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -122,7 +122,7 @@ class Menu_Element_Ajax_Link extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gAjaxLink $css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"g-ajax-link $css_class\" href=\"$this->url\" " .
       "title=\"$this->label\" ajax_handler=\"$this->ajax_handler\">$this->label</a></li>";
   }
 }
@@ -142,7 +142,7 @@ class Menu_Element_Dialog extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"g-dialogLink $css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"g-dialog-link $css_class\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -171,7 +171,7 @@ class Menu_Core extends Menu_Element {
 
     case "root":
       $menu = new Menu("root");
-      $menu->css_class("gMenu");
+      $menu->css_class("g-menu");
       return $menu;
 
     case "submenu":
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index ab25a4b6..cba436e8 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -103,7 +103,7 @@ class Theme_View_Core extends Gallery_View {
                     ->id("fullsize")
                     ->label(t("View full size"))
                     ->url($this->item()->file_url())
-                    ->css_class("gFullSizeLink"));
+                    ->css_class("g-fullsize-link"));
     }
 
     module::event("photo_menu", $menu, $this);
@@ -121,7 +121,7 @@ class Theme_View_Core extends Gallery_View {
       ->append(Menu::factory("submenu")
                ->id("context_menu")
                ->label(t("Options")))
-      ->css_class("gContextMenu");
+      ->css_class("g-context-menu");
 
     module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector);
     return $menu->compact();
@@ -231,7 +231,7 @@ class Theme_View_Core extends Gallery_View {
       if (Session::instance()->get("debug")) {
         if ($function != "head") {
           array_unshift(
-            $blocks, "<div class=\"gAnnotatedThemeBlock gAnnotatedThemeBlock_$function gClearFix\">" .
+            $blocks, "<div class=\"g-annotated-theme-block g-annotated-theme-block_$function g-clear-fix\">" .
             "<div class=\"title\">$function</div>");
           $blocks[] = "</div>";
         }
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index ff02daf8..246d5fcd 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -567,7 +567,7 @@ class Item_Model extends ORM_MPTT {
     $v->attrs = array_merge($extra_attrs,
       array("style" => "display:block;width:{$this->width}px;height:{$this->height}px"));
     if (empty($v->attrs["id"])) {
-       $v->attrs["id"] = "gMovieId-{$this->id}";
+       $v->attrs["id"] = "g-movie-id-{$this->id}";
     }
     return $v;
   }
diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index dde54257..7ee80ca2 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -19,14 +19,14 @@
  */
 class DrawForm_Test extends Unit_Test_Case {
   function no_group_test() {
-    $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm"));
+    $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form"));
     $form->input("title")->label(t("Title"));
     $form->textarea("description")->label(t("Text Area"));
     $form->submit("")->value(t("Submit"));
     $rendered = $form->__toString();
 
     $expected = "<form action=\"http://./index.php/test/controller\" method=\"post\" " .
-                      "id=\"gTestGroupForm\">\n" .
+                      "id=\"g-test-group-form\">\n" .
                 "<input type=\"hidden\" name=\"csrf\" value=\"" . access::csrf_token() . "\"  />\n" .
                 "  <ul>\n" .
                 "  <li>\n" .
@@ -48,7 +48,7 @@ class DrawForm_Test extends Unit_Test_Case {
   }
 
   function group_test() {
-    $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm"));
+    $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form"));
     $group = $form->group("test_group")->label(t("Test Group"));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Text Area"));
@@ -56,7 +56,7 @@ class DrawForm_Test extends Unit_Test_Case {
     $rendered = $form->__toString();
 
     $expected = "<form action=\"http://./index.php/test/controller\" method=\"post\" " .
-                      "id=\"gTestGroupForm\">\n" .
+                      "id=\"g-test-group-form\">\n" .
                 "<input type=\"hidden\" name=\"csrf\" value=\"" . access::csrf_token() . "\"  />\n" .
                 "  <fieldset>\n" .
                 "    <legend>Test Group</legend>\n" .
@@ -81,7 +81,7 @@ class DrawForm_Test extends Unit_Test_Case {
   }
 
   function form_script_test() {
-    $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm"));
+    $form = new Forge("test/controller", "", "post", array("id" => "g-test-group-form"));
     $group = $form->group("test_group")->label(t("Test Group"));
     $group->input("title")->label(t("Title"));
     $group->textarea("description")->label(t("Text Area"));
@@ -92,7 +92,7 @@ class DrawForm_Test extends Unit_Test_Case {
     $rendered = $form->__toString();
 
     $expected = "<form action=\"http://./index.php/test/controller\" method=\"post\" " .
-                      "id=\"gTestGroupForm\">\n" .
+                      "id=\"g-test-group-form\">\n" .
                 "<input type=\"hidden\" name=\"csrf\" value=\"" . access::csrf_token() . "\"  />\n" .
                 "  <fieldset>\n" .
                 "    <legend>Test Group</legend>\n" .
diff --git a/modules/gallery/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html
index b4b96ed2..dff653da 100644
--- a/modules/gallery/tests/selenium/Add_Comment.html
+++ b/modules/gallery/tests/selenium/Add_Comment.html
@@ -18,22 +18,22 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>gPhotoId-2</td>
+	<td>g-photoId-2</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>gAuthor</td>
+	<td>g-author</td>
 	<td>Test</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>gEmail</td>
+	<td>g-email</td>
 	<td>test@gmail.com</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>gText</td>
+	<td>g-text</td>
 	<td>This is a selenium test comment.</td>
 </tr>
 <tr>
diff --git a/modules/gallery/tests/selenium/Login.html b/modules/gallery/tests/selenium/Login.html
index 5e17a3c7..d2e45c63 100644
--- a/modules/gallery/tests/selenium/Login.html
+++ b/modules/gallery/tests/selenium/Login.html
@@ -18,17 +18,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>gLoginLink</td>
+	<td>g-login-link</td>
 	<td></td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>gName</td>
+	<td>g-name</td>
 	<td>admin</td>
 </tr>
 <tr>
 	<td>type</td>
-	<td>gPassword</td>
+	<td>g-password</td>
 	<td>admin</td>
 </tr>
 <tr>
@@ -38,7 +38,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>gUserProfileLink</td>
+	<td>g-user-profile-link</td>
 	<td></td>
 </tr>
 
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 5fd6a390..c8ba3770 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -1,12 +1,12 @@
 modules/akismet/views/admin_akismet.html.php                 16  DIRTY    $form
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR $api_key
 modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urlencode($blog_url)
-modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"g-even-row":"g-odd-row"
+modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR ($i%2==0)?"g-even":"g-odd"
 modules/comment/views/admin_block_recent_comments.html.php   5   DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
 modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    gallery::date_time($comment->created)
 modules/comment/views/admin_comments.html.php                42  DIRTY    $menu
 modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR $comment->id
-modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
+modules/comment/views/admin_comments.html.php                106 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 modules/comment/views/admin_comments.html.php                109 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/admin_comments.html.php                122 DIRTY_JS $item->url()
 modules/comment/views/admin_comments.html.php                124 DIRTY_ATTR $item->thumb_url()
@@ -56,14 +56,14 @@ modules/gallery/views/admin_dashboard.html.php               35  DIRTY    $block
 modules/gallery/views/admin_graphics.html.php                22  DIRTY    newView("admin_graphics_none.html")
 modules/gallery/views/admin_graphics.html.php                24  DIRTY    newView("admin_graphics_$active.html",array("tk"=>$tk->$active,"is_active"=>true))
 modules/gallery/views/admin_graphics.html.php                31  DIRTY    newView("admin_graphics_$id.html",array("tk"=>$tk->$id,"is_active"=>false))
-modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $tk->installed?" gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $is_active?" g-selected":""
+modules/gallery/views/admin_graphics_gd.html.php             2   DIRTY_ATTR $tk->installed?" g-installed-toolkit":" g-unavailable"
 modules/gallery/views/admin_graphics_gd.html.php             19  DIRTY    $tk->error
-modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $tk->installed?"  gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $is_active?" g-selected":""
+modules/gallery/views/admin_graphics_graphicsmagick.html.php 2   DIRTY_ATTR $tk->installed?"  g-installed-toolkit":" g-unavailable"
 modules/gallery/views/admin_graphics_graphicsmagick.html.php 18  DIRTY    $tk->error
-modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $is_active?" gSelected":""
-modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $tk->installed?"  gInstalledToolkit":" gUnavailable"
+modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $is_active?" g-selected":""
+modules/gallery/views/admin_graphics_imagemagick.html.php    2   DIRTY_ATTR $tk->installed?"  g-installed-toolkit":" g-unavailable"
 modules/gallery/views/admin_graphics_imagemagick.html.php    18  DIRTY    $tk->error
 modules/gallery/views/admin_languages.html.php               9   DIRTY    access::csrf_form_field()
 modules/gallery/views/admin_languages.html.php               27  DIRTY_ATTR (isset($installed_locales[$code]))?"installed":""
@@ -72,20 +72,20 @@ modules/gallery/views/admin_languages.html.php               28  DIRTY    form::
 modules/gallery/views/admin_languages.html.php               29  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               31  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               102 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
+modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
-modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"gWarning":""
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_maintenance.html.php             72  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             73  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
 modules/gallery/views/admin_maintenance.html.php             74  DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             77  DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             92  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
-modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
-modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"gSuccess":"gError"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
+modules/gallery/views/admin_maintenance.html.php             145 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             146 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
 modules/gallery/views/admin_maintenance.html.php             147 DIRTY    gallery::date_time($task->updated)
 modules/gallery/views/admin_maintenance.html.php             150 DIRTY    $task->name
 modules/gallery/views/admin_maintenance.html.php             162 DIRTY    $task->status
@@ -93,7 +93,7 @@ modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::s
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
 modules/gallery/views/admin_modules.html.php                 9   DIRTY    access::csrf_form_field()
-modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"g-odd-row":"g-even-row"
+modules/gallery/views/admin_modules.html.php                 19  DIRTY_ATTR ($i%2==0)?"g-odd":"g-even"
 modules/gallery/views/admin_modules.html.php                 22  DIRTY    form::checkbox($data,'1',module::is_active($module_name))
 modules/gallery/views/admin_modules.html.php                 24  DIRTY    $module_info->version
 modules/gallery/views/admin_theme_options.html.php           5   DIRTY    $form
@@ -178,7 +178,7 @@ modules/gallery/views/upgrader.html.php                      45  DIRTY_ATTR $id
 modules/gallery/views/upgrader.html.php                      49  DIRTY    $module->version
 modules/gallery/views/upgrader.html.php                      52  DIRTY    $module->code_version
 modules/image_block/views/image_block_block.html.php         3   DIRTY_JS $item->url()
-modules/image_block/views/image_block_block.html.php         4   DIRTY    $item->thumb_img(array("class"=>"gThumbnail"))
+modules/image_block/views/image_block_block.html.php         4   DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
 modules/info/views/info_block.html.php                       22  DIRTY    date("M j, Y H:i:s",$item->captured)
 modules/info/views/info_block.html.php                       29  DIRTY_JS $item->owner->url
 modules/notification/views/comment_published.html.php        28  DIRTY_JS $comment->item()->abs_url()
@@ -195,19 +195,19 @@ modules/organize/views/organize_dialog.html.php              5   DIRTY_JS url::s
 modules/organize/views/organize_dialog.html.php              6   DIRTY_JS url::site("organize/tree/__ALBUM_ID__")
 modules/organize/views/organize_dialog.html.php              22  DIRTY    $album_tree
 modules/organize/views/organize_dialog.html.php              29  DIRTY    $micro_thumb_grid
-modules/organize/views/organize_dialog.html.php              37  DIRTY    form::dropdown(array("id"=>"gOrganizeSortColumn"),album::get_sort_order_options(),$album->sort_column)
-modules/organize/views/organize_dialog.html.php              38  DIRTY    form::dropdown(array("id"=>"gOrganizeSortOrder"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
+modules/organize/views/organize_dialog.html.php              37  DIRTY    form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
+modules/organize/views/organize_dialog.html.php              38  DIRTY    form::dropdown(array("id"=>"g-organize-sort-order"),array("ASC"=>"Ascending","DESC"=>"Descending"),$album->sort_order)
 modules/organize/views/organize_thumb_grid.html.php          3   DIRTY_ATTR $child->id
 modules/organize/views/organize_thumb_grid.html.php          4   DIRTY_ATTR $child->id
-modules/organize/views/organize_thumb_grid.html.php          5   DIRTY_ATTR $child->is_album()?"gAlbum":"gPhoto"
-modules/organize/views/organize_thumb_grid.html.php          6   DIRTY    $child->thumb_img(array("class"=>"gThumbnail","ref"=>$child->id),90,true)
+modules/organize/views/organize_thumb_grid.html.php          5   DIRTY_ATTR $child->is_album()?"g-album":"g-photo"
+modules/organize/views/organize_thumb_grid.html.php          6   DIRTY    $child->thumb_img(array("class"=>"g-thumbnail","ref"=>$child->id),90,true)
 modules/organize/views/organize_thumb_grid.html.php          14  DIRTY_JS url::site("organize/album/$album->id/".($offset+25))
-modules/organize/views/organize_tree.html.php                2   DIRTY_ATTR access::can("edit",$album)?"":"gViewOnly"
+modules/organize/views/organize_tree.html.php                2   DIRTY_ATTR access::can("edit",$album)?"":"g-view-only"
 modules/organize/views/organize_tree.html.php                3   DIRTY_ATTR $album->id
 modules/organize/views/organize_tree.html.php                6   DIRTY_ATTR $selected&&$album->id==$selected->id?"selected":""
 modules/organize/views/organize_tree.html.php                7   DIRTY_ATTR $album->id
 modules/organize/views/organize_tree.html.php                13  DIRTY    View::factory("organize_tree.html",array("selected"=>$selected,"album"=>$child));
-modules/organize/views/organize_tree.html.php                15  DIRTY_ATTR access::can("edit",$child)?"":"gViewOnly"
+modules/organize/views/organize_tree.html.php                15  DIRTY_ATTR access::can("edit",$child)?"":"g-view-only"
 modules/organize/views/organize_tree.html.php                16  DIRTY_ATTR $child->id
 modules/organize/views/organize_tree.html.php                19  DIRTY_ATTR $child->id
 modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY    $form
@@ -252,7 +252,7 @@ modules/search/views/search.html.php                         32  DIRTY    $item-
 modules/server_add/views/admin_server_add.html.php           15  DIRTY_ATTR $id
 modules/server_add/views/admin_server_add.html.php           24  DIRTY    $form
 modules/server_add/views/server_add_tree.html.php            20  DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
-modules/server_add/views/server_add_tree.html.php            21  DIRTY_ATTR is_dir($file)?"gDirectory":"gFile"
+modules/server_add/views/server_add_tree.html.php            21  DIRTY_ATTR is_dir($file)?"g-directory":"g-file"
 modules/server_add/views/server_add_tree_dialog.html.php     3   DIRTY_JS url::site("server_add/children?path=__PATH__")
 modules/server_add/views/server_add_tree_dialog.html.php     4   DIRTY_JS url::site("server_add/start?item_id={$item->id}&csrf=$csrf")
 modules/server_add/views/server_add_tree_dialog.html.php     23  DIRTY    $tree
@@ -267,19 +267,19 @@ modules/user/views/admin_users.html.php                      3   DIRTY_JS url::s
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("g-odd-row","g-even-row")
+modules/user/views/admin_users.html.php                      67  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/user/views/admin_users.html.php                      67  DIRTY_ATTR $user->admin?"admin":""
 modules/user/views/admin_users.html.php                      68  DIRTY_ATTR $user->id
 modules/user/views/admin_users.html.php                      69  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
 modules/user/views/admin_users.html.php                      83  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
 modules/user/views/admin_users.html.php                      121 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php                      121 DIRTY_ATTR ($group->special?"gDefaultGroup":"")
+modules/user/views/admin_users.html.php                      121 DIRTY_ATTR ($group->special?"g-default-group":"")
 modules/user/views/admin_users.html.php                      123 DIRTY    $v
 modules/user/views/admin_users_group.html.php                22  DIRTY_JS $user->id
 modules/user/views/admin_users_group.html.php                22  DIRTY_JS $group->id
 modules/user/views/login_ajax.html.php                       6   DIRTY_JS url::site("password/reset")
 modules/user/views/login_ajax.html.php                       37  DIRTY    $form
-modules/user/views/user_languages_block.html.php             2   DIRTY    form::dropdown("gSelectSessionLocale",$installed_locales,$selected)
+modules/user/views/user_languages_block.html.php             2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $width
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $height
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY_ATTR $url
@@ -308,13 +308,13 @@ themes/admin_wind/views/pager.html.php                       37  DIRTY_JS str_re
 themes/wind/views/album.html.php                             16  DIRTY_ATTR $child->id
 themes/wind/views/album.html.php                             16  DIRTY_ATTR $item_class
 themes/wind/views/album.html.php                             18  DIRTY_JS $child->url()
-themes/wind/views/album.html.php                             19  DIRTY    $child->thumb_img(array("class"=>"gThumbnail"))
+themes/wind/views/album.html.php                             19  DIRTY    $child->thumb_img(array("class"=>"g-thumbnail"))
 themes/wind/views/album.html.php                             23  DIRTY_JS $child->url()
 themes/wind/views/block.html.php                             3   DIRTY_ATTR $anchor
 themes/wind/views/block.html.php                             5   DIRTY_ATTR $css_id
 themes/wind/views/block.html.php                             6   DIRTY    $title
 themes/wind/views/block.html.php                             8   DIRTY    $content
-themes/wind/views/dynamic.html.php                           11  DIRTY_ATTR $child->is_album()?"gAlbum":""
+themes/wind/views/dynamic.html.php                           11  DIRTY_ATTR $child->is_album()?"g-album":""
 themes/wind/views/dynamic.html.php                           13  DIRTY_JS $child->url()
 themes/wind/views/dynamic.html.php                           14  DIRTY_ATTR $child->id
 themes/wind/views/dynamic.html.php                           15  DIRTY_ATTR $child->thumb_url()
@@ -322,7 +322,7 @@ themes/wind/views/dynamic.html.php                           16  DIRTY_ATTR $chi
 themes/wind/views/dynamic.html.php                           17  DIRTY_ATTR $child->thumb_height
 themes/wind/views/movie.html.php                             8   DIRTY_JS $previous_item->url()
 themes/wind/views/movie.html.php                             18  DIRTY_JS $next_item->url()
-themes/wind/views/movie.html.php                             28  DIRTY    $item->movie_img(array("class"=>"gMovie","id"=>"gMovieId-{$item->id}"))
+themes/wind/views/movie.html.php                             28  DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
 themes/wind/views/page.html.php                              9   DIRTY    $page_title
 themes/wind/views/page.html.php                              32  DIRTY_JS $theme->url()
 themes/wind/views/page.html.php                              41  DIRTY    $new_width
@@ -344,4 +344,4 @@ themes/wind/views/photo.html.php                             8   DIRTY_JS $theme
 themes/wind/views/photo.html.php                             21  DIRTY_JS $previous_item->url()
 themes/wind/views/photo.html.php                             31  DIRTY_JS $next_item->url()
 themes/wind/views/photo.html.php                             43  DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php                             45  DIRTY    $item->resize_img(array("id"=>"gPhotoId-{$item->id}","class"=>"gResize"))
+themes/wind/views/photo.html.php                             45  DIRTY    $item->resize_img(array("id"=>"g-photoId-{$item->id}","class"=>"g-resize"))
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 6ad265ac..422bd8f7 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminAdvancedSettings">
+<div id="g-admin-advanced-settings">
   <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="gMessage">
-    <li class="gWarning">
+  <ul id="g-action-status">
+    <li class="g-warning">
       <b><?= t("Change these values at your own risk!") ?></b>
     </li>
   </ul>
@@ -23,7 +23,7 @@
       <td> <?= html::clean($var->name) ?> </td>
       <td>
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
-          class="g-dialogLink"
+          class="g-dialog-link"
           title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
           <? if ($var->value): ?>
           <?= html::clean($var->value) ?>
diff --git a/modules/gallery/views/admin_block_photo_stream.html.php b/modules/gallery/views/admin_block_photo_stream.html.php
index 4968c39b..f9725eee 100644
--- a/modules/gallery/views/admin_block_photo_stream.html.php
+++ b/modules/gallery/views/admin_block_photo_stream.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
 <? foreach ($photos as $photo): ?>
-  <li class="gItem gPhoto">
+  <li class="g-item g-photo">
     <a href="<?= $photo->url() ?>" title="<?= html::purify($photo->title)->for_html_attr() ?>">
       <img <?= photo::img_dimensions($photo->width, $photo->height, 72) ?>
         src="<?= $photo->thumb_url() ?>" alt="<?= html::purify($photo->title)->for_html_attr() ?>" />
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index 148de65f..154aa172 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -3,34 +3,34 @@
   update_blocks = function() {
     $.get(<?= html::js_string(url::site("admin/dashboard/reorder")) ?>,
           {"csrf": "<?= $csrf ?>",
-           "dashboard_center[]": $("#gAdminDashboard").sortable(
+           "dashboard_center[]": $("#g-admin-dashboard").sortable(
              "toArray", {attribute: "block_id"}),
-           "dashboard_sidebar[]": $("#gAdminDashboardSidebar").sortable(
+           "dashboard_sidebar[]": $("#g-admin-dashboard-sidebar").sortable(
              "toArray", {attribute: "block_id"})});
   };
 
   $(document).ready(function(){
-    $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable");
-    $("#gAdminDashboard").sortable({
-      connectWith: ["#gAdminDashboardSidebar"],
+    $("#g-admin-dashboard .g-block .ui-widget-header").addClass("g-draggable");
+    $("#g-admin-dashboard").sortable({
+      connectWith: ["#g-admin-dashboard-sidebar"],
       cursor: "move",
       handle: $(".ui-widget-header"),
       opacity: 0.6,
-      placeholder: "gDropTarget",
+      placeholder: "g-drop-target",
       stop: update_blocks
     });
 
-    $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable");
-    $("#gAdminDashboardSidebar").sortable({
-      connectWith: ["#gAdminDashboard"],
+    $("#g-admin-dashboard-sidebar .g-block .ui-widget-header").addClass("g-draggable");
+    $("#g-admin-dashboard-sidebar").sortable({
+      connectWith: ["#g-admin-dashboard"],
       cursor: "move",
       handle: $(".ui-widget-header"),
       opacity: 0.6,
-      placeholder: "gDropTarget",
+      placeholder: "g-drop-target",
       stop: update_blocks
     });
   });
 </script>
-<div id="gAdminDashboard">
+<div id="g-admin-dashboard">
   <?= $blocks ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index f4c300ae..95d0618c 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -1,18 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(document).ready(function() {
-    $(".gAvailable .gBlock").equal_heights();
+    $(".g-available .g-block").equal_heights();
     select_toolkit = function(el) {
-      if (!$(this).hasClass("gUnavailable")) {
+      if (!$(this).hasClass("g-unavailable")) {
         window.location = <?= html::js_string(url::site("admin/graphics/choose/__TK__?csrf=$csrf")) ?>
           .replace("__TK__", $(this).attr("id"));
       }
     };
-    $("#gAdminGraphics div.gAvailable .gBlock").click(select_toolkit);
+    $("#g-admin-graphics div.g-available .g-block").click(select_toolkit);
   });
 </script>
 
-<div id="gAdminGraphics">
+<div id="g-admin-graphics">
   <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.") ?>
@@ -25,7 +25,7 @@
   <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
   <? endif ?>
 
-  <div class="gAvailable">
+  <div class="g-available">
     <h2> <?= t("Available Toolkits") ?> </h2>
     <? foreach (array_keys((array)$tk) as $id): ?>
     <? if ($id != $active): ?>
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index 08c19234..1cc9dc9e 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gd" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? " gInstalledToolkit" : " gUnavailable" ?>">
+<div id="gd" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? " g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="170" height="110" src="<?= url::file("modules/gallery/images/gd.png"); ?>" alt="<? t("Visit the GD lib project site") ?>" />
   <h3> <?= t("GD") ?> </h3>
   <p>
@@ -7,7 +7,7 @@
         array("url" => "http://www.boutell.com/gd")) ?>
   </p>
   <? if ($tk->installed && $tk->rotate): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
   </div>
   <p>
@@ -15,7 +15,7 @@
   </p>
   <? elseif ($tk->installed): ?>
   <? if ($tk->error): ?>
-  <p class="gModuleStatus gWarning">
+  <p class="g-module-status g-warning">
     <?= $tk->error ?>
   </p>
   <? endif ?>
@@ -23,7 +23,7 @@
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("You do not have GD installed.") ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 6ee15bc3..5dae1442 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
+<div id="graphicsmagick" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? "  g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
   <h3> <?= t("GraphicsMagick") ?> </h3>
   <p>
@@ -7,14 +7,14 @@
         array("url" => "http://www.graphicsmagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
-  <div class="gModuleStatus gWarning">
+  <div class="g-module-status g-warning">
     <?= $tk->error ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index aeef4919..9c1a9909 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="imagemagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
+<div id="imagemagick" class="g-block<?= $is_active ? " g-selected" : "" ?><?= $tk->installed ? "  g-installed-toolkit" : " g-unavailable" ?>">
   <img class="logo" width="114" height="118" src="<?= url::file("modules/gallery/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
   <h3> <?= t("ImageMagick") ?> </h3>
   <p>
@@ -7,14 +7,14 @@
         array("url" => "http://www.imagemagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <div class="gModuleStatus gInfo">
+  <div class="g-module-status g-info">
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
     <a class="g-button ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
-  <div class="gModuleStatus gWarning">
+  <div class="g-module-status g-warning">
     <?= $tk->error ?>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index e6923a5a..3ac6b4fb 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
-<div id="none" class="gModuleStatus gWarning gBlock">
+<div id="none" class="g-module-status g-warning g-block">
   <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.") ?>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index d6f50516..74f48b76 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gLanguages">
+<div id="g-languages">
   <h1> <?= t("Languages") ?> </h1>
   <p>
     <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
   </p>
 
-  <form id="gLanguagesForm" method="post" action="<?= url::site("admin/languages/save") ?>">
+  <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
     <?= access::csrf_form_field() ?>
     <table>
       <tr>
@@ -52,7 +52,7 @@
       }
     });
     
-    $("#gLanguagesForm").ajaxForm({
+    $("g-languages-form").ajaxForm({
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
@@ -65,7 +65,7 @@
   </script>
 </div>
 
-<div id="gTranslations">
+<div id="g-translations">
   <h1> <?= t("Translations") ?> </h1>
   <p>
     <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
@@ -73,9 +73,9 @@
 
   <h3><?= t("Translating Gallery") ?></h3>
 
-  <div class="gBlock">
+  <div class="g-block">
     <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
-       class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
+       class="g-doc-link ui-state-default ui-corner-all ui-icon ui-icon-help"
        title="<?= t("Localization documentation")->for_html_attr() ?>">
       <?= t("Localization documentation") ?>
     </a>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 4c79c25b..94582dc8 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminMaintenance">
+<div id="g-admin-maintenance">
   <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 id="gAvailableTasks">
+  <div id="g-available-tasks">
     <h2> <?= t("Available Tasks") ?> </h2>
     <table>
       <tr>
@@ -21,7 +21,7 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= log::severity_class($task->severity) ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
         <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
@@ -30,7 +30,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all">
+            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -41,7 +41,7 @@
   </div>
 
   <? if ($running_tasks->count()): ?>
-  <div id="gRunningTasks">
+  <div id="g-running-tasks">
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -69,8 +69,8 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "stalled" ? "gWarning" : "" ?>">
-        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
+        <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -100,7 +100,7 @@
             <?= t("cancel") ?>
           </a>
           <? if ($task->state == "stalled"): ?>
-          <a class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"
+          <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
              href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
           </a>
@@ -114,7 +114,7 @@
   <? endif ?>
 
   <? if ($finished_tasks->count()): ?>
-  <div id="gFinishedTasks">
+  <div id="g-finished-tasks">
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -142,8 +142,8 @@
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?> <?= $task->state == "success" ? "gSuccess" : "gError" ?>">
-        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
+        <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -170,12 +170,12 @@
             <?= t("remove") ?>
           </a>
           <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialogLink g-button ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
             <?= t("browse log") ?>
           </a>
           <? endif ?>
           <? else: ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialogLink g-button" ui-state-default ui-corner-all>
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all>
             <?= t("resume") ?>
           </a>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index c61db871..e6ed97b3 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -9,11 +9,11 @@
 appendTo('body').submit().remove();
   };
 </script>
-<div id="gTaskLog-dialog">
+<div id="g-task-log-dialog">
   <h1> <?= $task->name ?> </h1>
-  <div class="gTaskLog">
+  <div class="g-task-log">
     <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
-  <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
-  <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
+  <button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
+  <button id="g-save" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
 </div>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index c0bc0d43..53972b70 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -4,7 +4,7 @@
   var animation = null;
   var delta = 1;
   animate_progress_bar = function() {
-    var current_value = parseInt($(".gProgressBar div").css("width").replace("%", ""));
+    var current_value = parseInt($(".g-progress-bar div").css("width").replace("%", ""));
     if (target_value > current_value) {
       // speed up
       delta = Math.min(delta + 0.04, 3);
@@ -14,10 +14,10 @@
     }
 
     if (target_value == 100) {
-      $(".gProgressBar").progressbar("value", 100);
+      $(".g-progress-bar").progressbar("value", 100);
     } else if (current_value != target_value || delta != 1) {
       var new_value = Math.min(current_value + delta, target_value);
-      $(".gProgressBar").progressbar("value", new_value);
+      $(".g-progress-bar").progressbar("value", new_value);
       animation = setTimeout(function() { animate_progress_bar(target_value); }, 100);
     } else {
       animation = null;
@@ -35,30 +35,30 @@
         if (!animation) {
           animate_progress_bar();
         }
-        $("#gStatus").html("" + data.task.status);
+        $("#g-status").html("" + data.task.status);
         if (data.task.done) {
-          $("#gPauseButton").hide();
-          $("#gDoneButton").show();
+          $("#g-pause-button").hide();
+          $("#g-done-button").show();
         } else {
           setTimeout(update, 100);
         }
       }
     });
   }
-  $(".gProgressBar").progressbar({value: 0});
+  $(".g-progress-bar").progressbar({value: 0});
   update();
   dismiss = function() {
     window.location.reload();
   }
 </script>
-<div id="gProgress">
+<div id="g-progress">
   <h1> <?= $task->name ?> </h1>
-  <div class="gProgressBar"></div>
-  <div id="gStatus">
+  <div class="g-progress-bar"></div>
+  <div id="g-status">
     <?= t("Starting up...") ?>
   </div>
   <div class="g-txt-right">
-    <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
-    <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
+    <button id="g-pause-button" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
+    <button id="g-done-button" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
 </div>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 058844b4..75f4f0c5 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gModules">
+<div id="g-modules">
   <h1> <?= t("Gallery Modules") ?> </h1>
   <p>
     <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?>
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd-row" : "g-even-row" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 62b59ac1..3137a2a6 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,20 +1,20 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(function() {
-    $(".gAdminBlocksList ul").sortable({
-      connectWith: ".sortableBlocks",
+    $(".g-admin-blocks-list ul").sortable({
+      connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "ui-state-highlight",
       update: function(event,ui) {
-        if ($(this).attr("id") == "gActiveBlocks") {
+        if ($(this).attr("id") == "g-active-blocks") {
           var active_blocks = "";
-          $("ul#gActiveBlocks li").each(function(i) {
+          $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#gSiteBlocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
             if (data.result == "success") {
-              $("ul#gAvailableBlocks").html(data.available);
-              $("ul#gActiveBlocks").html(data.active);
+              $("ul#g-available-blocks").html(data.available);
+              $("ul#g-active-blocks").html(data.active);
             }
           });
         }
@@ -26,19 +26,19 @@
 <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>
-    <div id="gSiteBlocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
-  <div class="gAdminBlocksList">
+    <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>
-      <ul id="gAvailableBlocks" class="sortableBlocks">
+      <ul id="g-available-blocks" class="g-sortable-blocks">
       <?= $available ?>
       </ul>
     </div>
   </div>
-  <div class="gAdminBlocksList">
+  <div class="g-admin-blocks-list">
     <div><h3><?= t("Active Blocks") ?></h3></div>
     <div>
-      <ul id="gActiveBlocks" class="sortableBlocks">
+      <ul id="g-active-blocks" class="g-sortable-blocks">
       <?= $active ?>
       </ul>
     </div>
diff --git a/modules/gallery/views/admin_sidebar_blocks.html.php b/modules/gallery/views/admin_sidebar_blocks.html.php
index a1a71743..48aa3f05 100644
--- a/modules/gallery/views/admin_sidebar_blocks.html.php
+++ b/modules/gallery/views/admin_sidebar_blocks.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 
 <? foreach ($blocks as $ref => $text): ?>
-<li class="gDraggable" ref="<?= $ref ?>"><?= $text ?></li>
+<li class="g-draggable" ref="<?= $ref ?>"><?= $text ?></li>
 <? endforeach ?>
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index 724e6438..ed091d4b 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminThemeOptions">
+<div id="g-admin-themeOptions">
   <h1> <?= t("Theme Options") ?> </h1>
 
   <?= $form ?>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index d0ffc414..714b3af8 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -12,9 +12,9 @@
   <?= 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>
 
-<div id="gSiteTheme">
+<div id="g-site-theme">
   <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="gBlock gSelected">
+  <div class="g-block g-selected">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
@@ -24,13 +24,13 @@
   </div>
 
   <h2> <?= t("Available Gallery themes") ?> </h2>
-  <div class="gAvailable">
+  <div class="g-available">
     <? $count = 0 ?>
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
-    <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+    <div class="g-block">
+      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
@@ -50,9 +50,9 @@
   </div>
 </div>
 
-<div id="gAdminTheme">
+<div id="g-admin-theme">
   <h2> <?= t("Admin theme") ?> </h2>
-  <div class="gBlock gSelected">
+  <div class="g-block g-selected">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
@@ -62,13 +62,13 @@
   </div>
 
   <h2> <?= t("Available admin themes") ?> </h2>
-  <div class="gAvailable">
+  <div class="g-available">
     <? $count = 0 ?>
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
-    <div class="gBlock">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+    <div class="g-block">
+      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
         <h3> <?= $info->name ?> </h3>
diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php
index 730d77cb..6bc622fd 100644
--- a/modules/gallery/views/form.html.php
+++ b/modules/gallery/views/form.html.php
@@ -44,7 +44,7 @@ if (!function_exists("DrawForm")) {
         print $input->render();
       } else {
         if ($input->error_messages()) {
-          print "$prefix<li class=\"gError\">\n";
+          print "$prefix<li class=\"g-error\">\n";
         } else {
           print "$prefix<li>\n";
         }
@@ -58,7 +58,7 @@ if (!function_exists("DrawForm")) {
         }
         if ($input->error_messages()) {
           foreach ($input->error_messages() as $error_message) {
-            print "$prefix  <p class=\"gError\">\n";
+            print "$prefix  <p class=\"g-error\">\n";
             print "$prefix    $error_message\n";
             print "$prefix  </p>\n";
           }
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index a7f001aa..f4da52dc 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -2,8 +2,8 @@
 <div id="l10n-client" class="hidden">
   <div class="labels">
     <span id="l10n-client-toggler">
-      <a id="gMinimizeL10n">_</a>
-      <a id="gCloseL10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
+      <a id="g-minimize-l10n">_</a>
+      <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") ?>
@@ -37,7 +37,7 @@
       <p id="source-text-tmp-space" style="display:none"></p>
     </div>
     <div class="translation">
-      <form method="post" action="<?= url::site("l10n_client/save") ?>" id="gL10nClientSaveForm">
+      <form method="post" action="<?= url::site("l10n_client/save") ?>" id="g-l10n-client-save-form">
         <?= access::csrf_form_field() ?>
         <?= form::hidden("l10n-message-key") ?>
         <?= form::textarea("l10n-edit-translation", "", ' rows="5" class="translationField"') ?>
diff --git a/modules/gallery/views/move_browse.html.php b/modules/gallery/views/move_browse.html.php
index 99728ecc..ce3fc2fd 100644
--- a/modules/gallery/views/move_browse.html.php
+++ b/modules/gallery/views/move_browse.html.php
@@ -3,14 +3,14 @@
  var load_tree = function(target_id, locked) {
    var load_url = "<?= url::site("move/show_sub_tree/{$source->id}/__TARGETID__") ?>";
    var node = $("#node_" + target_id);
-   $("#gMove .node a").removeClass("selected");
+   $("#g-move .node a").removeClass("selected");
    node.find("a:first").addClass("selected");
    if (locked) {
-     $("#gMoveButton").attr("disabled", "disabled");
-     $("#gMove form input[name=target_id]").attr("value", "");
+     $("#g-move-button").attr("disabled", "disabled");
+     $("#g-move form input[name=target_id]").attr("value", "");
    } else {
-     $("#gMoveButton").removeAttr("disabled");
-     $("#gMove form input[name=target_id]").attr("value", target_id);
+     $("#g-move-button").removeAttr("disabled");
+     $("#g-move form input[name=target_id]").attr("value", target_id);
    }
    var sub_tree = $("#tree_" + target_id);
    if (sub_tree.length) {
@@ -33,7 +33,7 @@
   <? t("Move this album to a new album") ?>
   <? endif ?>
 </h1>
-<div id="gMove">
+<div id="g-move">
   <ul id="tree_0">
     <li id="node_1" class="node">
       <?= $tree ?>
@@ -42,6 +42,6 @@
   <form method="post" action="<?= url::site("move/save/$source->id") ?>">
     <?= access::csrf_form_field() ?>
     <input type="hidden" name="target_id" value="" />
-    <input type="submit" id="gMoveButton" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
+    <input type="submit" id="g-move-button" value="<?= t("Move")->for_html_attr() ?>" disabled="disabled"/>
   </form>
 </div>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 519734d6..540f2735 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,7 +5,7 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-          $("#gEditPermissionForm").html(data);
+          $("#g-edit-permissions-form").html(data);
           $(".active").removeClass("active");
           $("#item-" + id).addClass("active");
       }
@@ -19,15 +19,15 @@
       url: action_url.replace("__CMD__", cmd).replace("__GROUP__", group_id).
            replace("__PERM__", perm_id).replace("__ITEM__", item_id),
       success: function(data) {
-        $("#gEditPermissionForm").load(form_url.replace("__ITEM__", item_id));
+        $("#g-edit-permissions-form").load(form_url.replace("__ITEM__", item_id));
       }
     });
   }
 </script>
-<div id="gPermissions">
+<div id="g-permissions">
   <? if (!$htaccess_works): ?>
-  <ul id="gMessage">
-    <li class="gError">
+  <ul id="g-action-status">
+    <li class="g-error">
       <?= t("Oh no!  Your server needs a configuration change in order for you to hide photos!  Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
             array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'),
                   "apache_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride" target="_blank"'))) ?>
@@ -37,7 +37,7 @@
 
   <p><?= t("Edit permissions for album:") ?></p>
 
-  <ul class="gBreadcrumbs">
+  <ul class="g-breadcrumbs">
     <? foreach ($parents as $parent): ?>
     <li id="item-<?= $parent->id ?>">
       <? if (access::can("edit", $parent)): ?>
@@ -56,7 +56,7 @@
     </li>
   </ul>
 
-  <div id="gEditPermissionForm">
+  <div id="g-edit-permissions-form">
     <?= $form ?>
   </div>
 </div>
diff --git a/modules/gallery/views/permissions_form.html.php b/modules/gallery/views/permissions_form.html.php
index f5639439..e2871adb 100644
--- a/modules/gallery/views/permissions_form.html.php
+++ b/modules/gallery/views/permissions_form.html.php
@@ -19,7 +19,7 @@
         <? $lock = access::locked_by($group, $permission->name, $item) ?>
 
         <? if ($lock): ?>
-          <td class="gDenied">
+          <td class="g-denied">
             <img src="<?= url::file(gallery::find_file("images", "ico-denied.png")) ?>"
                  title="<?= t('denied and locked through parent album')->for_html_attr() ?>"
                  alt="<?= t('denied icon')->for_html_attr() ?>" />
@@ -30,7 +30,7 @@
         <? else: ?>
           <? if ($intent === access::INHERIT): ?>
             <? if ($allowed): ?>
-              <td class="gAllowed">
+              <td class="g-allowed">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)" title="<?= t('allowed through parent album, click to allow explicitly')->for_html_attr() ?>">
                   <img src="<?= url::file(gallery::find_file("images", "ico-success-pale.png")) ?>" alt="<?= t('passive allowed icon')->for_html_attr() ?>" />
                 </a>
@@ -40,7 +40,7 @@
                 </a>
               </td>
             <? else: ?>
-              <td class="gDenied">
+              <td class="g-denied">
                 <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                   title="<?= t('click to allow')->for_html_attr() ?>">
                   <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
@@ -53,7 +53,7 @@
             <? endif ?>
 
           <? elseif ($intent === access::DENY): ?>
-            <td class="gDenied">
+            <td class="g-denied">
               <a href="javascript:set('allow',<?= $group->id ?>,<?= $permission->id ?>,<?= $item->id ?>)"
                 title="<?= t('click to allow')->for_html_attr() ?>">
                 <img src="<?= url::file(gallery::find_file("images", "ico-success-gray.png")) ?>" alt="<?= t('inactive allowed icon')->for_html_attr() ?>" />
@@ -68,7 +68,7 @@
               <? endif ?>
             </td>
           <? elseif ($intent === access::ALLOW): ?>
-            <td class="gAllowed">
+            <td class="g-allowed">
               <? if ($item->id == 1): ?>
                 <img src="<?= url::file(gallery::find_file("images", "ico-success.png")) ?>" title="<?= t("allowed")->for_html_attr() ?>" alt="<?= t('allowed icon')->for_html_attr() ?>" />
               <? else: ?>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 6e66d241..ddad1fc4 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -4,16 +4,16 @@
 <script type="text/javascript" src="<?= url::file("lib/jquery.scrollTo.js") ?>"></script>
 
 <!-- hack to set the title for the dialog -->
-<form id="gAddPhotosForm" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
+<form id="g-add-photos-form" action="<?= url::site("simple_uploader/finish?csrf=$csrf") ?>">
   <fieldset>
     <legend> <?= t("Add photos to %album_title", array("album_title" => html::purify($item->title))) ?> </legend>
   </fieldset>
 </form>
 
-<div id="gAddPhotos">
+<div id="g-add-photos">
   <? if (ini_get("suhosin.session.encrypt")): ?>
-  <ul id="gMessage">
-    <li class="gError">
+  <ul id="g-action-status">
+    <li class="g-error">
       <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
           array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
       "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
@@ -24,7 +24,7 @@
   <p>
     <?= t("Photos will be uploaded to album: ") ?>
   </p>
-  <ul class="gBreadcrumbs">
+  <ul class="g-breadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li> <?= html::clean($parent->title) ?> </li>
     <? endforeach ?>
@@ -36,14 +36,14 @@
     <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>
-  <div id="gAddPhotosCanvas" style="text-align: center;">
-    <div id="gAddPhotosQueue"></div>
-    <div id="gEditPhotosQueue"></div>
+  <div id="g-add-photos-canvas" style="text-align: center;">
+    <div id="g-add-photos-queue"></div>
+    <div id="g-edit-photos-queue"></div>
   </div>
-  <span id="gChooseFilesButtonPlaceholder"></span>
+  <span id="g-choose-files-placeholder"></span>
 
   <!-- Proxy the done request back to our form, since its been ajaxified -->
-  <button class="ui-state-default ui-corner-all" onclick="$('#gAddPhotosForm').submit()">
+  <button class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit()">
     <?= t("Done") ?>
   </button>
 </div>
@@ -68,7 +68,7 @@
     button_image_url: <?= html::js_string(url::file(gallery::find_file("images", "select-photos-backg.png"))) ?>,
     button_width: "202",
     button_height: "45",
-    button_placeholder_id: "gChooseFilesButtonPlaceholder",
+    button_placeholder_id: "g-choose-files-placeholder",
     button_text: <?= json_encode('<span class="swfUploadFont">' . t("Select photos...") . '</span>') ?>,
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
@@ -91,7 +91,7 @@
   function File_Progress(file) {
     this.box = $("#" + file.id);
     if (!this.box.length) {
-      $("#gAddPhotosQueue").append(
+      $("#g-add-photos-queue").append(
         "<div class=\"box\" id=\"" + file.id + "\">" +
         "<div class=\"title\"></div>" +
         "<div class=\"status\"></div>" +
@@ -163,7 +163,7 @@
     var fp = new File_Progress(file);
     fp.title.html(file.name);
     fp.set_status("uploading", <?= t("Uploading...")->for_js() ?>);
-    $("#gAddPhotosCanvas").scrollTo(fp.box, 1000);
+    $("#g-add-photos-canvas").scrollTo(fp.box, 1000);
 
     // move file select button
     $("#SWFUpload_0").css({'left': '0', 'top': '0'});
@@ -243,6 +243,6 @@
   // This event comes from the Queue Plugin
   function queue_complete(num_files_uploaded) {
     var status_msg = <?= t("Uploaded: __COUNT__")->for_js() ?>;
-    $("#gUploadStatus").html(status_msg.replace("__COUNT__", num_files_uploaded));
+    $("#g-upload-status").html(status_msg.replace("__COUNT__", num_files_uploaded));
   }
 </script>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 021e5772..4acdb156 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gWelcomeMessage">
+<div id="g-welcome-message">
   <h1 style="display: none">
     <?= t("Welcome to Gallery 3!") ?>
   </h1>
@@ -17,12 +17,12 @@
   <p>
     <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
       title="<?= t("Edit Your Profile")->for_html_attr() ?>"
-      id="gAfterInstallChangePasswordLink"
+      id="g-after-install-change-password-link"
       class="g-button ui-state-default ui-corners-all">
       <?= t("Change Password Now") ?>
     </a>
     <script>
-      $("#gAfterInstallChangePasswordLink").gallery_dialog();
+      $("#g-after-install-change-password-link").gallery_dialog();
     </script>
   </p>
 
diff --git a/modules/gallery/views/welcome_message_loader.html.php b/modules/gallery/views/welcome_message_loader.html.php
index 2c6bffca..818e2072 100644
--- a/modules/gallery/views/welcome_message_loader.html.php
+++ b/modules/gallery/views/welcome_message_loader.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<span id="gWelcomeMessageLink"
+<span id="g-welcome-messageLink"
       title="<?= t("Welcome to Gallery 3")->for_html_attr() ?>"
       href="<?= url::site("welcome_message") ?>"/>
 <script type="text/javascript">
-  $(document).ready(function(){$("#gWelcomeMessageLink").gallery_dialog({immediate: true});});
+  $(document).ready(function(){$("#g-welcome-messageLink").gallery_dialog({immediate: true});});
 </script>
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
index d0402eb6..eb4f7aab 100644
--- a/modules/image_block/helpers/image_block_block.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -27,7 +27,7 @@ class image_block_block_Core {
     switch ($block_id) {
     case "random_image":
       $block = new Block();
-      $block->css_id = "gImageBlock";
+      $block->css_id = "g-image-block";
       $block->title = t("Random Image");
       $block->content = new View("image_block_block.html");
 
diff --git a/modules/image_block/views/image_block_block.html.php b/modules/image_block/views/image_block_block.html.php
index c51c1b4a..68d5fa89 100644
--- a/modules/image_block/views/image_block_block.html.php
+++ b/modules/image_block/views/image_block_block.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gImageBlock">
+<div class="g-image-block">
   <a href="<?= $item->url() ?>">
-   <?= $item->thumb_img(array("class" => "gThumbnail")) ?>
+   <?= $item->thumb_img(array("class" => "g-thumbnail")) ?>
   </a>
 </div>
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 3a853609..d28b02e7 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -28,7 +28,7 @@ class info_block_Core {
     case "metadata":
       if ($theme->item()) {
         $block = new Block();
-        $block->css_id = "gMetadata";
+        $block->css_id = "g-metadata";
         $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
         $block->content = new View("info_block.html");
       }
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index d8f36984..ac177ee7 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul class="gMetadata">
+<ul class="g-metadata">
   <li>
     <strong class="caption"><?= t("Title:") ?></strong>
     <?= html::purify($item->title) ?>
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index c50b04c4..06c5bc44 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -107,7 +107,7 @@ class notification_event_Core {
           ->append(Menu::factory("link")
                    ->id("watch")
                    ->label($label)
-                   ->css_id("gNotifyLink")
+                   ->css_id("g-notify-link")
                    ->url(url::site("notification/watch/$item->id?csrf=" . access::csrf_token())));
       }
     }
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index b1cef33c..fbf3c383 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,33 +2,33 @@
 /*******************************************************************
  * Dialog wide styles
  */
-#gOrganize {
+#g-organize {
   overflow: hidden;
 }
 
-#gOrganize #bd {
+#g-organize #bd {
   height: 100%;
 }
 
-#gOrganize .yui-u {
+#g-organize .yui-u {
   width: 75%;
 }
 
-#gOrganize .yui-gf .first {
+#g-organize .yui-gf .first {
   width: 25%;
 }
 
-#gMessage {
+#g-action-status {
   margin-bottom: .4em;
   width: 75%;
   white-space: nowrap;
 }
 
-#gOrganizeDetail {
+#g-organizeDetail {
   height: 100%;
 }
 
-#gMessage .gInfo {
+#g-action-status .g-info {
   font-weight: bold;
   padding-left: 2em;
 }
@@ -36,42 +36,42 @@
 /*******************************************************************
  * Album Tree styles
  */
-#gOrganizeTreeContainer {
+#g-organizeTreeContainer {
   height: 100%;
   overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#gOrganizeAlbumTree .selected {
+#g-organize-albumTree .selected {
   background-color: #cfdeff;
   border-bottom: 1px solid #999;
   margin-right: 0px;
 }
 
-#gOrganizeAlbumTree ul li {
+#g-organize-albumTree ul li {
   padding-left: 1.2em;
 }
 
-.gOrganizeAlbum span {
+.g-organize-album span {
   cursor: pointer;
 }
 
-.gOrganizeAlbumText {
+.g-organize-album-text {
   cursor: pointer;
   width: auto;
   margin: 2px 0px 1px 2px;
   display: block;
 }
 
-.gOrganizeAlbumText:hover {
+.g-organize-album-text:hover {
   background: #eee;
 }
 
 /*******************************************************************
  * Album panel styles
  */
-#gOrganizeMicroThumbPanel {
+#g-organize-microthumb-panel {
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
@@ -82,11 +82,11 @@
   overflow-y: auto;
 }
 
-#gOrganizeMicroThumbGrid {
+#g-organize-microthumb-grid {
   padding: 1em;
 }
 
-.gOrganizeMicroThumbGridCell {
+.g-organize-microthumb-grid-cell {
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
@@ -95,15 +95,15 @@
   margin: 4px;
 }
 
-.gOrganizeMicroThumb {
+.g-organize-microthumb {
   display: block;
   height: 9em;
   text-align: center;
   width: 9em;
 }
 
-.gOrganizeMicroThumbGridCell.ui-selecting,
-.gOrganizeMicroThumbGridCell.ui-selected {
+.g-organize-microthumb-grid-cell.ui-selecting,
+.g-organize-microthumb-grid-cell.ui-selected {
   margin: 2px;
   border: 2px solid #13A;
 }
@@ -115,15 +115,15 @@
   background: #13A;
 }
 
-.gThumbnail {
+.g-thumbnail {
   padding: .5em;
 }
 
-#gOrganizeMicroThumbGrid .gAlbum {
+#g-organize-microthumb-grid .g-album {
   background-color: #e8e8e8;
 }
 
-.gOrganizeMicroThumbGridCell:hover {
+.g-organize-microthumb-grid-cell:hover {
   margin: 2px;
   border: 2px solid #13A;
 }
@@ -131,18 +131,18 @@
 /****************************************************************
  * Controls styles
  */
-#gOrganizeControls {
+#g-organizeControls {
   padding-left: 8px;
   background-color: #13A;
   color: #ccc;
   width: 100% !important;
 }
 
-#gOrganizeControls select {
+#g-organizeControls select {
   display: inline;
 }
 
-#gOrganizeClose {
+#g-organizeClose {
   float: right;
   margin-right: 12px;
 }
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index d6043116..a33b2f2e 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -26,7 +26,7 @@ class organize_event_Core {
         ->append(Menu::factory("dialog")
                  ->id("organize")
                  ->label(t("Organize Album"))
-                 ->css_id("gOrganizeLink")
+                 ->css_id("g-organize-link")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
@@ -37,7 +37,7 @@ class organize_event_Core {
         ->append(Menu::factory("dialog")
                  ->id("organize")
                  ->label(t("Organize album"))
-                 ->css_id("gOrganizeLink")
+                 ->css_id("g-organize-link")
                  ->css_class("ui-icon-folder-open")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index bee42a22..960d75e2 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,11 +4,11 @@
       handle: ".ui-selected",
       distance: 10,
       cursorAt: { left: -10, top: -10},
-      appendTo: "#gOrganizeMicroThumbPanel",
+      appendTo: "#g-organize-microthumb-panel",
       helper: function(event, ui) {
         var selected = $(".ui-draggable.ui-selected img");
         if (selected.length) {
-          var set = $('<div class="gDragHelper"></div>')
+          var set = $('<div class="g-drag-helper"></div>')
 		      .css({
 			zIndex: 2000,
 			width: 80,
@@ -37,16 +37,16 @@
       },
 
       start: function(event, ui) {
-        $("#gOrganizeMicroThumbPanel .ui-selected").hide();
+        $("#g-organize-microthumb-panel .ui-selected").hide();
       },
 
       drag: function(event, ui) {
-        var top = $("#gOrganizeMicroThumbPanel").offset().top;
-        var height = $("#gOrganizeMicroThumbPanel").height();
+        var top = $("#g-organize-microthumb-panel").offset().top;
+        var height = $("#g-organize-microthumb-panel").height();
         if (ui.offset.top > height + top - 20) {
-          $("#gOrganizeMicroThumbPanel").get(0).scrollTop += 100;
+          $("#g-organize-microthumb-panel").get(0).scrollTop += 100;
         } else if (ui.offset.top < top + 20) {
-          $("#gOrganizeMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gOrganizeMicroThumbPanel").get(0).scrollTop - 100);
+          $("#g-organize-microthumb-panel").get(0).scrollTop = Math.max(0, $("#g-organize-microthumb-panel").get(0).scrollTop - 100);
         }
       }
     },
@@ -63,7 +63,7 @@
           target_id = $(".currentDropTarget").attr("ref");
         } else {
           before_or_after = "after";
-          target_id = $("#gOrganizeMicroThumbGrid li:last").attr("ref");
+          target_id = $("#g-organize-microthumb-grid li:last").attr("ref");
         }
         $.organize.do_drop({
           url: rearrange_url
@@ -79,9 +79,9 @@
       tolerance: "pointer",
       greedy: true,
       drop: function(event, ui) {
-        if ($(event.target).hasClass("gViewOnly")) {
+        if ($(event.target).hasClass("g-view-only")) {
           $(".ui-selected").show();
-          $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none");
+          $(".g-organize-microthumb-grid-cell").css("borderStyle", "none");
         } else {
           $.organize.do_drop({
             url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")),
@@ -92,7 +92,7 @@
     },
 
     do_drop: function(options) {
-      $("#gOrganizeMicroThumbPanel").selectable("destroy");
+      $("#g-organize-microthumb-panel").selectable("destroy");
       var source_ids = [];
       $(options.source).each(function(i) {
         source_ids.push($(this).attr("ref"));
@@ -110,19 +110,19 @@
 
     _refresh: function(data) {
       if (data.tree) {
-        $("#gOrganizeAlbumTree").html(data.tree);
+        $("#g-organize-albumTree").html(data.tree);
       }
       if (data.grid) {
-        $("#gOrganizeMicroThumbGrid").html(data.grid);
-        $("#gOrganizeSortColumn").attr("value", data.sort_column);
-        $("#gOrganizeSortOrder").attr("value", data.sort_order);
+        $("#g-organize-microthumb-grid").html(data.grid);
+        $("#g-organize-sort-column").attr("value", data.sort_column);
+        $("#g-organize-sort-order").attr("value", data.sort_order);
       }
       $.organize.set_handlers();
     },
 
     mouse_move_handler: function(event) {
-      if ($(".gDragHelper").length) {
-        $(".gOrganizeMicroThumbGridCell").css({borderStyle: "hidden", margin: "4px"});
+      if ($(".g-drag-helper").length) {
+        $(".g-organize-microthumb-grid-cell").css({borderStyle: "hidden", margin: "4px"});
         $(".currentDropTarget").removeClass("currentDropTarget");
         var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
           {borderLeftStyle: "solid", marginLeft: "2px"} : {borderRightStyle: "solid", marginRight: "2px"};
@@ -140,37 +140,37 @@
       $(".sf-menu li.sfHover ul").css("z-index", 68);
       $("#g-dialog").dialog("option", "zIndex", 70);
       $("#g-dialog").bind("dialogopen", function(event, ui) {
-        $("#gOrganize").height($("#g-dialog").innerHeight() - 20);
-        $("#gOrganizeMicroThumbPanel").height($("#g-dialog").innerHeight() - 90);
-        $("#gOrganizeTreeContainer").height($("#g-dialog").innerHeight() - 59);
+        $("#g-organize").height($("#g-dialog").innerHeight() - 20);
+        $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90);
+        $("#g-organizeTreeContainer").height($("#g-dialog").innerHeight() - 59);
       });
 
       $("#g-dialog").bind("dialogclose", function(event, ui) {
         window.location.reload();
       });
 
-      $("#g-dialog #gOrganizeClose").click(function(event) {
+      $("#g-dialog #g-organizeClose").click(function(event) {
         $("#g-dialog").dialog("close");
       });
 
-      $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) {
-	$.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortOrder").attr("value"));
+      $("#g-organize-sort-column,#g-organize-sort-order").change(function(event) {
+	$.organize.resort($("#g-organize-sort-column").attr("value"), $("#g-organize-sort-order").attr("value"));
       });
 
       $.organize.set_handlers();
     },
 
     set_handlers: function() {
-      $("#gOrganizeMicroThumbPanel")
-	.selectable({filter: ".gOrganizeMicroThumbGridCell"})
+      $("#g-organize-microthumb-panel")
+	.selectable({filter: ".g-organize-microthumb-grid-cell"})
 	.droppable($.organize.content_droppable);
-      $(".gOrganizeMicroThumbGridCell")
+      $(".g-organize-microthumb-grid-cell")
 	.draggable($.organize.micro_thumb_draggable)
         .mouseleave($.organize.mouse_leave_handler)
 	.mousemove($.organize.mouse_move_handler);
-      $(".gOrganizeAlbum").droppable($.organize.branch_droppable);
-      $(".gOrganizeAlbumText").click($.organize.show_album);
-      $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
+      $(".g-organize-album").droppable($.organize.branch_droppable);
+      $(".g-organize-album-text").click($.organize.show_album);
+      $("#g-organize-albumTree .ui-icon-plus,#g-organize-albumTree .ui-icon-minus").click($.organize.toggle_branch);
     },
 
     toggle_branch: function(event) {
@@ -207,20 +207,20 @@
       if ($(event.currentTarget).hasClass("selected")) {
         return;
       }
-      var parent = $(event.currentTarget).parents(".gOrganizeBranch");
-      if ($(parent).hasClass("gViewOnly")) {
+      var parent = $(event.currentTarget).parents(".g-organizeBranch");
+      if ($(parent).hasClass("g-view-only")) {
         return;
       }
-      $("#gOrganizeMicroThumbPanel").selectable("destroy");
+      $("#g-organize-microthumb-panel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
-      $("#gOrganizeAlbumTree .selected").removeClass("selected");
-      $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
-      var url = $("#gOrganizeMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+      $("#g-organize-albumTree .selected").removeClass("selected");
+      $(".g-organize-album-text[ref=" + id + "]").addClass("selected");
+      var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, {},
 	    function(data) {
-	      $("#gOrganizeMicroThumbGrid").html(data.grid);
-	      $("#gOrganizeSortColumn").attr("value", data.sort_column);
-              $("#gOrganizeSortOrder").attr("value", data.sort_order);
+	      $("#g-organize-microthumb-grid").html(data.grid);
+	      $("#g-organize-sort-column").attr("value", data.sort_column);
+              $("#g-organize-sort-order").attr("value", data.sort_order);
               $.organize.set_handlers();
 	    },
 	    "json");
@@ -231,14 +231,14 @@
      */
     resort: function(column, dir) {
       var url = sort_order_url
-        .replace("__ALBUM_ID__", $("#gOrganizeAlbumTree .selected").attr("ref"))
+        .replace("__ALBUM_ID__", $("#g-organize-albumTree .selected").attr("ref"))
         .replace("__COL__", column)
         .replace("__DIR__", dir);
       $.get(url, {},
 	    function(data) {
-	      $("#gOrganizeMicroThumbGrid").html(data.grid);
-              $("#gOrganizeSortColumn").attr("value", data.sort_column);
-              $("#gOrganizeSortOrder").attr("value", data.sort_order);
+	      $("#g-organize-microthumb-grid").html(data.grid);
+              $("#g-organize-sort-column").attr("value", data.sort_column);
+              $("#g-organize-sort-order").attr("value", data.sort_order);
 	      $.organize.set_handlers();
 	    },
 	    "json");
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 09720fe4..858c794c 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,37 +5,37 @@
   var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
   var tree_url = "<?= url::site("organize/tree/__ALBUM_ID__") ?>";
 </script>
-<div id="gOrganize" class="g-dialogPanel">
+<div id="g-organize" class="g-dialog-panel">
   <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
   <div id="bd">
     <div class="yui-gf">
       <div class="yui-u first">
         <h3><?= t("Albums") ?></h3>
       </div>
-      <div id="gMessage" class="yui-u">
-        <div class="gInfo"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
+      <div id="g-action-status" class="yui-u">
+        <div class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
       </div>
     </div>
-    <div id="gOrganizeContentPane" class="yui-gf">
-      <div id="gOrganizeTreeContainer" class="yui-u first">
-        <ul id="gOrganizeAlbumTree">
+    <div id="g-organizeContentPane" class="yui-gf">
+      <div id="g-organizeTreeContainer" class="yui-u first">
+        <ul id="g-organize-albumTree">
           <?= $album_tree ?>
         </ul>
       </div>
-      <div id="gOrganizeDetail" class="yui-u">
-        <div id="gOrganizeMicroThumbPanel"
+      <div id="g-organizeDetail" class="yui-u">
+        <div id="g-organize-microthumb-panel"
              ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
-          <ul id="gOrganizeMicroThumbGrid">
+          <ul id="g-organize-microthumb-grid">
             <?= $micro_thumb_grid ?>
           </ul>
         </div>
-        <div id="gOrganizeControls">
-          <a id="gOrganizeClose" href="#" ref="done"
+        <div id="g-organizeControls">
+          <a id="g-organizeClose" href="#" ref="done"
              class="g-button ui-corner-all ui-state-default"><?= t("Close") ?></a>
           <form>
             <?= t("Sort order") ?>
-            <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
-            <?= form::dropdown(array("id" => "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
+            <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?>
+            <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
           </form>
         </div>
       </div>
@@ -44,5 +44,5 @@
 </div>
 
 <script type="text/javascript">
-  $("#gOrganize").ready($.organize.init);
+  $("#g-organize").ready($.organize.init);
 </script>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index af7136fc..553fc493 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($album->children(25, $offset) as $child): ?>
-<li class="gOrganizeMicroThumbGridCell" ref="<?= $child->id ?>">
-  <div id="gOrganizeMicroThumb_<?= $child->id ?>"
-       class="gOrganizeMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
-    <?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
+<li class="g-organize-microthumb-grid-cell" ref="<?= $child->id ?>">
+  <div id="g-organize-microthumb_<?= $child->id ?>"
+       class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?>">
+    <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
   </div>
 </li>
 <? endforeach ?>
@@ -14,7 +14,7 @@
     $.get("<?= url::site("organize/album/$album->id/" . ($offset + 25)) ?>",
           {},
           function(data) {
-            $("#gOrganizeMicroThumbGrid").append(data.grid);
+            $("#g-organize-microthumb-grid").append(data.grid);
             $.organize.set_handlers();
           },
           "json");
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index e5d91c04..924a1bd6 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $album) ? "" : "gViewOnly" ?>"
+<li class="g-organize-album ui-icon-left <?= access::can("edit", $album) ? "" : "g-view-only" ?>"
     ref="<?= $album->id ?>">
   <span class="ui-icon ui-icon-minus">
   </span>
-  <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
+  <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
         ref="<?= $album->id ?>">
     <?= html::clean($album->title) ?>
   </span>
@@ -12,11 +12,11 @@
     <? if ($selected && $child->contains($selected)): ?>
     <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
     <? else: ?>
-    <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
+    <li class="g-organize-album ui-icon-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>"
         ref="<?= $child->id ?>">
       <span class="ui-icon ui-icon-plus">
       </span>
-      <span class="gOrganizeAlbumText" ref="<?= $child->id ?>">
+      <span class="g-organize-album-text" ref="<?= $child->id ?>">
         <?= html::clean($child->title) ?>
       </span>
     </li>
diff --git a/modules/recaptcha/helpers/recaptcha.php b/modules/recaptcha/helpers/recaptcha.php
index bead6156..789bae85 100644
--- a/modules/recaptcha/helpers/recaptcha.php
+++ b/modules/recaptcha/helpers/recaptcha.php
@@ -19,7 +19,7 @@
  */
 class recaptcha_Core {
   static function get_configure_form() {
-    $form = new Forge("admin/recaptcha", "", "post", array("id" => "gConfigureRecaptchaForm"));
+    $form = new Forge("admin/recaptcha", "", "post", array("id" => "g-configure-recaptcha-form"));
     $group = $form->group("configure_recaptcha")
       ->label(t("Configure reCAPTCHA"));
     $group->input("public_key")
diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php
index d23a0c74..feedced4 100644
--- a/modules/recaptcha/helpers/recaptcha_event.php
+++ b/modules/recaptcha/helpers/recaptcha_event.php
@@ -20,7 +20,7 @@
 class recaptcha_event_Core {
   static function comment_add_form($form) {
     if (module::get_var("recaptcha", "public_key")) {
-      $form->add_comment->recaptcha("recaptcha")->label("")->id("gRecaptcha");
+      $form->add_comment->recaptcha("recaptcha")->label("")->id("g-recaptcha");
     }
   }
 
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 0a4b1f8f..3e964801 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAdminRecaptcha">
+<div id="g-admin-recaptcha">
   <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.",
@@ -11,16 +11,16 @@
 </div>
 
 <? if ($public_key && $private_key): ?>
-<div id="gAdminRecaptchaTest" class="gBlock">
+<div id="g-admin-recaptcha-test" class="g-block">
   <h2> <?= t("reCAPTCHA Test") ?> </h2>
   <p>
     <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
   </p>
 
-  <div id="gRecaptcha"/>
+  <div id="g-recaptcha"/>
   <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
   <script type="text/javascript">
-    Recaptcha.create("<?= $public_key ?>", "gRecaptcha", {
+    Recaptcha.create("<?= $public_key ?>", "g-recaptcha", {
       callback: Recaptcha.focus_response_field,
       lang: "en",
       custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
diff --git a/modules/recaptcha/views/form_recaptcha.html.php b/modules/recaptcha/views/form_recaptcha.html.php
index 4ec04c49..f26ebdf6 100644
--- a/modules/recaptcha/views/form_recaptcha.html.php
+++ b/modules/recaptcha/views/form_recaptcha.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gRecaptcha"></div>
+<div id="g-recaptcha"></div>
 <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
 <script type="text/javascript">
   setTimeout(function() {
     Recaptcha.create(
       "<?= $public_key ?>",
-      "gRecaptcha",
+      "g-recaptcha",
       {
         theme: "white",
         custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
index 43043f5f..cfd3098d 100644
--- a/modules/rss/helpers/rss_block.php
+++ b/modules/rss/helpers/rss_block.php
@@ -36,7 +36,7 @@ class rss_block_Core {
       }
       if (!empty($feeds)) {
         $block = new Block();
-        $block->css_id = "gRss";
+        $block->css_id = "g-rss";
         $block->title = t("Available RSS Feeds");
         $block->content = new View("rss_block.html");
         $block->content->feeds = $feeds;
diff --git a/modules/rss/views/rss_block.html.php b/modules/rss/views/rss_block.html.php
index 737731b6..210c72a5 100644
--- a/modules/rss/views/rss_block.html.php
+++ b/modules/rss/views/rss_block.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="gFeeds">
+<ul id="g-feeds">
 <? foreach($feeds as $url => $title): ?>
   <li style="clear: both;">
     <span class="ui-icon-left">
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index c73eda08..20d26b61 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -57,7 +57,7 @@ class search_Core {
     list ($remaining) = search::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your search index needs to be updated.  <a href="%url" class="g-dialogLink">Fix this now</a>',
+        t('Your search index needs to be updated.  <a href="%url" class="g-dialog-link">Fix this now</a>',
           array("url" => html::mark_clean(url::site("admin/maintenance/start/search_task::update_index?csrf=__CSRF__")))),
         "search_index_out_of_date");
     }
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index f3225b4e..60ea83b7 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -24,7 +24,7 @@ class search_installer {
                  `id` int(9) NOT NULL auto_increment,
                  `item_id` int(9),
                  `dirty` boolean default 1,
-                 `data` LONGTEXT default NULL,
+                 `data` LONg-text default NULL,
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 91d9eec8..f243ed87 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // @todo Set hover on AlbumGrid list items ?>
-<form action="<?= url::site("/search") ?>" id="gSearchForm">
+<form action="<?= url::site("/search") ?>" id="g-search-form">
   <fieldset>
     <legend>
       <?= t("Search") ?>
@@ -17,17 +17,17 @@
   </fieldset>
 </form>
 
-<div id="gSearchResults">
+<div id="g-search-results">
   <h1><?= t("Search Results") ?></h1>
 
   <? if (count($items)): ?>
-  <ul id="gAlbumGrid">
+  <ul id="g-album-grid">
     <? foreach ($items as $item): ?>
-      <? $item_class = "gPhoto"; ?>
+      <? $item_class = "g-photo"; ?>
       <? if ($item->is_album()): ?>
-        <? $item_class = "gAlbum"; ?>
+        <? $item_class = "g-album"; ?>
       <? endif ?>
-   <li class="gItem <?= $item_class ?>">
+   <li class="g-item <?= $item_class ?>">
       <a href="<?= $item->url() ?>">
         <?= $item->thumb_img() ?>
         <p>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 51bb4e14..d0b93bba 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<form action="<?= url::site("search") ?>" id="gQuickSearchForm">
+<form action="<?= url::site("search") ?>" id="g-quick-search-form">
   <ul>
     <li>
-      <label for="gSearch"><?= t("Search the gallery") ?></label>
-      <input type="text" name="q" id="gSearch"/>
+      <label for="g-search"><?= t("Search the gallery") ?></label>
+      <input type="text" name="q" id="g-search"/>
     </li>
     <li>
       <input type="submit" value="<?= t("Go")->for_html_attr() ?>" />
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 38190fee..098f6f71 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   private function _get_admin_form() {
     $form = new Forge("admin/server_add/add_path", "", "post",
-                      array("id" => "gServerAddAdminForm"));
+                      array("id" => "g-server-add-adminForm"));
     $add_path = $form->group("add_path");
     $add_path->input("path")->label(t("Path"))->rules("required")
       ->error_messages("not_readable", t("This directory is not readable by the webserver"))
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
index 5440af2a..edbddf33 100644
--- a/modules/server_add/js/admin.js
+++ b/modules/server_add/js/admin.js
@@ -3,6 +3,6 @@
  *
  */
 $("document").ready(function() {
-  $("#gServerAddAdmin input:text").autocomplete(
+  $("#g-server-add-admin input:text").autocomplete(
     base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
 });
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 86bff079..a2a831c9 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -2,35 +2,35 @@
    $.widget("ui.gallery_server_add",  {
      _init: function() {
        var self = this;
-       $("#gServerAddAddButton", this.element).click(function(event) {
+       $("#g-server-add-add-button", this.element).click(function(event) {
          event.preventDefault();
-         $(".gProgressBar", this.element).
+         $(".g-progress-bar", this.element).
            progressbar().
            progressbar("value", 0);
-         $("#gServerAddProgress", this.element).slideDown("fast", function() { self.start_add(); });
+         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
        });
-       $("#gServerAddPauseButton", this.element).click(function(event) {
+       $("#g-server-add-pause-button", this.element).click(function(event) {
          self.pause = true;
-         $("#gServerAddPauseButton", this.element).hide();
-         $("#gServerAddContinueButton", this.element).show();
+         $("#g-server-add-pause-button", this.element).hide();
+         $("#g-server-add-continue-button", this.element).show();
        });
-       $("#gServerAddContinueButton", this.element).click(function(event) {
+       $("#g-server-add-continue-button", this.element).click(function(event) {
          self.pause = false;
-         $("#gServerAddPauseButton", this.element).show();
-         $("#gServerAddContinueButton", this.element).hide();
+         $("#g-server-add-pause-button", this.element).show();
+         $("#g-server-add-continue-button", this.element).hide();
          self.run_add();
        });
-       $("#gServerAddCloseButton", this.element).click(function(event) {
+       $("#g-server-addCloseButton", this.element).click(function(event) {
          $("#g-dialog").dialog("close");
          window.location.reload();
        });
-       $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) {
+       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
          self.select_file(event);
        });
-       $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) {
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
        $("#g-dialog").bind("dialogclose", function(event, ui) {
@@ -48,8 +48,8 @@
 	 paths.push($(this).attr("ref"));
        });
 
-       $("#gServerAddAddButton", this.element).hide();
-       $("#gServerAddPauseButton", this.element).show();
+       $("#g-server-add-add-button", this.element).hide();
+       $("#g-server-add-pause-button", this.element).show();
 
        $.ajax({
          url: START_URL,
@@ -58,8 +58,8 @@
          data: { "paths[]": paths },
          dataType: "json",
          success: function(data, textStatus) {
-           $("#gStatus").html(data.status);
-           $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
            self.taskURL = data.url;
            setTimeout(function() { self.run_add(); }, 25);
          }
@@ -74,13 +74,13 @@
          async: false,
          dataType: "json",
          success: function(data, textStatus) {
-           $("#gStatus").html(data.status);
-           $(".gProgressBar", self.element).progressbar("value", data.percent_complete);
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
            if (data.done) {
-	     $("#gServerAddProgress", this.element).slideUp();
-             $("#gServerAddAddButton", this.element).show();
-             $("#gServerAddPauseButton", this.element).hide();
-             $("#gServerAddContinueButton", this.element).hide();
+	     $("#g-server-add-progress", this.element).slideUp();
+             $("#g-server-add-add-button", this.element).show();
+             $("#g-server-add-pause-button", this.element).hide();
+             $("#g-server-add-continue-button", this.element).hide();
            } else {
              if (!self.pause) {
                setTimeout(function() { self.run_add(); }, 25);
@@ -99,11 +99,11 @@
        $.ajax({
          url: GET_CHILDREN_URL.replace("__PATH__", path),
          success: function(data, textStatus) {
-           $("#gServerAddTree", self.element).html(data);
-           $("#gServerAddTree span.gDirectory", self.element).dblclick(function(event) {
+           $("#g-server-add-tree", self.element).html(data);
+           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
              self.open_dir(event);
            });
-           $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) {
+           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
              self.select_file(event);
            });
          }
@@ -115,10 +115,10 @@
       */
      select_file:  function (event) {
        $(event.target).toggleClass("selected");
-       if ($("#gServerAdd span.selected").length) {
-         $("#gServerAddAddButton").enable(true).removeClass("ui-state-disabled");
+       if ($("#g-server-add span.selected").length) {
+         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
        } else {
-         $("#gServerAddAddButton").enable(false).addClass("ui-state-disabled");
+         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
        }
      }
   });
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 4fd7f257..e447ee6d 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,19 +1,19 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gServerAddAdmin">
+<div id="g-server-add-admin">
   <h2>
     <?= t("Add From Server Admininstration") ?>
   </h2>
-  <div id="gAuthorizedPath">
+  <div id="g-authorized-path">
     <h3><?= t("Authorized Paths") ?></h3>
     <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>>
-      <li class="gModuleStatus gInfo"><?= 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>
     </ul>
-    <ul id="gPathList">
+    <ul id="g-path-list">
       <? foreach ($paths as $id => $path): ?>
       <li class="ui-icon-left">
         <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
            id="icon_<?= $id?>"
-           class="gRemoveDir ui-icon ui-icon-trash">
+           class="g-remove-dir ui-icon ui-icon-trash">
           X
         </a>
         <?= html::clean($path) ?>
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 4e5bf601..91354329 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="ui-icon-left">
   <span class="ui-icon ui-icon-folder-open"></span>
-  <span class="gDirectory" ref="">
+  <span class="g-directory" ref="">
     <?= t("All") ?>
   </span>
   <ul>
@@ -9,7 +9,7 @@
     <? foreach ($parents as $dir): ?>
     <li class="ui-icon-left">
       <span class="ui-icon ui-icon-folder-open"></span>
-      <span class="gDirectory" ref="<?= html::clean_attribute($dir) ?>">
+      <span class="g-directory" ref="<?= html::clean_attribute($dir) ?>">
         <?= html::clean(basename($dir)) ?>
       </span>
       <ul>
@@ -18,7 +18,7 @@
         <? foreach ($files as $file): ?>
         <li class="ui-icon-left">
           <span class="ui-icon <?= is_dir($file) ? "ui-icon-folder-collapsed" : "ui-icon-document" ?>"></span>
-          <span class="<?= is_dir($file) ? "gDirectory" : "gFile" ?>"
+          <span class="<?= is_dir($file) ? "g-directory" : "g-file" ?>"
                 ref="<?= html::clean_attribute($file) ?>" >
             <?= html::clean(basename($file)) ?>
           </span>
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index fdb66d1c..31648a70 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -4,11 +4,11 @@
   var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
 </script>
 
-<div id="gServerAdd">
+<div id="g-server-add">
   <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => html::purify($item->title))) ?></h1>
 
-  <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
-  <ul class="gBreadcrumbs">
+  <p id="g-description"><?= t("Photos will be added to album:") ?></p>
+  <ul class="g-breadcrumbs">
     <? foreach ($item->parents() as $parent): ?>
     <li>
       <?= html::purify($parent->title) ?>
@@ -19,35 +19,35 @@
     </li>
   </ul>
 
-  <ul id="gServerAddTree" class="gCheckboxTree">
+  <ul id="g-server-add-tree" class="g-checkbox-tree">
     <?= $tree ?>
   </ul>
 
-  <div id="gServerAddProgress" style="display: none">
-    <div class="gProgressBar"></div>
-    <div id="gStatus"></div>
+  <div id="g-server-add-progress" style="display: none">
+    <div class="g-progress-bar"></div>
+    <div id="g-status"></div>
   </div>
 
   <span>
-    <button id="gServerAddAddButton" class="ui-state-default ui-state-disabled ui-corner-all"
+    <button id="g-server-add-add-button" class="ui-state-default ui-state-disabled ui-corner-all"
             disabled="disabled">
       <?= t("Add") ?>
     </button>
-    <button id="gServerAddPauseButton" class="ui-state-default ui-corner-all" style="display:none">
+    <button id="g-server-add-pause-button" class="ui-state-default ui-corner-all" style="display:none">
       <?= t("Pause") ?>
     </button>
-    <button id="gServerAddContinueButton" class="ui-state-default ui-corner-all" style="display:none">
+    <button id="g-server-add-continue-button" class="ui-state-default ui-corner-all" style="display:none">
       <?= t("Continue") ?>
     </button>
 
-    <button id="gServerAddCloseButton" class="ui-state-default ui-corner-all">
+    <button id="g-server-addCloseButton" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>
 
   <script type="text/javascript">
-    $("#gServerAdd").ready(function() {
-      $("#gServerAdd").gallery_server_add();
+    $("#g-server-add").ready(function() {
+      $("#g-server-add").gallery_server_add();
     });
   </script>
 
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index ce26b189..0afe8126 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -39,7 +39,7 @@ class slideshow_event_Core {
                     ->label(t("View slideshow"))
                     ->url("javascript:PicLensLite.start(" .
                           "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
-                    ->css_id("gSlideshowLink"));
+                    ->css_id("g-slideshow-link"));
     }
   }
 
@@ -49,7 +49,7 @@ class slideshow_event_Core {
                   ->label(t("View slideshow"))
                   ->url("javascript:PicLensLite.start(" .
                         "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
-                  ->css_id("gSlideshowLink"));
+                  ->css_id("g-slideshow-link"));
   }
 
   static function tag_menu($menu, $theme) {
@@ -58,7 +58,7 @@ class slideshow_event_Core {
                   ->label(t("View slideshow"))
                   ->url("javascript:PicLensLite.start(" .
                         "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
-                  ->css_id("gSlideshowLink"));
+                  ->css_id("g-slideshow-link"));
   }
 
   private static function _feed_url($theme) {
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index be5461a4..d4278802 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -98,7 +98,7 @@ class tag_Core {
   }
 
   static function get_add_form($item) {
-    $form = new Forge("tags", "", "post", array("id" => "gAddTagForm"));
+    $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form"));
     $label = $item->is_album() ?
       t("Add tag to album") :
       ($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie"));
@@ -111,7 +111,7 @@ class tag_Core {
   }
 
   static function get_rename_form($tag) {
-    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "gRenameTagForm"));
+    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-rename-tag-form"));
     $group = $form->group("rename_tag")->label(t("Rename Tag"));
     $group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]");
     $group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name"));
@@ -120,7 +120,7 @@ class tag_Core {
   }
 
   static function get_delete_form($tag) {
-    $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "gDeleteTagForm"));
+    $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "g-delete-tag-form"));
     $group = $form->group("delete_tag")
       ->label(t("Really delete tag %tag_name?", array("tag_name" => $tag->name)));
     $group->submit("")->value(t("Delete Tag"));
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
index bbcc5fd1..37da0b16 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_block.php
@@ -27,7 +27,7 @@ class tag_block_Core {
     switch ($block_id) {
     case "tag":
       $block = new Block();
-      $block->css_id = "gTag";
+      $block->css_id = "g-tag";
       $block->title = t("Popular Tags");
       $block->content = new View("tag_block.html");
       $block->content->cloud = tag::cloud(30);
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index bc2331c9..e2e6b782 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -3,28 +3,28 @@ $("document").ready(function() {
 });
 
 function ajaxify_tag_form() {
-  $("#gTag form").ajaxForm({
+  $("#g-tag form").ajaxForm({
     dataType: "json",
     success: function(data) {
       if (data.result == "success") {
-        $.get($("#gTagCloud").attr("title"), function(data, textStatus) {
-	  $("#gTagCloud").html(data);
+        $.get($("#g-tag-cloud").attr("title"), function(data, textStatus) {
+	  $("#g-tag-cloud").html(data);
 	});
       }
-      $("#gTag form").resetForm();
+      $("#g-tag form").resetForm();
     }
   });
 }
 
 function closeEditInPlaceForms() {
   // closes currently open inplace edit forms
-  if ($("#gRenameTagForm").length) {
-    $("#gEditErrorMessage").remove();
-    var li = $("#gRenameTagForm").parent();
-    $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
+  if ($("#g-rename-tag-form").length) {
+    $("#g-edit-error-message").remove();
+    var li = $("#g-rename-tag-form").parent();
+    $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert"));
     li.height("");
-    $(".gEditable", li).bind("click", editInPlace);
-    $(".g-dialogLink", li).gallery_dialog();
+    $(".g-editable", li).bind("click", editInPlace);
+    $(".g-dialog-link", li).gallery_dialog();
   }
 }
 
@@ -41,7 +41,7 @@ function editInPlace(element) {
   var tag_name = $(this).html();
   var tag_width = $(this).width();
   $(this).parent().data("revert", $(this).parent().html());
-  var form = '<form id="gRenameTagForm" method="post" class="ui-helper-clearfix" ';
+  var form = '<form id="g-rename-tag-form" method="post" class="ui-helper-clearfix" ';
   form += 'action="' + TAG_RENAME_URL.replace('__ID__', tag_id) + '">';
   form += '<input name="csrf" type="hidden" value="' + csrf_token + '" />';
   form += '<input id="name" name="name" type="text" class="textbox" value="' +
@@ -52,26 +52,26 @@ function editInPlace(element) {
 
   // add edit form
   $(this).parent().html(form);
-  $("#gRenameTagForm #name")
+  $("#g-rename-tag-form #name")
     .width(tag_width+30)
     .focus();
-  //$("#gRenameTagForm").parent().height( $("#gRenameTagForm").height() );
-  $("#gRenameTagForm a").bind("click", closeEditInPlaceForms);
+  //$("#g-rename-tag-form").parent().height( $("#g-rename-tag-form").height() );
+  $("#g-rename-tag-form a").bind("click", closeEditInPlaceForms);
 
   ajaxify_editInPlaceForm = function() {
-    $("#gRenameTagForm").ajaxForm({
+    $("#g-rename-tag-form").ajaxForm({
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
           closeEditInPlaceForms(); // close form
-          $("#gTag-" + data.tag_id).text(data.new_tagname); // update tagname
+          $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname
           console.log(data);
           window.location.reload();
         } else if (data.result == "error") {
-          $("#gRenameTagForm #name")
-            .addClass("gError")
+          $("#g-rename-tag-form #name")
+            .addClass("g-error")
             .focus();
-          $("#gTagAdmin").before("<p id=\"gEditErrorMessage\" class=\"gError\">" + data.message + "</p>");
+          $("#g-tag-admin").before("<p id=\"g-edit-error-message\" class=\"g-error\">" + data.message + "</p>");
         }
       }
     });
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index a4bd5d8f..27813a91 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -3,18 +3,18 @@
   var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>;
   $("document").ready(function() {
     // using JS for adding link titles to avoid running t() for each tag
-    $("#gTagAdmin .tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
-    $("#gTagAdmin .delete-link").attr("title", $(".delete-link:first span").html());
+    $("#g-tag-admin .tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
+    $("#g-tag-admin .delete-link").attr("title", $(".delete-link:first span").html());
 
     // In-place editing for tag admin
-    $(".gEditable").bind("click", editInPlace);
+    $(".g-editable").bind("click", editInPlace);
   });
   // make some values available within tag.js
   var csrf_token = "<?= $csrf ?>";
   var save_i18n = <?= html::js_string(t("save")->for_html_attr()) ?>;
   var cancel_i18n = <?= html::js_string(t("cancel")->for_html_attr()) ?>;
 </script>
-<div class="gBlock">
+<div class="g-block">
   <h2>
     <?= t("Tag Admin") ?>
   </h2>
@@ -22,7 +22,7 @@
   <? $tags_per_column = $tags->count()/5 ?>
   <? $column_tag_count = 0 ?>
 
-  <table id="gTagAdmin" class="gBlockContent">
+  <table id="g-tag-admin" class="g-block-content">
     <caption class="g-understate">
       <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
     </caption>
@@ -47,10 +47,10 @@
           <? endif ?>
 
           <li>
-            <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
+            <span id="g-tag-<?= $tag->id ?>" class="g-editable tag-name"><?= html::clean($tag->name) ?></span>
             <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="g-dialogLink delete-link g-button">
+               class="g-dialog-link delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 59a4ef88..8c79b74a 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script>
-  $("#gAddTagForm").ready(function() {
-    var url = $("#gTagCloud").attr("title") + "/autocomplete";
-    $("#gAddTagForm input:text").autocomplete(
+<script language="text/javascript">
+  $("#g-add-tag-form").ready(function() {
+    var url = $("#g-tag-cloud").attr("title") + "/autocomplete";
+    $("#g-add-tag-form input:text").autocomplete(
       url, {
         max: 30,
         multiple: true,
@@ -11,7 +11,7 @@
     );
   });
 </script>
-<div id="gTagCloud" title="<?= url::site("tags") ?>">
+<div id="g-tag-cloud" title="<?= url::site("tags") ?>">
   <?= $cloud ?>
 </div>
 <?= $form ?>
\ No newline at end of file
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 92608dcd..4629bbf2 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -85,9 +85,9 @@ class Password_Controller extends Controller {
   }
 
   private function _reset_form() {
-    $form = new Forge(url::current(true), "", "post", array("id" => "gResetForm"));
+    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
     $group = $form->group("reset")->label(t("Reset Password"));
-    $group->input("name")->label(t("Username"))->id("gName")->class(null)->rules("required");
+    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
     $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
     $group->submit("")->value(t("Reset"));
 
@@ -97,15 +97,15 @@ class Password_Controller extends Controller {
   private function _new_password_form($hash=null) {
     $template = new Theme_View("page.html", "reset");
 
-    $form = new Forge("password/do_reset", "", "post", array("id" => "gChangePasswordForm"));
+    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
     $group = $form->group("reset")->label(t("Change Password"));
     $hidden = $group->hidden("hash");
     if (!empty($hash)) {
       $hidden->value($hash);
     }
-    $group->password("password")->label(t("Password"))->id("gPassword")
+    $group->password("password")->label(t("Password"))->id("g-password")
       ->rules("required|length[1,40]");
-    $group->password("password2")->label(t("Confirm Password"))->id("gPassword2")
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
     $group->inputs["password2"]->error_messages(
       "mistyped", t("The password and the confirm password must match"));
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index e0dfac8e..b13895bc 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -74,9 +74,9 @@ class group_Core {
   }
 
   static function get_edit_form_admin($group) {
-    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "gEditGroupForm"));
+    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
     $form_group = $form->group("edit_group")->label(t("Edit Group"));
-    $form_group->input("name")->label(t("Name"))->id("gName")->value($group->name);
+    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Save"));
@@ -85,10 +85,10 @@ class group_Core {
   }
 
   static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm"));
+    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
     $form->set_attr('class', "g-narrow");
     $form_group = $form->group("add_group")->label(t("Add Group"));
-    $form_group->input("name")->label(t("Name"))->id("gName");
+    $form_group->input("name")->label(t("Name"))->id("g-name");
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Add Group"));
@@ -99,7 +99,7 @@ class group_Core {
 
   static function get_delete_form_admin($group) {
     $form = new Forge("admin/users/delete_group/$group->id", "", "post",
-                      array("id" => "gDeleteGroupForm"));
+                      array("id" => "g-delete-group-form"));
     $form_group = $form->group("delete_group")->label(
       t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
     $form_group->submit("")->value(t("Delete"));
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 93c385a3..6ae9203d 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -25,16 +25,16 @@
  */
 class user_Core {
   static function get_edit_form($user) {
-    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gEditUserForm"));
+    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "g-edit-user-form"));
     $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
-    $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("gPassword");
-    $group->password("password2")->label(t("Confirm Password"))->id("gPassword2")
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $form->add_rules_from($user);
 
     module::event("user_edit_form", $user, $form);
@@ -44,19 +44,19 @@ class user_Core {
 
   static function get_edit_form_admin($user) {
     $form = new Forge(
-      "admin/users/edit_user/$user->id", "", "post", array("id" => "gEditUserForm"));
+      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $group = $form->group("edit_user")->label(t("Edit User"));
-    $group->input("name")->label(t("Username"))->id("gUsername")->value($user->name);
+    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
     $group->inputs["name"]->error_messages(
       "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("gFullName")->value($user->full_name);
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("gPassword");
-    $group->password("password2")->label(t("Confirm Password"))->id("gPassword2")
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("gEmail")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url);
-    $group->checkbox("admin")->label(t("Admin"))->id("gAdmin")->checked($user->admin);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
     $form->add_rules_from($user);
     $form->edit_user->password->rules("-required");
 
@@ -66,19 +66,19 @@ class user_Core {
   }
 
   static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_user", "", "post", array("id" => "gAddUserForm"));
+    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
     $form->set_attr('class', "g-narrow");
     $group = $form->group("add_user")->label(t("Add User"));
-    $group->input("name")->label(t("Username"))->id("gUsername")
+    $group->input("name")->label(t("Username"))->id("g-username")
       ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("gFullName");
-    $group->password("password")->label(t("Password"))->id("gPassword");
-    $group->password("password2")->label(t("Confirm Password"))->id("gPassword2")
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("gEmail");
-    $group->input("url")->label(t("URL"))->id("gUrl");
+    $group->input("email")->label(t("Email"))->id("g-email");
+    $group->input("url")->label(t("URL"))->id("g-url");
     self::_add_locale_dropdown($group);
-    $group->checkbox("admin")->label(t("Admin"))->id("gAdmin");
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
     $user = ORM::factory("user");
     $form->add_rules_from($user);
 
@@ -105,7 +105,7 @@ class user_Core {
 
   static function get_delete_form_admin($user) {
     $form = new Forge("admin/users/delete_user/$user->id", "", "post",
-                      array("id" => "gDeleteUserForm"));
+                      array("id" => "g-delete-user-form"));
     $group = $form->group("delete_user")->label(
       t("Are you sure you want to delete user %name?", array("name" => $user->name)));
     $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
@@ -113,11 +113,11 @@ class user_Core {
   }
 
   static function get_login_form($url) {
-    $form = new Forge($url, "", "post", array("id" => "gLoginForm"));
+    $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("gUsername")->class(null);
-    $group->password("password")->label(t("Password"))->id("gPassword")->class(null);
+    $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;
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
index e7671f06..f1f8e5eb 100644
--- a/modules/user/helpers/user_block.php
+++ b/modules/user/helpers/user_block.php
@@ -32,7 +32,7 @@ class user_block_Core {
       }
       if (count($locales) > 1) {
         $block = new Block();
-        $block->css_id = "gUserLanguageBlock";
+        $block->css_id = "g-userLanguageBlock";
         $block->title = t("Language Preference");
         $block->content = new View("user_languages_block.html");
         $block->content->installed_locales =
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 46bdb65e..28daff29 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -2,12 +2,12 @@
 <script type="text/javascript">
   var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
   $(document).ready(function(){
-    $("#gUserAdminList .core-info").draggable({
+    $("#g-user-admin-list .core-info").draggable({
       helper: "clone"
     });
-    $("#gGroupAdmin .gGroup").droppable({
+    $("#g-group-admin .g-group").droppable({
       accept: ".core-info",
-      hoverClass: "gSelected",
+      hoverClass: "g-selected",
       drop: function(ev, ui) {
         var user_id = $(ui.draggable).attr("id").replace("user-", "");
         var group_id = $(this).attr("id").replace("group-", "");
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialogLink").gallery_dialog();
+            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
           });
   }
 
@@ -41,9 +41,9 @@
           });
   }
 </script>
-<div class="gBlock">
+<div class="g-block">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
@@ -53,8 +53,8 @@
     <?= t("User Admin") ?>
   </h2>
 
-  <div class="gBlockContent">
-    <table id="gUserAdminList">
+  <div class="g-block-content">
+    <table id="g-user-admin-list">
       <tr>
         <th><?= t("Username") ?></th>
         <th><?= t("Full name") ?></th>
@@ -64,8 +64,8 @@
       </tr>
 
       <? foreach ($users as $i => $user): ?>
-      <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("g-odd-row", "g-even-row") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info gDraggable">
+      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
                alt="<?= html::clean_attribute($user->name) ?>"
@@ -82,14 +82,14 @@
         <td>
           <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
         </td>
-        <td class="gActions">
+        <td class="g-actions">
           <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
               open_text="<?= t("close") ?>"
-              class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
+              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>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
           <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="g-dialogLink g-button ui-state-default ui-corner-all ui-icon-left">
+              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>
           <? else: ?>
           <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
@@ -103,9 +103,9 @@
   </div>
 </div>
 
-<div id="gGroupAdmin" class="gBlock">
+<div id="g-group-admin" class="g-block">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialogLink g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
@@ -115,10 +115,10 @@
     <?= t("Group Admin") ?>
   </h2>
 
-  <div class="gBlockContent">
+  <div class="g-block-content">
     <ul>
       <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="gGroup <?= ($group->special ? "gDefaultGroup" : "") ?>" />
+      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
         <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
         <?= $v ?>
       </li>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index e5c9fcee..db3645a0 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
   <? if (!$group->special): ?>
   <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-dialogLink g-button ui-state-default ui-corner-all">
+    class="g-dialog-link g-button ui-state-default ui-corner-all">
     <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-dialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
+     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>
   <? endif ?>
 </h4>
@@ -16,7 +16,7 @@
 <? if ($group->users->count() > 0): ?>
 <ul>
   <? foreach ($group->users as $i => $user): ?>
-  <li class="gUser">
+  <li class="g-user">
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index c814bbfa..65eaab8c 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,22 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="gLoginMenu">
+<ul id="g-login-menu">
   <? if ($user->guest): ?>
   <li class="first">
     <a href="<?= url::site("login/ajax") ?>"
        title="<?= t("Login to Gallery")->for_html_attr() ?>"
-       id="gLoginLink"><?= t("Login") ?></a>
+       id="g-login-link"><?= t("Login") ?></a>
   </li>
   <? else: ?>
   <li class="first">
     <?= 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() .
-      '" id="gUserProfileLink" class="g-dialogLink">' .
+      '" id="g-user-profile-link" class="g-dialog-link">' .
       html::clean($user->display_name()) . '</a>'))) ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
-       id="gLogoutLink"><?= t("Logout") ?></a>
+       id="g-logoutLink"><?= t("Logout") ?></a>
   </li>
   <? endif ?>
 </ul>
diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
index b5ae674c..89185967 100644
--- a/modules/user/views/user_languages_block.html.php
+++ b/modules/user/views/user_languages_block.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= form::dropdown("gSelectSessionLocale", $installed_locales, $selected) ?>
+<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
 <script type="text/javascript">
-  $("#gSelectSessionLocale").change(function() {
+  $("#g-select-session-locale").change(function() {
     var old_locale_preference = <?= html::js_string($selected) ?>;
     var locale = $(this).val();
     if (old_locale_preference == locale) {
diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 170ee64c..60d5cb5d 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -23,7 +23,7 @@ class watermark_Core {
       $range[$i] = "$i%";
     }
 
-    $form = new Forge("admin/watermarks/add", "", "post", array("id" => "gAddWatermarkForm"));
+    $form = new Forge("admin/watermarks/add", "", "post", array("id" => "g-add-watermark-form"));
     $group = $form->group("add_watermark")->label(t("Upload Watermark"));
     $group->upload("file")->label(t("Watermark"))->rules("allow[jpg,png,gif]|size[1MB]|required");
     $group->dropdown("position")->label(t("Watermark Position"))
@@ -41,7 +41,7 @@ class watermark_Core {
       $range[$i] = "$i%";
     }
 
-    $form = new Forge("admin/watermarks/edit", "", "post", array("id" => "gEditWatermarkForm"));
+    $form = new Forge("admin/watermarks/edit", "", "post", array("id" => "g-edit-watermark-form"));
     $group = $form->group("edit_watermark")->label(t("Edit Watermark"));
     $group->dropdown("position")->label(t("Watermark Position"))
       ->options(self::positions())
@@ -54,7 +54,7 @@ class watermark_Core {
   }
 
   static function get_delete_form() {
-    $form = new Forge("admin/watermarks/delete", "", "post", array("id" => "gDeleteWatermarkForm"));
+    $form = new Forge("admin/watermarks/delete", "", "post", array("id" => "g-delete-watermark-form"));
     $group = $form->group("delete_watermark")->label(t("Really delete Watermark?"));
     $group->submit("")->value(t("Delete"));
     return $form;
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 285f6407..d034066a 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="#gWatermarks">
+<div id="#g-watermarks">
   <h1> <?= t("Watermarks") ?> </h1>
   <p>
     <?= t("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
@@ -8,7 +8,7 @@
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
      title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="g-dialogLink 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>
+     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>
   <p>
@@ -27,10 +27,10 @@
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
          title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+         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() ?>"
-         class="g-dialogLink g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+         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>
   <? endif ?>
diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css
index 6bc2334c..708ac782 100644
--- a/themes/admin_wind/css/fix-ie.css
+++ b/themes/admin_wind/css/fix-ie.css
@@ -2,17 +2,17 @@
  * Fix display in IE 6 and 7
  */
 
-#gHeader,
-#gGroupAdmin,
-#gDeveloperTools,
-.gAvailable .gBlock {
+#g-header,
+#g-group-admin,
+#g-developer-tools,
+.g-available .g-block {
   zoom: 1;
 }
 
-.gUnavailable {
+.g-unavailable {
   filter: alpha(opacity=40);
 }
 
-.gUnavailable:hover {
+.g-unavailable:hover {
   filter: alpha(opacity=100);
 }
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 61161967..f23472b8 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -39,11 +39,11 @@ h1 {
   font-size: 1.7em;
 }
 
-#gSearchResults h1 {
+#g-search-results h1 {
   margin-bottom: 1em;
 }
 
-#gProgress h1 {
+#g-progress h1 {
   font-size: 1.1em;
 }
 
@@ -51,11 +51,11 @@ h2 {
   font-size: 1.4em;
 }
 
-#gSidebar .gBlock h2 {
+#g-sidebar .g-block h2 {
   font-size: 1.2em;
 }
 
-#gSidebar .gBlock li {
+#g-sidebar .g-block li {
   margin-bottom: .6em;
 }
 
@@ -66,7 +66,7 @@ h3 {
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 a,
-.gMenu a,
+.g-menu a,
 #g-dialog a,
 .g-button,
 .g-button:hover,
@@ -84,7 +84,7 @@ a:hover,
   text-decoration: underline;
 }
 
-.gMenu a:hover {
+.g-menu a:hover {
   text-decoration: none;
 }
 
@@ -94,7 +94,7 @@ table {
   width: 100%;
 }
 
-#gContent table {
+#g-content table {
   margin: 1em 0 3em 0;
 }
 
@@ -111,7 +111,7 @@ td {
   vertical-align: top;
 }
 
-#gAdminMaintenance td {
+#g-admin-maintenance td {
   vertical-align: middle;
 }
 
@@ -122,9 +122,9 @@ fieldset {
   padding-bottom: .8em;
 }
 
-#gHeader fieldset,
-#gSidebar fieldset,
-.gShortForm fieldset {
+#g-header fieldset,
+#g-sidebar fieldset,
+.g-short-form fieldset {
   border: none;
 }
 
@@ -133,11 +133,11 @@ legend {
   margin-left: 1em;
 }
 
-#gHeader legend,
-#gSidebar legend,
-#gContent #gSearchForm legend,
+#g-header legend,
+#g-sidebar legend,
+#g-content #g-search-form legend,
 input[type="hidden"],
-.gShortForm label {
+.g-short-form label {
   display: none;
 }
 
@@ -203,23 +203,18 @@ input[type="reset"] {
 
 /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.gValidationRule {
-  font-size: 80%;
-  margin-top: .5em;
-}
-
-form.gError input[type="text"],
-li.gError input[type="text"],
-form.gError input[type="password"],
-li.gError input[type="password"],
-form.gError input[type="checkbox"],
-li.gError input[type="checkbox"],
-form.gError input[type="radio"],
-li.gError input[type="radio"],
-form.gError textarea,
-li.gError textarea,
-form.gError select,
-li.gError select {
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
   border: 2px solid red;
 }
 
@@ -227,7 +222,7 @@ li.gError select {
  * 3) Reusable content blocks
  *********************************************************************/
 
-.gBlock {
+.g-block {
   background-color: #fff;
   border: 1px solid #ccc;
   clear: both;
@@ -235,138 +230,138 @@ li.gError select {
   padding: 1em;
 }
 
-#gSidebar .gBlockContent {
+#g-sidebar .g-block-content {
   padding: 0;
 }
 
-.gBlock h2 {
+.g-block h2 {
   background-color: #e8e8e8;
   padding: .3em .8em;
 }
 
-.gBlockContent {
+.g-block-content {
   margin-top: 1em;
 }
 
-.gSelected img,
-.gAvailable .gBlock img {
+.g-selected img,
+.g-available .g-block img {
   float: left;
   margin: 0 1em 1em 0;
 }
 
-.rtl .gSelected img,
-.rtl .gAvailable .gBlock img {
+.rtl .g-selected img,
+.rtl .g-available .g-block img {
   float: right;
 }
 
-.gSelected {
+.g-selected {
   background: #e8e8e8;
 }
 
-.gAvailable .gInstalledToolkit:hover {
+.g-available .g-installed-toolkit:hover {
   cursor: pointer;
   background: #eee;
 }
 
-.gAvailable .g-button {
+.g-available .g-button {
   width: 96%;
 }
 
-.gSelected .g-button {
+.g-selected .g-button {
   display: none;
 }
 
-.gUnavailable {
+.g-unavailable {
   border-color: #999;
   opacity: 0.4;
 }
 
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gMessage {
+#g-action-status {
   width: 100%;
 }
 
-#gSiteStatus li,
-#gMessage li,
-.gModuleStatus {
+#g-site-status li,
+#g-action-status li,
+.g-module-status {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
 
-#gSiteStatus li {
+#g-site-status li {
   margin-bottom: 0;
   border: none;
   border-bottom: 1px solid #ccc;
 }
 
-.gModuleStatus {
+.g-module-status {
   clear: both;
   margin-bottom: 1em;
 }
 
-.gError,
-.gInfo,
-.gSuccess,
-.gWarning {
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
   padding: .4em .5em .4em 30px;
 }
 
-.gError, tr.gError td.gError {
+.g-error, tr.g-error td.g-error {
   background: #f6cbca url('../../../lib/images/ico-error.png') no-repeat .4em 50%;
 }
 
-.gInfo {
+.g-info {
   background: #e8e8e8 url('../../../lib/images/ico-info.png') no-repeat .4em 50%;
 }
 
-.gSuccess {
+.g-success {
   background: #d9efc2  url('../../../lib/images/ico-success.png') no-repeat .4em 50%;
 }
 
-.gWarning, tr.gWarning td.gWarning {
+.g-warning, tr.g-warning td.g-warning {
   background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%;
 }
 
-.gPager .gInfo,
-tr.gError,
-tr.gInfo,
-tr.gSuccess,
-tr.gWarning {
+.g-pager .g-info,
+tr.g-error,
+tr.g-info,
+tr.g-success,
+tr.g-warning {
   background: none;
 }
 
-.gInfo td.gInfo {
+.g-info td.g-info {
   background-color: transparent;
 }
 
-.gSuccess td.gSuccess {
+.g-success td.g-success {
   background-color: transparent;
 }
 
-.gError td {
+.g-error td {
   background-color: #f6cbca;
 }
 
-.gWarning td {
+.g-warning td {
   background-color: #fcf9ce;
 }
 
-.gModuleStatus.gInfo,
-#gLogEntries .gInfo,
-.gModuleStatus.gSuccess,
-#gLogEntries .gSuccess {
+.g-module-status.g-info,
+#g-log-entries .g-info,
+.g-module-status.g-success,
+#g-log-entries .g-success {
   background-color: #fff;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
 
-.gShortForm li {
+.g-short-form li {
   float: left;
   padding: .4em 0;
 }
 
-.gShortForm input[type="text"] {
+.g-short-form input[type="text"] {
   color: #666;
   padding: .3em .6em;
   width: 11em;
@@ -378,7 +373,7 @@ tr.gWarning {
 
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.gView {
+.g-view {
   background-color: #fff;
   border: 1px solid #ccc;
   border-bottom: none;
@@ -387,7 +382,7 @@ tr.gWarning {
 
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader {
+#g-header {
   background-color: #e8e8e8;
   border-bottom: 1px solid #ccc;
   font-size: .8em;
@@ -396,20 +391,20 @@ tr.gWarning {
   position: relative;
 }
 
-#gContent {
+#g-content {
   font-size: 1.1em;
   padding-left: 20px;
   width: 96%;
 }
 
-#gSidebar {
+#g-sidebar {
   background-color: #fff;
   font-size: .9em;
   padding: 0 20px;
   width: 220px;
 }
 
-#gFooter {
+#g-footer {
   background-color: #e8e8e8;
   border-top: 1px solid #ccc;
   font-size: .8em;
@@ -423,7 +418,7 @@ tr.gWarning {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLogo {
+#g-header #g-logo {
   background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
   color: #A5A5A5 !important;
   display: block;
@@ -432,63 +427,63 @@ tr.gWarning {
   width: 105px;
 }
 
-#gHeader #gLogo:hover {
+#g-header #g-logo:hover {
   color: #f60 !important;
   text-decoration: none;
 }
 
-#gHeader #gQuickSearchForm {
+#g-header #g-quick-search-form {
   clear: right;
   float: right;
   margin: 1em 0;
 }
 
-#gHeader #gQuickSearchForm input[type='text'] {
+#g-header #g-quick-search-form input[type='text'] {
   width: 17em;
 }
 
-#gContent .gBlock h2 {
+#g-content .g-block h2 {
   background-color: transparent;
   padding-left: 0;
 }
 
-#gSidebar .gBlockContent {
+#g-sidebar .g-block-content {
   padding-left: 1em;
 }
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLoginMenu li,
-#gFooter #gCredits li {
+#g-header #g-login-menu li,
+#g-footer #g-credits li {
   display: inline;
 }
 
-#gHeader #gLoginMenu li {
+#g-header #g-login-menu li {
   padding-left: 1.2em;
 }
 
-#gFooter #gCredits li {
+#g-footer #g-credits li {
   padding-right: 1.2em;
 }
 
-#gContent #gSearchResults {
+#g-content #g-search-results {
   margin-top: 1em;
   padding-top: 1em;
 }
 
-.gBlock .ui-dialog-titlebar {
+.g-block .ui-dialog-titlebar {
   margin: -1em -1em 0;
 }
 
-#gSidebar .gBlock h2 {
+#g-sidebar .g-block h2 {
   background: none;
 }
 
-#gPhotoStream {
+#g-photo-stream {
   background-color: #e8e8e8;
 }
 
-#gPhotoStream .gBlockContent ul {
+#g-photo-stream .g-block-content ul {
   border-right: 1px solid #e8e8e8;
   height: 135px;
   overflow: auto;
@@ -497,7 +492,7 @@ tr.gWarning {
   overflow-y: hidden; /* Hide vertical*/
 }
 
-#gContent #gPhotoStream .gItem {
+#g-content #g-photo-stream .g-item {
   background-color: #fff;
   border: 1px solid #e8e8e8;
   border-right-color: #ccc;
@@ -509,15 +504,15 @@ tr.gWarning {
   width: 90px;
 }
 
-.rtl #gContent #gPhotoStream .gItem {
+.rtl #g-content #g-photo-stream .g-item {
   float: right;
 }
 
-#gSiteStatus {
+#g-site-status {
   margin-bottom: 0;
 }
 
-#gContent .gItem {
+#g-content .g-item {
   background-color: #fff;
   border: 1px solid #e8e8e8;
   border-right-color: #ccc;
@@ -528,65 +523,65 @@ tr.gWarning {
   width: 90px;
 }
 
-#gAdminCommentsMenu {
+#g-admin-comments-menu {
   margin: 1em 0;
 }
 
-#gAdminCommentsMenu a {
+#g-admin-comments-menu a {
   margin: 0;
   padding: .2em .6em;
 }
 
-#gAdminGraphics .gAvailable .gBlock {
+#g-admin-graphics .g-available .g-block {
   clear: none;
   float: left;
   margin-right: 1em;
   width: 30%;
 }
 
-.rtl #gAdminGraphics .gAvailable .gBlock {
+.rtl #g-admin-graphics .g-available .g-block {
   float: right;
   margin-left: 1em;
   margin-right: 0em;
 }
 
-#gSiteTheme,
-#gAdminTheme {
+#g-site-theme,
+#g-admin-theme {
   float: left;
   width: 48%;
 }
 
-.rtl #gSiteTheme,
-.rtl #gAdminTheme {
+.rtl #g-site-theme,
+.rtl #g-admin-theme {
   float: right;
 }
 
-#gSiteTheme {
+#g-site-theme {
   margin-right: 1em;
 }
 
-#gUserAdminList {
+#g-user-admin-list {
   margin-bottom: 1em;
 }
-#gUserAdminList td {
+#g-user-admin-list td {
   vertical-align: bottom;
 }
 
-#gUserAdminList .gDraggable:hover {
+#g-user-admin-list .g-draggable:hover {
   border: 1px dashed black;
 }
 
-#gUserAdminList .admin {
+#g-user-admin-list .admin {
   color: #55f;
   font-weight: bold;
 }
 
-.gActions a,
-.gActions span {
+.g-actions a,
+.g-actions span {
   margin-right: 3em;
 }
 
-li.gGroup {
+li.g-group {
   float: left;
   display: block;
   width: 200px;
@@ -595,65 +590,65 @@ li.gGroup {
   margin: 0 1em 1em 0;
 }
 
-.rtl li.gGroup {
+.rtl li.g-group {
   float: right;
 }
 
-li.gGroup h4 {
+li.g-group h4 {
   background-color: #eee;
   border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
-li.gGroup .g-button {
+li.g-group .g-button {
   padding: 0;
 }
-li.gGroup ul, li.gGroup div {
+li.g-group ul, li.g-group div {
   height: 180px;
   margin: 1px;
   overflow: auto;
   padding-top: .2em;
 }
-li.gGroup div p {
+li.g-group div p {
   color: gray;
   text-align: center;
   padding: 2em .5em 0 .5em
 }
-li.gGroup .gUser {
+li.g-group .g-user {
   padding: .2em 0 0 .5em;
 }
-li.gGroup .gUser .g-button {
+li.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.gDefaultGroup h4, li.gDefaultGroup .gUser {
+li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
-#gAdminAdvancedSettings tr.setting:hover {
+#g-admin-advanced-settings tr.setting:hover {
   background: #ffc;
 }
 
 /* admin/sidebar  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-.gAdminBlocksList {
+.g-admin-blocks-list {
   float: left;
   height: 300px;
   margin-left: 20px;
   width: 30%;
 }
 
-.gAdminBlocksList div:last-child {
+.g-admin-blocks-list div:last-child {
   border: .1em solid;
   height: 100%;
   overflow-y: auto;
 }
 
-.gAdminBlocksList ul {
+.g-admin-blocks-list ul {
   height: 98%;
   margin: .1em .1em;
   padding: .1em;
 }
 
-.gAdminBlocksList ul li {
+.g-admin-blocks-list ul li {
   background-color: #e8e8e8;
   font-size: 1em;
   font-weight: bold;
@@ -666,27 +661,27 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
  * 5) Navigation and menus
  *********************************************************************/
 
-#gSiteAdminMenu,
-#gTagCloud ul {
+#g-site-admin-menu,
+#g-tag-cloud ul {
   font-size: 1.2em;
 }
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLoginMenu {
+#g-header #g-login-menu {
   color: #999;
   float: right;
   margin: 0;
   padding: 5px 0;
 }
 
-.rtl #gHeader #gLoginMenu {
+.rtl #g-header #g-login-menu {
   text-align: left;
 }
 
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gSiteAdminMenu {
+#g-site-admin-menu {
   bottom: 0;
 	display: none;
   font-size: 1.2em;
@@ -694,44 +689,24 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   position: absolute;
 }
 
-#gSiteAdminMenu ul {
+#g-site-admin-menu ul {
   margin-bottom: 0;
 }
 
-/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gPager {
-  clear: both;
-  margin: 0;
-  padding: 5px 0 !important;
-  width: 100%;
-}
-
-.gPager li {
-  float: left;
-  margin: 0;
-  width: 30%;
-}
-
-.gPager .gInfo {
-  text-align: center;
-  width: 40%;
-}
-
 /** *******************************************************************
  * 6) Browser hacks
  *********************************************************************/
 
-#gSiteAdminMenu:after,
-#gHeader:after,
-#gAdminCommentsMenu:after,
-#gGroupAdmin:after,
-.gSelected:after,
-.gAvailable .gBlock:after,
-#gModuleCreateForm ul li ul:after,
-#gDeveloperTools:after,
-#gPhotoStream:after,
-#gViewMenu:after {
+#g-site-admin-menu:after,
+#g-header:after,
+#g-admin-comments-menu:after,
+#g-group-admin:after,
+.g-selected:after,
+.g-available .g-block:after,
+#g-module-create-form ul li ul:after,
+#g-developer-tools:after,
+#g-photo-stream:after,
+#g-view-menu:after {
   clear: both;
   content: ".";
   display: block;
@@ -755,26 +730,22 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
 
-.gLoadingLarge {
-  background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
-  font-size: 0;
-}
-
-.g-dialogLoadingLarge {
+.g-loading-large,
+.g-dialog-loading-large {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
 
-.gLoadingSmall {
+.g-loading-small {
   background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
   font-size: 0;
 }
 
-.gDraggable {
+.g-draggable {
   cursor: move;
 }
 
-.gDropTarget {
+.g-drop-target {
   background-color: #cfdeff;
   border: 1px dotted #999;
   height: 100px;
@@ -783,16 +754,16 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gPanel {
+#g-panel {
   display: none;
   padding: 1em;
 }
 
-#gPanel legend {
+#g-panel legend {
   display: none;
 }
 
-#gPanel fieldset {
+#g-panel fieldset {
   border: none;
 }
 
@@ -800,12 +771,12 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   cursor: move;
 }
 
-.gButtonSetVertical a {
+.g-buttonset-vertical a {
   width: 8em !important;
 }
 
-#gAdminDashboard .ui-dialog-titlebar,
-#gAdminDashboardSidebar .ui-dialog-titlebar {
+#g-admin-dashboard .ui-dialog-titlebar,
+#g-admin-dashboard-sidebar .ui-dialog-titlebar {
   padding: .2em .4em;
 }
 
@@ -816,15 +787,15 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonSet {
+.g-buttonset {
   padding-left: 1px;
 }
 
-.gButtonSet li {
+.g-buttonset li {
   float: left;
 }
 
-.gButtonSet .g-button {
+.g-buttonset .g-button {
   margin: 0;
 }
 
@@ -848,169 +819,169 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /*************** STUFF THAT NEEDS A HOME ****************/
 
-#gMove ul {
+#g-move ul {
   padding-left: 1em;
 }
 
-#gMove .selected {
+#g-move .selected {
   background: #999;
 }
 
-.gProgressBar {
+.g-progress-bar {
   height: 1em;
   width: 100%;
   margin-top: .5em;
   display: inline-block;
 }
 
-#gAddPhotos p {
+#g-add-photos p {
   margin: 0;
   padding: 0;
 }
 
-#gAddPhotosCanvas {
+#g-add-photos-canvas {
   height: 325px;
   width: 450px;
   overflow: auto;
 }
 
-#gAddPhotosQueue .progressbar {
+#g-add-photos-queue .progressbar {
   height: 4px;
 }
 
-#gAddPhotosQueue .title {
+#g-add-photos-queue .title {
   font-size: 1.25em;
 }
 
-#gAddPhotosQueue .status {
+#g-add-photos-queue .status {
   font-size: .75em;
 }
 
-#gAddPhotosQueue .box {
+#g-add-photos-queue .box {
   margin-bottom: 8px;
   padding: 4px;
 }
 
-#gAddPhotosQueue .pending {
+#g-add-photos-queue .pending {
   background-color: #e8e8e8;
   border: 1px solid #d7d7d7;
 }
 
-#gAddPhotosQueue .error {
+#g-add-photos-queue .error {
   background-color: #fcc;
   border: 1px solid #ebb;
 }
 
-#gAddPhotosQueue .uploading {
+#g-add-photos-queue .uploading {
   background-color: #ff9;
   border: 1px solid #ee8;
 }
 
-#gAddPhotosQueue .complete {
+#g-add-photos-queue .complete {
   background-color: #cfc;
   border: 1px solid #beb;
 }
 
-#gAdminG2ImportNotes {
+#g-admin-g2-import-notes {
   padding-bottom: 20px;
 }
 
-#gAdminG2ImportDetails {
+#g-admin-g2-import-details {
   padding-top: 20px;
 }
 
-#gAdminG2ImportDetails .gWarning {
+#g-admin-g2-import-details .g-warning {
   margin-top: 4px;
 }
 
-#gAdminG2ImportDetails .gInfo {
+#g-admin-g2-import-details .g-info {
   padding: 2px;
   border: 1px solid #999;
   margin-bottom: 10px;
 }
 
-#gAdminG2ImportNotes p,
-#gAdminG2ImportDetails .gInfo p {
+#g-admin-g2-import-notes p,
+#g-admin-g2-import-details .g-info p {
   padding: 0;
   margin: 0;
 }
 
-#gAdminG2ImportNotes ul li,
-#gAdminG2Import .gInfo ul li {
+#g-admin-g2-import-notes ul li,
+#g-admin-g2-import .g-info ul li {
   padding-left: 0;
   margin-left: 20px;
   list-style-type: disc;
 }
 
-#gTagAdmin {
+#g-tag-admin {
   table-layout: fixed;
 }
 
-#gTagAdmin td {
+#g-tag-admin td {
   border: 0;
 }
 
-#gTagAdmin ul {
+#g-tag-admin ul {
   padding-bottom: .3em;
 }
 
-#gTagAdmin li {
+#g-tag-admin li {
   padding: .1em 0 .2em .3em;
 }
 
-#gTagAdmin .gColumn {
+#g-tag-admin .g-column {
   float: left;
   width: 200px;
 }
 
-.rtl #gTagAdmin .gColumn {
+.rtl #g-tag-admin .g-column {
   float: right;
 }
 
-.gEditable {
+.g-editable {
   padding: .1em .3em .2em .3em;
 }
 
-.gEditable:hover {
+.g-editable:hover {
   background-color: #ffc;
   cursor: text;
 }
 
-#gRenameTagForm input {
+#g-rename-tag-form input {
   padding: 0 .2em 0 .2em;
   clear: none;
   float: left;
   margin: 0 .2em 0 0;
 }
 
-.rtl #gRenameTagForm input {
+.rtl #g-rename-tag-form input {
   float: right;
 }
 
-#gRenameTagForm input[type="text"].gError {
+#g-rename-tag-form input[type="text"].g-error {
   border: 2px solid red;
   background: none;
 }
 
-#gRenameTagForm input[type="submit"] {
+#g-rename-tag-form input[type="submit"] {
   height: 25px;
 }
 
-#gRenameTagForm a, #gRenameTagForm span {
+#g-rename-tag-form a, #g-rename-tag-form span {
   display: block;
   float: left;
   padding: .2em .2em 0 .1em;
 }
 
-.rtl #gRenameTagForm a, #gRenameTagForm span {
+.rtl #g-rename-tag-form a, #g-rename-tag-form span {
   float: right;
 }
 
-#gTaskLog-dialog h1 {
+#g-task-log-dialog h1 {
   font-size: 1.1em;
 }
 
-.gTaskLog {
+.g-task-log {
   border: 1pt solid;
   font-size: .9em;
   height: 400px;
@@ -1019,69 +990,69 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   padding: .5em
 }
 
-#gServerAddAdmin {
+#g-server-add-admin {
   margin:auto;
   text-align: left;
 }
 
-.rtl #gServerAddAdmin {
+.rtl #g-server-add-admin {
   text-align: right;
 }
 
-#gServerAddAdmin form fieldset {
+#g-server-add-admin form fieldset {
   border: medium none;
 }
 
-#gServerAddAdmin legend {
+#g-server-add-admin legend {
   display: none;
 }
 
-#gServerAddAdmin .gWarning {
+#g-server-add-admin .g-warning {
   background-color: #FFFF99;
 }
 
-#gAuthorizedPath {
+#g-authorized-path {
   margin: 0 !important;
   padding: 0.3em 1.5em 0.3em 1em;
 }
 
-#gServerAdd Admin #path {
+#g-server-add-admin #path {
   width: 80%;
 }
 
-.gRemoveDir:hover {
+.g-remove-dir:hover {
   cursor: pointer;
 }
 
-#gLanguagesForm table {
+g-languages-form table {
 	width: 400px;
 	float: left;
 	margin: 0 3em 1em 0;
 }
 
-#gLanguagesForm .installed {
+g-languages-form .installed {
   background-color: #EEEEEE;
 }
 
-#gLanguagesForm .default {
+g-languages-form .default {
 	background-color: #C5DBEC;
 	font-weight: bold;
 }
 
-#gLanguagesForm input {
+g-languages-form input {
 	clear: both;
 }
 
-#gTranslations {
+#g-translations {
 	padding: 2em 0 0 0;
 	clear: both;
 }
 
-#gTranslations .g-button {
+#g-translations .g-button {
 	padding: .5em;
 }
 
-.gDocLink {
+.g-doc-link {
   float: right;
 }
 
@@ -1101,9 +1072,9 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   text-align: left;
 }
 
-.rtl #gHeader #gQuickSearchForm,
-.rtl #gForgotPasswordLink,
-.rtl #gHeader #gLoginMenu,
+.rtl #g-header #g-quick-search-form,
+.rtl #g-reset-password,
+.rtl #g-header #g-login-menu,
 .rtl .ui-icon-right .ui-icon {
   clear: left;
   float: left;
@@ -1113,11 +1084,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
-.rtl .gShortForm li,
-.rtl #gContent #gAlbumGrid .gItem,
-.rtl #gSiteAdminMenu,
-.rtl .gPager li,
-.rtl .gButtonSet li,
+.rtl .g-short-form li,
+.rtl #g-content #g-album-grid .g-item,
+.rtl #g-site-admin-menu,
+.rtl .g-pager li,
+.rtl .g-buttonset li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
 }
diff --git a/themes/admin_wind/images/avatar.jpg b/themes/admin_wind/images/avatar.jpg
deleted file mode 100644
index 2e76b12b..00000000
Binary files a/themes/admin_wind/images/avatar.jpg and /dev/null differ
diff --git a/themes/admin_wind/images/ico-album.png b/themes/admin_wind/images/ico-album.png
deleted file mode 100644
index affa1b84..00000000
Binary files a/themes/admin_wind/images/ico-album.png and /dev/null differ
diff --git a/themes/admin_wind/images/ico-print.png b/themes/admin_wind/images/ico-print.png
deleted file mode 100644
index b82a8e1e..00000000
Binary files a/themes/admin_wind/images/ico-print.png and /dev/null differ
diff --git a/themes/admin_wind/images/ico-separator.gif b/themes/admin_wind/images/ico-separator.gif
deleted file mode 100644
index 3de2d0d3..00000000
Binary files a/themes/admin_wind/images/ico-separator.gif and /dev/null differ
diff --git a/themes/admin_wind/images/ico-view-comments.png b/themes/admin_wind/images/ico-view-comments.png
deleted file mode 100644
index e5d3630f..00000000
Binary files a/themes/admin_wind/images/ico-view-comments.png and /dev/null differ
diff --git a/themes/admin_wind/images/ico-view-fullsize.png b/themes/admin_wind/images/ico-view-fullsize.png
deleted file mode 100644
index 0be23e9b..00000000
Binary files a/themes/admin_wind/images/ico-view-fullsize.png and /dev/null differ
diff --git a/themes/admin_wind/images/ico-view-hybrid.png b/themes/admin_wind/images/ico-view-hybrid.png
deleted file mode 100644
index ee902e55..00000000
Binary files a/themes/admin_wind/images/ico-view-hybrid.png and /dev/null differ
diff --git a/themes/admin_wind/images/ico-view-slideshow.png b/themes/admin_wind/images/ico-view-slideshow.png
deleted file mode 100644
index 82f61f63..00000000
Binary files a/themes/admin_wind/images/ico-view-slideshow.png and /dev/null differ
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index a603f87f..8d34241f 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -1,7 +1,7 @@
 $(document).ready(function(){
   // Initialize Superfish menus
-  $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
-  $("ul.gMenu").addClass("sf-menu");
+  $("#g-site-admin-menu ul.g-menu").addClass("sf-menu");
+  $("ul.g-menu").addClass("sf-menu");
   $("ul.sf-menu").superfish({
     delay: 500,
     animation: {
@@ -11,41 +11,41 @@ $(document).ready(function(){
     pathClass: "current",
     speed: "fast"
   });
-  $("#gSiteAdminMenu").css("display", "block");
+  $("#g-site-admin-menu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").gallery_show_message();
+  $("#g-action-status li").gallery_show_message();
 
   // Initialize modal dialogs
-  $(".g-dialogLink").gallery_dialog();
+  $(".g-dialog-link").gallery_dialog();
 
   // Initialize ajax links
-  $(".gAjaxLink").gallery_ajax();
+  $(".g-ajax-link").gallery_ajax();
 
   // Initialize panels
-  $(".gPanelLink").gallery_panel();
+  $(".g-panel-link").gallery_panel();
 
-  if ($("#gPhotoStream").length) {
+  if ($("#g-photo-stream").length) {
     // Vertically align thumbs in photostream
-    $(".gItem").gallery_valign();
+    $(".g-item").gallery_valign();
   }
 
   // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
+  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
 
   // Round view menu buttons
-  if ($("#gAdminCommentsMenu").length) {
-    $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
-    $("#gAdminCommentsMenu").addClass("gButtonSet");
-    $("#gAdminCommentsMenu a").addClass("g-button ui-state-default");
-    $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
-    $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
+  if ($("#g-admin-comments-menu").length) {
+    $("#g-admin-comments-menu ul").removeClass("g-menu").removeClass("sf-menu");
+    $("#g-admin-comments-menu").addClass("g-buttonset");
+    $("#g-admin-comments-menu a").addClass("g-button ui-state-default");
+    $("#g-admin-comments-menu ul li:first a").addClass("ui-corner-left");
+    $("#g-admin-comments-menu ul li:last a").addClass("ui-corner-right");
   }
 
   // Round corners
-  $(".gSelected").addClass("ui-corner-all");
-  $(".gAvailable .gBlock").addClass("ui-corner-all");
-  $(".gUnavailable").addClass("ui-corner-all");
+  $(".g-selected").addClass("ui-corner-all");
+  $(".g-available .g-block").addClass("ui-corner-all");
+  $(".g-unavailable").addClass("ui-corner-all");
 
   // Add hover state for buttons
   $(".ui-state-default").hover(
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index b18f010a..5b2d41ad 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -36,21 +36,21 @@
   <body <?= $theme->body_attributes() ?>>
     <?= $theme->admin_page_top() ?>
     <? if ($sidebar): ?>
-    <div id="doc3" class="yui-t5 gView">
+    <div id="doc3" class="yui-t5 g-view">
     <? else: ?>
-    <div id="doc3" class="yui-t7 gView">
+    <div id="doc3" class="yui-t7 g-view">
     <? endif; ?>
       <?= $theme->site_status() ?>
-      <div id="gHeader">
+      <div id="g-header">
         <?= $theme->admin_header_top() ?>
-        <ul id="gLoginMenu">
+        <ul id="g-login-menu">
           <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
+          <li id="g-logoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
+        <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
-        <div id="gSiteAdminMenu" style="display: none;">
+        <div id="g-site-admin-menu" style="display: none;">
           <?= $theme->admin_menu() ?>
         </div>
         <?= $theme->admin_header_bottom() ?>
@@ -58,19 +58,19 @@
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
-            <div id="gContent" class="yui-g">
+            <div id="g-content" class="yui-g">
               <?= $theme->messages() ?>
               <?= $content ?>
             </div>
           </div>
         </div>
         <? if ($sidebar): ?>
-        <div id="gSidebar" class="yui-b">
+        <div id="g-sidebar" class="yui-b">
           <?= $sidebar ?>
         </div>
         <? endif ?>
       </div>
-      <div id="gFooter">
+      <div id="g-footer">
         <?= $theme->admin_footer() ?>
         <div>
           <?= $theme->admin_credits() ?>
diff --git a/themes/admin_wind/views/block.html.php b/themes/admin_wind/views/block.html.php
index 6cbea76e..d1d2d088 100644
--- a/themes/admin_wind/views/block.html.php
+++ b/themes/admin_wind/views/block.html.php
@@ -2,9 +2,9 @@
 <? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
 <? endif ?>
-<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget">
+<div block_id="<?= $id ?>" id="<?= $css_id ?>" class="g-block ui-widget">
   <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right">
-    <? if ($css_id != "gBlockAdder"): ?>
+    <? if ($css_id != "g-block-adder"): ?>
     <a href="<?= url::site("admin/dashboard/remove_block/$id?csrf=$csrf") ?>"
        class="ui-dialog-titlebar-close ui-corner-all">
       <span class="ui-icon ui-icon-closethick">remove</span>
@@ -12,7 +12,7 @@
     <? endif ?>
     <?= $title ?>
   </div>
-  <div class="gBlockContent">
+  <div class="g-block-content">
     <?= $content ?>
   </div>
 </div>
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 29b9f9d0..555a4950 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="gPager">
+<ul class="g-pager">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Item %from_number of %count",
                        "Items %from_number - %to_number of %count",
@@ -24,7 +24,7 @@
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? endif ?>
   </li>
-  <li class="gInfo"><?= $from_to_msg ?></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">
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 8899ec59..d6405c36 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -2,15 +2,15 @@
  * Fix display in IE 6, 7
  */
 
-#gBanner,
-.gBreadcrumbs,
-#gAlbumGrid,
-#gPager,
-#gViewMenu  {
+#g-banner,
+.g-breadcrumbs,
+#g-album-grid,
+#g-pager,
+#g-view-menu  {
   zoom: 1;
 }
 
-#gBanner {
+#g-banner {
   z-index: 2;
 }
 
@@ -19,7 +19,7 @@ input.submit {
   display: inline !important;
 }
 
-#gAddTagForm input.textbox {
+#g-add-tag-form input.textbox {
   width: 110px;
 }
 
@@ -28,10 +28,10 @@ input.submit {
   float: none !important;
 }
 
-.gPager .g-txt-right {
+.g-pager .g-txt-right {
   width: 29%;
 }
 
-.gPager .ui-icon-right {
+.g-pager .ui-icon-right {
   width: 60px;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index ec75d310..dac6a899 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -39,11 +39,11 @@ h1 {
   font-size: 1.7em;
 }
 
-#gSearchResults h1 {
+#g-search-results h1 {
   margin-bottom: 1em;
 }
 
-#gProgress h1 {
+#g-progress h1 {
   font-size: 1.1em;
 }
 
@@ -51,11 +51,11 @@ h2 {
   font-size: 1.4em;
 }
 
-#gSidebar .gBlock h2 {
+#g-sidebar .g-block h2 {
   font-size: 1.2em;
 }
 
-#gSidebar .gBlock li {
+#g-sidebar .g-block li {
   margin-bottom: .6em;
 }
 
@@ -66,7 +66,7 @@ h3 {
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 a,
-.gMenu a,
+.g-menu a,
 #g-dialog a,
 .g-button,
 .g-button:hover,
@@ -85,11 +85,11 @@ a:hover,
   text-decoration: underline;
 }
 
-.gMenu a:hover {
+.g-menu a:hover {
   text-decoration: none;
 }
 
-#g-dialog #gMessage li {
+#g-dialog #g-action-status li {
   width: 400px;
   white-space: normal;
   padding-left: 32px;
@@ -101,7 +101,7 @@ table {
   width: 100%;
 }
 
-#gContent table {
+#g-content table {
   margin: 1em 0;
 }
 
@@ -125,9 +125,9 @@ fieldset {
   padding-bottom: .8em;
 }
 
-#gBanner fieldset,
-#gSidebar fieldset,
-.gShortForm fieldset {
+#g-banner fieldset,
+#g-sidebar fieldset,
+.g-short-form fieldset {
   border: none;
 }
 
@@ -136,11 +136,11 @@ legend {
   margin-left: 1em;
 }
 
-#gBanner legend,
-#gSidebar legend,
-#gContent #gSearchForm legend,
+#g-banner legend,
+#g-sidebar legend,
+#g-content #g-search-form legend,
 input[type="hidden"],
-.gShortForm label {
+.g-short-form label {
   display: none;
 }
 
@@ -206,23 +206,18 @@ input[type="reset"] {
 
 /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.gValidationRule {
-  font-size: 80%;
-  margin-top: .5em;
-}
-
-form.gError input[type="text"],
-li.gError input[type="text"],
-form.gError input[type="password"],
-li.gError input[type="password"],
-form.gError input[type="checkbox"],
-li.gError input[type="checkbox"],
-form.gError input[type="radio"],
-li.gError input[type="radio"],
-form.gError textarea,
-li.gError textarea,
-form.gError select,
-li.gError select {
+form.g-error input[type="text"],
+li.g-error input[type="text"],
+form.g-error input[type="password"],
+li.g-error input[type="password"],
+form.g-error input[type="checkbox"],
+li.g-error input[type="checkbox"],
+form.g-error input[type="radio"],
+li.g-error input[type="radio"],
+form.g-error textarea,
+li.g-error textarea,
+form.g-error select,
+li.g-error select {
   border: 2px solid red;
 }
 
@@ -230,91 +225,91 @@ li.gError select {
  * 3) Reusable content blocks
  *********************************************************************/
 
-.gBlock {
+.g-block {
   clear: both;
   margin-bottom: 2.5em;
 }
 
-.gBlock h2 {
+.g-block h2 {
   background-color: #e8e8e8;
   padding: .3em .8em;
 }
 
-.gBlockContent {
+.g-block-content {
   margin-top: 1em;
 }
 
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gContent #gMessage {
+#g-content #g-action-status {
   width: 100%;
 }
 
-#gSiteStatus li,
-#gMessage li,
-.gModuleStatus {
+#g-site-status li,
+#g-action-status li,
+.g-module-status {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
 
-#gSiteStatus li {
+#g-site-status li {
   margin-bottom: 0;
   border: none;
   border-bottom: 1px solid #ccc;
 }
 
-.gModuleStatus {
+.g-module-status {
   clear: both;
   margin-bottom: 1em;
 }
 
-.gError,
-.gInfo,
-.gSuccess,
-.gWarning {
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
   background-position: .4em 50%;
   background-repeat: no-repeat;
   padding: .4em .5em .4em 30px;
 }
 
-.gError {
+.g-error {
   background-color: #f6cbca;
   background-image: url('../../../lib/images/ico-error.png');
 }
 
-.gInfo {
+.g-info {
   background-color: #e8e8e8;
   background-image: url('../../../lib/images/ico-info.png');
 }
 
-.gSuccess {
+.g-success {
   background-color: #d9efc2;
   background-image: url('../../../lib/images/ico-success.png');
 }
 
-.gWarning {
+.g-warning {
   background-color: #fcf9ce;
   background-image: url('../../../lib/images/ico-warning.png');
 }
 
-form .gError,
-.gPager .gInfo {
+form .g-error,
+.g-pager .g-info {
   background-color: #fff !important;
 }
 
-.gPager .gInfo {
+.g-pager .g-info {
   background-image: none !important;
   padding: 0 !important;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
 
-.gShortForm li {
+.g-short-form li {
   float: left;
   padding: .4em 0;
 }
 
-.gShortForm input[type="text"] {
+.g-short-form input[type="text"] {
   color: #666;
   padding: .3em .6em;
   width: 11em;
@@ -326,7 +321,7 @@ form .gError,
 
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.gView {
+.g-view {
   background-color: #fff;
   border: 1px solid #ccc;
   border-bottom: none;
@@ -334,11 +329,11 @@ form .gError,
 
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader {
+#g-header {
   margin-bottom: 1em;
 }
 
-#gBanner {
+#g-banner {
   background-color: #e8e8e8;
   border-bottom: 1px solid #ccc;
   font-size: .8em;
@@ -347,20 +342,20 @@ form .gError,
   position: relative;
 }
 
-#gContent {
+#g-content {
   font-size: 1.2em;
   padding-left: 20px;
   position: relative;
   width: 696px;
 }
 
-#gSidebar {
+#g-sidebar {
   font-size: .9em;
   padding: 0 20px;
   width: 220px;
 }
 
-#gFooter {
+#g-footer {
   background-color: #e8e8e8;
   border-top: 1px solid #ccc;
   font-size: .8em;
@@ -374,38 +369,38 @@ form .gError,
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gBanner #gLogo img {
+#g-banner #g-logo img {
   margin: 0;
 }
 
-#gBanner #gQuickSearchForm {
+#g-banner #g-quick-search-form {
   clear: right;
   float: right;
   margin-top: 1em;
 }
 
-#gBanner #gQuickSearchForm input[type='text'] {
+#g-banner #g-quick-search-form input[type='text'] {
   width: 17em;
 }
 
-#gContent .gBlock h2 {
+#g-content .g-block h2 {
   background-color: transparent;
   padding-left: 0;
 }
 
-#gSidebar .gBlockContent {
+#g-sidebar .g-block-content {
   padding-left: 1em;
 }
 
 /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gContent #gAlbumGrid {
+#g-content #g-album-grid {
   margin: 1em 0;
   position: relative;
   z-index: 1;
 }
 
-#gContent #gAlbumGrid .gItem {
+#g-content #g-album-grid .g-item {
   background-color: #fff;
   border: 1px solid #fff;
   float: left;
@@ -417,21 +412,21 @@ form .gError,
   z-index: 1;
 }
 
-#gContent #gAlbumGrid .gItem h2 {
+#g-content #g-album-grid .g-item h2 {
   margin: 5px 0;
 }
 
-#gContent .gPhoto h2,
-#gContent .gItem .gMetadata {
+#g-content .g-photo h2,
+#g-content .g-item .g-metadata {
   display: none;
   margin-bottom: .6em;
 }
 
-#gContent #gAlbumGrid .gAlbum {
+#g-content #g-album-grid .g-album {
   background-color: #e8e8e8;
 }
 
-#gContent #gAlbumGrid .gAlbum h2 span {
+#g-content #g-album-grid .g-album h2 span {
   background: transparent url('../images/ico-album.png') no-repeat top left;
   display: inline-block;
   height: 16px;
@@ -439,18 +434,18 @@ form .gError,
   width: 16px;
 }
 
-#gContent #gAlbumGrid .gHoverItem {
+#g-content #g-album-grid .g-hover-item {
   border: 1px solid #000;
   position: absolute !important;
   z-index: 1000 !important;
 }
 
-#gContent .gHoverItem h2,
-#gContent .gHoverItem .gMetadata {
+#g-content .g-hover-item h2,
+#g-content .g-hover-item .g-metadata {
   display: block;
 }
 
-#gContent #gAlbumGrid #gPlaceHolder {
+#g-content #g-album-grid #g-place-holder {
   position: relative;
   visibility: hidden;
   z-index: 1;
@@ -458,80 +453,80 @@ form .gError,
 
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
-#gContent #gItem {
+#g-content #g-item {
   position: relative;
   width: 99%;
 }
 
-#gContent #gPhoto {
+#g-content #g-photo {
   position: relative;
 }
 
-#gContent #gItem .gFullSizeLink img {
+#g-content #g-item .g-fullsize-link img {
   display: block;
   margin: 1em auto !important;
 }
 
-#gContent #gComments {
+#g-content #g-comments {
   margin-top: 2em;
   position: relative;
 }
 
-#gContent #gComments ul li {
+#g-content #g-comments ul li {
   margin: 1em 0;
 }
 
-#gContent #gComments .gAuthor {
+#g-content #g-comments .g-author {
   border-bottom: 1px solid #ccc;
   color: #999;
   height: 32px;
   line-height: 32px;
 }
 
-#gContent #gComments ul li div {
+#g-content #g-comments ul li div {
   padding: 0 8px 8px 43px;
 }
 
-#gContent #gComments ul li #gRecaptcha {
+#g-content #g-comments ul li #g-recaptcha {
   padding: 0;
 }
 
-#gContent #gComments ul li #gRecaptcha div {
+#g-content #g-comments ul li #g-recaptcha div {
   padding: 0;
 }
 
-#gContent #gComments .gAvatar {
+#g-content #g-comments .g-avatar {
   height: 32px;
   margin-right: .4em;
   width: 32px;
 }
 
-#gAddCommentButton {
+#g-admin-comment-button {
   position: absolute;
   right: 0;
   top: 2px;
 }
 
-#gContent #gAddCommentForm {
+#g-content #g-comment-form {
   margin-top: 2em;
 }
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gBanner #gLoginMenu li,
-#gFooter #gCredits li {
+#g-banner #g-login-menu li,
+#g-footer #g-credits li {
   display: inline;
 }
 
-#gBanner #gLoginMenu li {
+#g-banner #g-login-menu li {
   padding-left: 1.2em;
 }
 
-#gFooter #gCredits li {
+#g-footer #g-credits li {
   padding-right: 1.2em;
 }
 
-#gContent #gSearchResults {
+#g-content #g-search-results {
   margin-top: 1em;
   padding-top: 1em;
 }
@@ -540,245 +535,185 @@ form .gError,
  * 5) Navigation and menus
  *********************************************************************/
 
-#gSiteMenu,
-#gTagCloud ul {
+#g-site-menu,
+#g-tag-cloud ul {
   font-size: 1.2em;
 }
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gBanner #gLoginMenu {
+#g-banner #g-login-menu {
   color: #999;
   float: right;
 }
 
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gSiteMenu {
+#g-site-menu {
   bottom: 0;
   display: none;
   left: 140px;
   position: absolute;
 }
 
-#gSiteMenu ul {
+#g-site-menu ul {
   margin-bottom: 0 !important;
 }
 
 /* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.gContextMenu {
+.g-context-menu {
   background-color: #fff;
   bottom: 0;
   left: 0;
   position: absolute;
 }
 
-.gItem .gContextMenu {
+.g-item .g-context-menu {
   display: none;
   margin-top: 2em;
   width: 100%;
 }
 
-#gItem .gContextMenu {
+#g-item .g-context-menu {
   font-size: .7em;
 }
 
-#gItem .gContextMenu ul {
+#g-item .g-context-menu ul {
   display: none;
 }
 
-.gContextMenu li {
+.g-context-menu li {
   border-left: none;
   border-right: none;
   border-bottom: none;
 }
 
-.gContextMenu li a {
+.g-context-menu li a {
   display: block;
   line-height: 1.6em;
 }
 
-.gHoverItem .gContextMenu {
+.g-hover-item .g-context-menu {
   display: block;
 }
 
-.gHoverItem .gContextMenu li {
+.g-hover-item .g-context-menu li {
   text-align: left;
 }
 
-.gHoverItem .gContextMenu a:hover {
+.g-hover-item .g-context-menu a:hover {
   text-decoration: none;
 }
 
 /* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gViewMenu {
+#g-view-menu {
   margin-bottom: 1em;
 }
 
-#gViewMenu a {
+#g-view-menu a {
   background-repeat: no-repeat;
   background-position: 50% 50%;
   height: 28px !important;
   width: 43px !important;
 }
 
-#gViewMenu #gHybridLink {
-  background-image: url('../images/ico-view-hybrid.png');
-}
-
-#gViewMenu #gSlideshowLink {
+#g-view-menu #g-slideshow-link {
   background-image: url('../images/ico-view-slideshow.png');
 }
 
-#gViewMenu .gFullSizeLink {
+#g-view-menu .g-fullsize-link {
   background-image: url('../images/ico-view-fullsize.png');
 }
 
-#gViewMenu #gCommentsLink {
+#g-view-menu #g-comments-link {
   background-image: url('../images/ico-view-comments.png');
 }
 
-#gViewMenu #gDigibugLink {
+#g-view-menu #g-print-digibug-link {
   background-image: url('../images/ico-print.png');
 }
 
-/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gBreadcrumbs {
-  padding: 0 20px;
-}
-
-.gBreadcrumbs li {
-  background: transparent url('../images/ico-separator.gif') no-repeat scroll left center;
-  float: left;
-  padding: 10px 6px 10px 16px !important;
-}
-
-.gBreadcrumbs li.root {
-  background: transparent;
-}
-
-.gBreadcrumbs li a,
-.gBreadcrumbs li span {
-  display: block;
-}
-
-.gBreadcrumbs li.active,
-.gBreadcrumbs li.active span {
-  font-weight: bold;
-}
-
-#g-dialog ul.gBreadcrumbs {
-  clear: both;
-  margin-left: 0;
-  padding-left: 0;
-}
-
-#g-dialog .gBreadcrumbs li {
-  font-size: .9em;
-}
-
 /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gTagCloud ul {
+#g-tag-cloud ul {
   text-align: justify;
 }
 
-#gTagCloud ul li {
+#g-tag-cloud ul li {
   display: inline;
   line-height: 1.5em;
   text-align: justify;
 }
 
-#gTagCloud ul li a {
+#g-tag-cloud ul li a {
   text-decoration: none;
 }
 
-#gTagCloud ul li span {
+#g-tag-cloud ul li span {
   display: none;
 }
 
-#gTagCloud ul li.size1 a {
+#g-tag-cloud ul li.size1 a {
   color: #9cf;
   font-size: 80%;
   font-weight: 100;
 }
 
-#gTagCloud ul li.size2 a {
+#g-tag-cloud ul li.size2 a {
   color: #69f;
   font-size: 90%;
   font-weight: 300;
 }
 
-#gTagCloud ul li.size3 a {
+#g-tag-cloud ul li.size3 a {
   color: #69c;
   font-size: 100%;
   font-weight: 500;
 }
 
-#gTagCloud ul li.size4 a {
+#g-tag-cloud ul li.size4 a {
   color: #369;
   font-size: 110%;
   font-weight: 700;
 }
 
-#gTagCloud ul li.size5 a {
+#g-tag-cloud ul li.size5 a {
   color: #0e2b52;
   font-size: 120%;
   font-weight: 900;
 }
 
-#gTagCloud ul li.size6 a {
+#g-tag-cloud ul li.size6 a {
   color: #0e2b52;
   font-size: 130%;
   font-weight: 900;
 }
 
-#gTagCloud ul li.size7 a {
+#g-tag-cloud ul li.size7 a {
   color: #0e2b52;
   font-size: 140%;
   font-weight: 900;
 }
 
-#gTagCloud ul li a:hover {
+#g-tag-cloud ul li a:hover {
   color: #f30;
   text-decoration: underline;
 }
 
-#gWelcomeMessage p {
+#g-welcome-message p {
   padding-bottom: 1em;
 }
 
-/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.gPager {
-  clear: both;
-  margin: 0;
-  padding: 5px 0 !important;
-  width: 100%;
-}
-
-.gPager li {
-  float: left;
-  margin: 0;
-  width: 30%;
-}
-
-.gPager .gInfo {
-  text-align: center;
-  width: 40%;
-}
-
 /** *******************************************************************
  * 6) Browser hacks
  *********************************************************************/
 
-#gHeader:after,
-#gAlbumGrid:after,
-.gPager:after,
-#gViewMenu:after {
+#g-header:after,
+#g-album-grid:after,
+.g-pager:after,
+#g-view-menu:after {
   clear: both;
   content: ".";
   display: block;
@@ -802,26 +737,26 @@ form .gError,
 
 /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
 
-.gLoadingLarge {
+.g-loading-large {
   background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
   font-size: 0;
 }
 
-.g-dialogLoadingLarge {
+.g-dialog-loading-large {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
 
-.gLoadingSmall {
+.g-loading-small {
   background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
   font-size: 0;
 }
 
-.gDraggable {
+.g-draggable {
   cursor: move;
 }
 
-.gDropTarget {
+.g-drop-target {
   background-color: #cfdeff;
   border: 1px dotted #999;
   height: 100px;
@@ -837,15 +772,15 @@ form .gError,
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonSet {
+.g-buttonset {
   padding-left: 1px;
 }
 
-.gButtonSet li {
+.g-buttonset li {
   float: left;
 }
 
-.gButtonSet .g-button {
+.g-buttonset .g-button {
   margin: 0;
 }
 
@@ -869,36 +804,36 @@ form .gError,
 
 /* STUFF THAT NEEDS A HOME */
 
-#gMove ul {
+#g-move ul {
   padding-left: 1em;
 }
 
-#gMove .selected {
+#g-move .selected {
   background: #999;
 }
 
 /* Server Add */
 
-#gServerAdd button {
+#g-server-add button {
   margin-bottom: .5em;
 }
 
-#gServerAddTree {
+#g-server-add-tree {
   cursor: pointer;
   padding-left: 4px;
   width: 95%;
 }
 
-#gServerAddTree li {
+#g-server-add-tree li {
   padding: 0;
   float: none;
 }
 
-#gServerAddTree span.selected {
+#g-server-add-tree span.selected {
   background: #ddd;
 }
 
-#gServerAddTree {
+#g-server-add-tree {
   border: 1px solid #ccc;
   height: 20em;
   overflow: auto;
@@ -906,59 +841,66 @@ form .gError,
   padding: .5em;
 }
 
-#gServerAdd ul ul li {
+#g-server-add ul ul li {
   padding-left: 1.2em;
 }
 
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gEditPermissionForm {
+#g-edit-permissions-form {
 	clear: both;
 }
-#gEditPermissionForm fieldset {
-	border: 1px solid #cccccc;
+
+#g-edit-permissions-form td {
+  background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+	border: 1px solid #ccc;
 	padding: 0;
 }
 
-#gPermissions .gDenied,
-#gPermissions .gAllowed {
+#g-permissions .g-denied,
+#g-permissions .g-allowed {
   text-align: center;
   vertical-align: middle;
 }
-#gPermissions .gDenied {
+
+#g-permissions .g-denied {
   background-color: #fcc;
 }
-#gPermissions .gAllowed {
+
+#g-permissions .g-allowed {
   background-color: #cfc;
 }
 
 /*************** STUFF THAT NEEDS A HOME ****************/
 
-.gProgressBar {
+.g-progress-bar {
   height: 1em;
   width: 100%;
   margin-top: .5em;
   display: inline-block;
 }
 
-#gAddPhotos #SWFUpload_0 {
+#g-add-photos #SWFUpload_0 {
   position: relative;
   top: -200px;
   left: 134px;
 }
-#gAddPhotos .gBreadcrumbs {
+#g-add-photos .g-breadcrumbs {
   border: 0;
   margin: 0;
   padding-left:10px;
 }
-#gAddPhotosCanvas {
+#g-add-photos-canvas {
   border: 1px solid  #CCCCCC;
   margin: .5em 0 .5em 0;
   width: 469px;
 	height: 325px;
   overflow: auto;
 }
-#gAddPhotos button {
+#g-add-photos button {
   margin-bottom: .5em;
   float: right;
 }
@@ -970,73 +912,73 @@ form .gError,
   cursor: pointer;
 }
 
-#gAddPhotosCanvas {
+#g-add-photos-canvas {
 
 }
 
-#gAddPhotosQueue .progressbar {
+#g-add-photos-queue .progressbar {
   height: 4px;
 }
 
-#gAddPhotosQueue .title {
+#g-add-photos-queue .title {
   font-size: 1.25em;
 }
 
-#gAddPhotosQueue .status {
+#g-add-photos-queue .status {
   font-size: .75em;
 }
 
-#gAddPhotosQueue .box {
+#g-add-photos-queue .box {
   margin-bottom: 8px;
   padding: 4px;
 }
 
-#gAddPhotosQueue .pending {
+#g-add-photos-queue .pending {
   background-color: #e8e8e8;
   border: 1px solid #d7d7d7;
 }
 
-#gAddPhotosQueue .error {
+#g-add-photos-queue .error {
   background-color: #fcc;
   border: 1px solid #ebb;
 }
 
-#gAddPhotosQueue .uploading {
+#g-add-photos-queue .uploading {
   background-color: #ff9;
   border: 1px solid #ee8;
 }
 
-#gAddPhotosQueue .complete {
+#g-add-photos-queue .complete {
   background-color: #cfc;
   border: 1px solid #beb;
 }
 
-#gAdminG2ImportNotes {
+#g-admin-g2-import-notes {
   padding-bottom: 20px;
 }
 
-#gAdminG2ImportDetails {
+#g-admin-g2-import-details {
   padding-top: 20px;
 }
 
-#gAdminG2ImportDetails .gWarning {
+#g-admin-g2-import-details .g-warning {
   margin-top: 4px;
 }
 
-#gAdminG2ImportDetails .gInfo {
+#g-admin-g2-import-details .g-info {
   padding: 2px;
   border: 1px solid #999;
   margin-bottom: 10px;
 }
 
-#gAdminG2ImportNotes p,
-#gAdminG2ImportDetails .gInfo p {
+#g-admin-g2-import-notes p,
+#g-admin-g2-import-details .g-info p {
   padding: 0;
   margin: 0;
 }
 
-#gAdminG2ImportNotes ul li,
-#gAdminG2Import .gInfo ul li {
+#g-admin-g2-import-notes ul li,
+#g-admin-g2-import .g-info ul li {
   padding-left: 0;
   margin-left: 20px;
   list-style-type: disc;
@@ -1054,9 +996,9 @@ form .gError,
   text-align: right;
 }
 
-.rtl #gHeader #gQuickSearchForm,
-.rtl #gForgotPasswordLink,
-.rtl #gHeader #gLoginMenu,
+.rtl #g-header #g-quick-search-form,
+.rtl #g-reset-password,
+.rtl #g-header #g-login-menu,
 .rtl .ui-icon-right .ui-icon {
   clear: left;
   float: left;
@@ -1066,13 +1008,13 @@ form .gError,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
-.rtl .gShortForm li,
-.rtl #gHeader #gLogo img,
-.rtl #gContent #gAlbumGrid .gItem,
-.rtl #gSiteMenu,
-.rtl .gBreadcrumbs li,
-.rtl .gPager li,
-.rtl .gButtonSet li,
+.rtl .g-short-form li,
+.rtl #g-header #g-logo img,
+.rtl #g-content #g-album-grid .g-item,
+.rtl #g-site-menu,
+.rtl .g-breadcrumbs li,
+.rtl .g-pager li,
+.rtl .g-buttonset li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
 }
diff --git a/themes/wind/images/ico-separator.gif b/themes/wind/images/ico-separator.gif
deleted file mode 100644
index 3de2d0d3..00000000
Binary files a/themes/wind/images/ico-separator.gif and /dev/null differ
diff --git a/themes/wind/images/ico-view-hybrid.png b/themes/wind/images/ico-view-hybrid.png
deleted file mode 100644
index ee902e55..00000000
Binary files a/themes/wind/images/ico-view-hybrid.png and /dev/null differ
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 4b3b4306..27fb9664 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -2,16 +2,10 @@
  * Initialize jQuery UI and Gallery Plugin elements
  */
 
-var short_forms = new Array(
-  "#gQuickSearchForm",
-  "#gAddTagForm",
-  "#gSearchForm"
-);
-
 $(document).ready(function() {
 
   // Initialize Superfish menus
-  $("ul.gMenu").addClass("sf-menu");
+  $("ul.g-menu").addClass("sf-menu");
   $('ul.sf-menu').superfish({
     delay: 500,
     animation: {
@@ -20,63 +14,69 @@ $(document).ready(function() {
     },
     speed: 'fast'
   });
-  $("#gSiteMenu").css("display", "block");
+  $("#g-site-menu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").gallery_show_message();
+  $("#g-action-status li").gallery_show_message();
 
   // Initialize dialogs
-  $("#gLoginLink").addClass("g-dialogLink");
-  $(".g-dialogLink").gallery_dialog();
+  $("#g-login-link").addClass("g-dialog-link");
+  $(".g-dialog-link").gallery_dialog();
 
   // Initialize view menu
-  if ($("#gViewMenu").length) {
-    $("#gViewMenu ul").removeClass("gMenu").removeClass("sf-menu");
-    $("#gViewMenu a").addClass("ui-icon");
+  if ($("#g-view-menu").length) {
+    $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
+    $("#g-view-menu a").addClass("ui-icon");
   }
 
   // Initialize short forms
+  var short_forms = new Array(
+    "#g-quick-search-form",
+    "#g-add-tag-form",
+    "#g-search-form"
+  );
+
   for (var i in short_forms) {
     short_form_init(short_forms[i]);
-    $(short_forms[i]).addClass("gShortForm");
+    $(short_forms[i]).addClass("g-short-form");
   }
-  $(".gShortForm input[type=text]").addClass("ui-corner-left");
-  $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right");
+  $(".g-short-form input[type=text]").addClass("ui-corner-left");
+  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
 
   // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
-
-  // Apply styles and icon classes to gContextMenu
-  if ($(".gContextMenu").length) {
-    $(".gContextMenu li").addClass("ui-state-default");
-    $(".gContextMenu a").addClass("g-button ui-icon-left");
-    $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
-    $(".gContextMenu a span").each(function() {
+  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
+
+  // Apply styles and icon classes to g-context-menu
+  if ($(".g-context-menu").length) {
+    $(".g-context-menu li").addClass("ui-state-default");
+    $(".g-context-menu a").addClass("g-button ui-icon-left");
+    $(".g-context-menu a").prepend("<span class=\"ui-icon\"></span>");
+    $(".g-context-menu a span").each(function() {
       var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
       $(this).addClass(iconClass);
     });
   }
 
   // Album view only
-  if ($("#gAlbumGrid").length) {
+  if ($("#g-album-grid").length) {
     // Set equal height for album items and vertically align thumbnails/metadata
-    $('.gItem').equal_heights().gallery_valign();
+    $('.g-item').equal_heights().gallery_valign();
 
     // Initialize thumbnail hover effect
-    $(".gItem").hover(
+    $(".g-item").hover(
       function() {
         // Insert a placeholder to hold the item's position in the grid
-        var placeHolder = $(this).clone().attr("id", "gPlaceHolder");
+        var placeHolder = $(this).clone().attr("id", "g-place-holder");
         $(this).after($(placeHolder));
         // Style and position the hover item
         var position = $(this).position();
         $(this).css("top", position.top).css("left", position.left);
-        $(this).addClass("gHoverItem");
+        $(this).addClass("g-hover-item");
         // Initialize the contextual menu
         $(this).gallery_context_menu();
         // Set the hover item's height
         $(this).height("auto");
-        var context_menu = $(this).find(".gContextMenu");
+        var context_menu = $(this).find(".g-context-menu");
         var adj_height = $(this).height() + context_menu.height(); 
         $(this).height(adj_height); 
       },
@@ -94,19 +94,19 @@ $(document).ready(function() {
         $(this).css("position", "relative");
         $(this).css("top", 0).css("left", 0);
         // Remove the placeholder and hover class from the item
-        $(this).removeClass("gHoverItem");
-        $("#gPlaceHolder").remove();
+        $(this).removeClass("g-hover-item");
+        $("#g-place-holder").remove();
       }
     );
   }
 
   // Photo/Item item view
-  if ($("#gItem").length) {
+  if ($("#g-item").length) {
     // Ensure the resized image fits within its container
-    $("#gItem").gallery_fit_photo();
+    $("#g-item").gallery_fit_photo();
 
     // Initialize context menus
-    var resize = $("#gItem").gallery_get_photo();
+    var resize = $("#g-item").gallery_get_photo();
     $(resize).hover(function(){
       $(this).gallery_context_menu();
     });
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index fd647f81..57760de4 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -1,27 +1,27 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
-<div id="gInfo">
+<div id="g-info">
   <?= $theme->album_top() ?>
   <h1><?= html::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div>
+  <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="gAlbumGrid">
+<ul id="g-album-grid">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
-    <? $item_class = "gPhoto"; ?>
+    <? $item_class = "g-photo"; ?>
     <? if ($child->is_album()): ?>
-      <? $item_class = "gAlbum"; ?>
+      <? $item_class = "g-album"; ?>
     <? endif ?>
-  <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>">
+  <li id="g-itemId-<?= $child->id ?>" class="g-item <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
+      <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
+    <?= $theme->context_menu($child, "#g-itemId-{$child->id} .g-thumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
-    <ul class="gMetadata">
+    <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
@@ -30,7 +30,7 @@
   <? if ($user->admin || access::can("add", $item)): ?>
   <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialogLink\""))) ?></li>
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
   <? else: ?>
   <li><?= t("There aren't any photos here yet!") ?></li>
   <? endif; ?>
diff --git a/themes/wind/views/block.html.php b/themes/wind/views/block.html.php
index e8cff833..699d7c22 100644
--- a/themes/wind/views/block.html.php
+++ b/themes/wind/views/block.html.php
@@ -2,9 +2,9 @@
 <? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
 <? endif ?>
-<div id="<?= $css_id ?>" class="gBlock">
+<div id="<?= $css_id ?>" class="g-block">
   <h2><?= $title ?></h2>
-  <div class="gBlockContent">
+  <div class="g-block-content">
     <?= $content ?>
   </div>
 </div>
diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index 9ed9d69b..9d50f8a8 100644
--- a/themes/wind/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -1,24 +1,24 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAlbumHeader">
-  <div id="gAlbumHeaderButtons">
+<div id="g-albumHeader">
+  <div id="g-albumHeaderButtons">
     <?= $theme->dynamic_top() ?>
   </div>
   <h1><?= html::clean($title) ?></h1>
 </div>
 
-<ul id="gAlbumGrid">
+<ul id="g-album-grid">
   <? foreach ($children as $i => $child): ?>
-  <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">
+  <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
+      <img id="g-photoId-<?= $child->id ?>" class="g-thumbnail"
            alt="photo" src="<?= $child->thumb_url() ?>"
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
     <h2><?= html::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
-    <ul class="gMetadata">
+    <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index cf7c9b7f..17b519ba 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gItem">
+<div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="gPager">
+  <ul class="g-pager">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
@@ -12,7 +12,7 @@
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? endif; ?>
     </li>
-    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></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">
@@ -25,13 +25,13 @@
   </ul>
 
 
-  <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
+  <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
 
-  <div id="gInfo">
+  <div id="g-info">
     <h1><?= html::purify($item->title) ?></h1>
        <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
+  <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
 </div>
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
index 7324cf9e..c609d4d9 100644
--- a/themes/wind/views/no_sidebar.html.php
+++ b/themes/wind/views/no_sidebar.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gWarning">
+<div class="g-warning">
   <?= t("No active sidebar panels. <a href=\"%url\">Add panels</a>",
           array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
 </div>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 414174b6..6e1e3a53 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -38,7 +38,7 @@
         <? $new_width = $thumb_proportion * 213 ?>
         <? $new_height = $thumb_proportion * 240 ?>
     <style type="text/css">
-    #gContent #gAlbumGrid .gItem {
+    #g-content #g-album-grid .g-item {
       width: <?= $new_width ?>px;
       height: <?= $new_height ?>px;
       /* <?= $thumb_proportion ?> */
@@ -74,26 +74,26 @@
 
   <body <?= $theme->body_attributes() ?>>
     <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
+    <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <div id="gBanner">
+      <div id="g-header">
+        <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
-          <div id="gSiteMenu">
+          <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>
           <?= $theme->header_bottom() ?>
         </div>
 
         <? if (!empty($parents)): ?>
-        <ul class="gBreadcrumbs">
+        <ul class="g-breadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
             <!-- Adding ?show=<id> causes Gallery3 to display the page
@@ -113,26 +113,26 @@
       <div id="bd">
         <div id="yui-main">
           <div class="yui-b">
-            <div id="gContent" class="yui-g">
+            <div id="g-content" class="yui-g">
               <?= $theme->messages() ?>
               <?= $content ?>
             </div>
           </div>
         </div>
-        <div id="gSidebar" class="yui-b">
+        <div id="g-sidebar" class="yui-b">
           <? if ($theme->page_type != "login"): ?>
           <?= new View("sidebar.html") ?>
           <? endif ?>
         </div>
       </div>
-      <div id="gFooter">
+      <div id="g-footer">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="gCredits">
+        <ul id="g-credits">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 155c8d16..5e79add6 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="gPager">
+<ul class="g-pager">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
@@ -24,7 +24,7 @@
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? endif ?>
   </li>
-  <li class="gInfo"><?= $from_to_msg ?></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">
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index def3d8b7..497c61bc 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -4,7 +4,7 @@
 <!-- Use javascript to show the full size as an overlay on the current page -->
 <script>
   $(document).ready(function() {
-    $(".gFullSizeLink").click(function() {
+    $(".g-fullsize-link").click(function() {
       $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
@@ -12,10 +12,10 @@
 </script>
 <? endif ?>
 
-<div id="gItem">
+<div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="gPager">
+  <ul class="g-pager">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
@@ -25,7 +25,7 @@
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? endif; ?>
     </li>
-    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></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">
@@ -37,20 +37,20 @@
     </li>
   </ul>
 
-  <div id="gPhoto">
+  <div id="g-photo">
     <?= $theme->resize_top($item) ?>
     <? if (access::can("view_full", $item)): ?>
-    <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>">
+    <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
       <? endif ?>
-      <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
+      <?= $item->resize_img(array("id" => "g-photoId-{$item->id}", "class" => "g-resize")) ?>
       <? if (access::can("view_full", $item)): ?>
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
+    <?= $theme->context_menu($item, "#g-photoId-{$item->id}") ?>
   </div>
 
-  <div id="gInfo">
+  <div id="g-info">
     <h1><?= html::purify($item->title) ?></h1>
     <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
index 04379eb6..d2551c52 100644
--- a/themes/wind/views/sidebar.html.php
+++ b/themes/wind/views/sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
-<div class="gToolbar">
-  <div id="gViewMenu" class="gButtonSet">
+<div class="g-toolbar">
+  <div id="g-view-menu" class="g-buttonset">
     <? if ($page_type == "album"):?>
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>
-- 
cgit v1.2.3


From d581bbbd1eaeb242b7279e5a6d75f015dd5a5e6f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 4 Oct 2009 15:53:00 -0600
Subject: Renamed more CSS selectors from gName to g-name.

---
 lib/gallery.common.js                                    |  2 +-
 modules/comment/views/admin_comments.html.php            |  4 ++--
 modules/gallery/tests/selenium/Add_Comment.html          |  2 +-
 modules/gallery/tests/xss_data.txt                       |  2 +-
 modules/gallery/views/admin_theme_options.html.php       |  2 +-
 modules/gallery/views/welcome_message_loader.html.php    |  4 ++--
 modules/organize/css/organize.css                        | 14 +++++++-------
 modules/organize/js/organize.js                          | 14 +++++++-------
 modules/organize/views/organize_dialog.html.php          | 12 ++++++------
 modules/server_add/controllers/admin_server_add.php      |  2 +-
 modules/server_add/js/server_add.js                      |  2 +-
 modules/server_add/views/server_add_tree_dialog.html.php |  2 +-
 modules/user/helpers/user_block.php                      |  2 +-
 modules/user/views/login.html.php                        |  2 +-
 themes/admin_wind/views/admin.html.php                   |  2 +-
 themes/wind/views/album.html.php                         |  4 ++--
 themes/wind/views/dynamic.html.php                       |  6 +++---
 themes/wind/views/photo.html.php                         |  4 ++--
 18 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index f2de74ad..4ac6de70 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -89,7 +89,7 @@
    */
   $.fn.gallery_get_photo = function() {
     var photo = $(this).find("img").filter(function() {
-      return this.id.match(/g-photoId-\d+/);
+      return this.id.match(/g-photo-id-\d+/);
     });
     return photo;
   };
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 0e8dd525..62c64d12 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -90,7 +90,7 @@
   </div>
   <? endif ?>
 
-  <table id="g-admin-commentsList">
+  <table id="g-admin-comments-list">
     <tr>
       <th>
         <?= t("Author") ?>
@@ -192,7 +192,7 @@
     <? endforeach ?>
   </table>
 
-  <div class="pager">
+  <div class="g-pager">
     <?= $pager ?>
   </div>
 </div>
diff --git a/modules/gallery/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html
index dff653da..054e7597 100644
--- a/modules/gallery/tests/selenium/Add_Comment.html
+++ b/modules/gallery/tests/selenium/Add_Comment.html
@@ -18,7 +18,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>g-photoId-2</td>
+	<td>g-photo-id-2</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index c8ba3770..eaa8c99c 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -344,4 +344,4 @@ themes/wind/views/photo.html.php                             8   DIRTY_JS $theme
 themes/wind/views/photo.html.php                             21  DIRTY_JS $previous_item->url()
 themes/wind/views/photo.html.php                             31  DIRTY_JS $next_item->url()
 themes/wind/views/photo.html.php                             43  DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php                             45  DIRTY    $item->resize_img(array("id"=>"g-photoId-{$item->id}","class"=>"g-resize"))
+themes/wind/views/photo.html.php                             45  DIRTY    $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index ed091d4b..e09be728 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-themeOptions">
+<div id="g-admin-theme-options">
   <h1> <?= t("Theme Options") ?> </h1>
 
   <?= $form ?>
diff --git a/modules/gallery/views/welcome_message_loader.html.php b/modules/gallery/views/welcome_message_loader.html.php
index 818e2072..d1ff2f3f 100644
--- a/modules/gallery/views/welcome_message_loader.html.php
+++ b/modules/gallery/views/welcome_message_loader.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<span id="g-welcome-messageLink"
+<span id="g-welcome-message-link"
       title="<?= t("Welcome to Gallery 3")->for_html_attr() ?>"
       href="<?= url::site("welcome_message") ?>"/>
 <script type="text/javascript">
-  $(document).ready(function(){$("#g-welcome-messageLink").gallery_dialog({immediate: true});});
+  $(document).ready(function(){$("#g-welcome-message-link").gallery_dialog({immediate: true});});
 </script>
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index fbf3c383..afa89229 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -24,7 +24,7 @@
   white-space: nowrap;
 }
 
-#g-organizeDetail {
+#g-organize-detail {
   height: 100%;
 }
 
@@ -36,20 +36,20 @@
 /*******************************************************************
  * Album Tree styles
  */
-#g-organizeTreeContainer {
+#g-organize-tree-container {
   height: 100%;
   overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#g-organize-albumTree .selected {
+#g-organize-album-tree .selected {
   background-color: #cfdeff;
   border-bottom: 1px solid #999;
   margin-right: 0px;
 }
 
-#g-organize-albumTree ul li {
+#g-organize-album-tree ul li {
   padding-left: 1.2em;
 }
 
@@ -131,18 +131,18 @@
 /****************************************************************
  * Controls styles
  */
-#g-organizeControls {
+#g-organize-controls {
   padding-left: 8px;
   background-color: #13A;
   color: #ccc;
   width: 100% !important;
 }
 
-#g-organizeControls select {
+#g-organize-controls select {
   display: inline;
 }
 
-#g-organizeClose {
+#g-organize-close {
   float: right;
   margin-right: 12px;
 }
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 960d75e2..d1e9420b 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -110,7 +110,7 @@
 
     _refresh: function(data) {
       if (data.tree) {
-        $("#g-organize-albumTree").html(data.tree);
+        $("#g-organize-album-tree").html(data.tree);
       }
       if (data.grid) {
         $("#g-organize-microthumb-grid").html(data.grid);
@@ -142,14 +142,14 @@
       $("#g-dialog").bind("dialogopen", function(event, ui) {
         $("#g-organize").height($("#g-dialog").innerHeight() - 20);
         $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90);
-        $("#g-organizeTreeContainer").height($("#g-dialog").innerHeight() - 59);
+        $("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 59);
       });
 
       $("#g-dialog").bind("dialogclose", function(event, ui) {
         window.location.reload();
       });
 
-      $("#g-dialog #g-organizeClose").click(function(event) {
+      $("#g-dialog #g-organize-close").click(function(event) {
         $("#g-dialog").dialog("close");
       });
 
@@ -170,7 +170,7 @@
 	.mousemove($.organize.mouse_move_handler);
       $(".g-organize-album").droppable($.organize.branch_droppable);
       $(".g-organize-album-text").click($.organize.show_album);
-      $("#g-organize-albumTree .ui-icon-plus,#g-organize-albumTree .ui-icon-minus").click($.organize.toggle_branch);
+      $("#g-organize-album-tree .ui-icon-plus,#g-organize-album-tree .ui-icon-minus").click($.organize.toggle_branch);
     },
 
     toggle_branch: function(event) {
@@ -207,13 +207,13 @@
       if ($(event.currentTarget).hasClass("selected")) {
         return;
       }
-      var parent = $(event.currentTarget).parents(".g-organizeBranch");
+      var parent = $(event.currentTarget).parents(".g-organize-branch");
       if ($(parent).hasClass("g-view-only")) {
         return;
       }
       $("#g-organize-microthumb-panel").selectable("destroy");
       var id = $(event.currentTarget).attr("ref");
-      $("#g-organize-albumTree .selected").removeClass("selected");
+      $("#g-organize-album-tree .selected").removeClass("selected");
       $(".g-organize-album-text[ref=" + id + "]").addClass("selected");
       var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
       $.get(url, {},
@@ -231,7 +231,7 @@
      */
     resort: function(column, dir) {
       var url = sort_order_url
-        .replace("__ALBUM_ID__", $("#g-organize-albumTree .selected").attr("ref"))
+        .replace("__ALBUM_ID__", $("#g-organize-album-tree .selected").attr("ref"))
         .replace("__COL__", column)
         .replace("__DIR__", dir);
       $.get(url, {},
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 858c794c..dc627d10 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -16,21 +16,21 @@
         <div class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
       </div>
     </div>
-    <div id="g-organizeContentPane" class="yui-gf">
-      <div id="g-organizeTreeContainer" class="yui-u first">
-        <ul id="g-organize-albumTree">
+    <div id="g-organize-content-pane" class="yui-gf">
+      <div id="g-organize-tree-container" class="yui-u first">
+        <ul id="g-organize-album-tree">
           <?= $album_tree ?>
         </ul>
       </div>
-      <div id="g-organizeDetail" class="yui-u">
+      <div id="g-organize-detail" class="yui-u">
         <div id="g-organize-microthumb-panel"
              ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
           <ul id="g-organize-microthumb-grid">
             <?= $micro_thumb_grid ?>
           </ul>
         </div>
-        <div id="g-organizeControls">
-          <a id="g-organizeClose" href="#" ref="done"
+        <div id="g-organize-controls">
+          <a id="g-organize-close" href="#" ref="done"
              class="g-button ui-corner-all ui-state-default"><?= t("Close") ?></a>
           <form>
             <?= t("Sort order") ?>
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 098f6f71..837a2c00 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   private function _get_admin_form() {
     $form = new Forge("admin/server_add/add_path", "", "post",
-                      array("id" => "g-server-add-adminForm"));
+                      array("id" => "g-server-add-admin-form"));
     $add_path = $form->group("add_path");
     $add_path->input("path")->label(t("Path"))->rules("required")
       ->error_messages("not_readable", t("This directory is not readable by the webserver"))
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index a2a831c9..02dda4c0 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -20,7 +20,7 @@
          $("#g-server-add-continue-button", this.element).hide();
          self.run_add();
        });
-       $("#g-server-addCloseButton", this.element).click(function(event) {
+       $("#g-server-add-close-button", this.element).click(function(event) {
          $("#g-dialog").dialog("close");
          window.location.reload();
        });
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 31648a70..cd3b09cc 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -40,7 +40,7 @@
       <?= t("Continue") ?>
     </button>
 
-    <button id="g-server-addCloseButton" class="ui-state-default ui-corner-all">
+    <button id="g-server-add-close-button" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>
diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php
index f1f8e5eb..f920b4c5 100644
--- a/modules/user/helpers/user_block.php
+++ b/modules/user/helpers/user_block.php
@@ -32,7 +32,7 @@ class user_block_Core {
       }
       if (count($locales) > 1) {
         $block = new Block();
-        $block->css_id = "g-userLanguageBlock";
+        $block->css_id = "g-user-language-block";
         $block->title = t("Language Preference");
         $block->content = new View("user_languages_block.html");
         $block->content->installed_locales =
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 65eaab8c..049ba043 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -16,7 +16,7 @@
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
-       id="g-logoutLink"><?= t("Logout") ?></a>
+       id="g-logout-link"><?= t("Logout") ?></a>
   </li>
   <? endif ?>
 </ul>
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 5b2d41ad..fc86e1c9 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -45,7 +45,7 @@
         <?= $theme->admin_header_top() ?>
         <ul id="g-login-menu">
           <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="g-logoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
+          <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 57760de4..5d928b2e 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -13,13 +13,13 @@
     <? if ($child->is_album()): ?>
       <? $item_class = "g-album"; ?>
     <? endif ?>
-  <li id="g-itemId-<?= $child->id ?>" class="g-item <?= $item_class ?>">
+  <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
       <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child, "#g-itemId-{$child->id} .g-thumbnail") ?>
+    <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
     <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php
index 9d50f8a8..aa347402 100644
--- a/themes/wind/views/dynamic.html.php
+++ b/themes/wind/views/dynamic.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-albumHeader">
-  <div id="g-albumHeaderButtons">
+<div id="g-album-header">
+  <div id="g-album-header-buttons">
     <?= $theme->dynamic_top() ?>
   </div>
   <h1><?= html::clean($title) ?></h1>
@@ -11,7 +11,7 @@
   <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <img id="g-photoId-<?= $child->id ?>" class="g-thumbnail"
+      <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
            alt="photo" src="<?= $child->thumb_url() ?>"
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index 497c61bc..2520cb0c 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -42,12 +42,12 @@
     <? if (access::can("view_full", $item)): ?>
     <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
       <? endif ?>
-      <?= $item->resize_img(array("id" => "g-photoId-{$item->id}", "class" => "g-resize")) ?>
+      <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
       <? if (access::can("view_full", $item)): ?>
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#g-photoId-{$item->id}") ?>
+    <?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
   </div>
 
   <div id="g-info">
-- 
cgit v1.2.3


From 08c01fec6cc590eb578522164de81114b889c4b5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 5 Oct 2009 11:51:08 -0700
Subject: The initial commit of refactoring the user/group adminsitration into
 a driver. Create an Identity library that defines the interface the Gallery3
 expects Move the user and group helpers into the gallery module to provide
 the familiar interface into the Identity library. Create a Gallery Identity
 back-end that is supplied by the user module.

The vision here is that all user and group code that is gallery or ui specific
is contained within the core product.  Anything that relates to manipulating a
user or group is contained in the back end code that can be replaced.
---
 modules/gallery/config/identity.php                |  36 +++
 modules/gallery/helpers/group.php                  | 114 +++++++
 modules/gallery/helpers/user.php                   | 314 ++++++++++++++++++
 modules/gallery/libraries/Identity.php             | 220 +++++++++++++
 modules/gallery/libraries/drivers/Identity.php     | 119 +++++++
 modules/user/helpers/group.php                     | 108 -------
 modules/user/helpers/user.php                      | 360 ---------------------
 .../user/libraries/drivers/Identity/Gallery.php    | 226 +++++++++++++
 8 files changed, 1029 insertions(+), 468 deletions(-)
 create mode 100644 modules/gallery/config/identity.php
 create mode 100644 modules/gallery/helpers/group.php
 create mode 100644 modules/gallery/helpers/user.php
 create mode 100644 modules/gallery/libraries/Identity.php
 create mode 100644 modules/gallery/libraries/drivers/Identity.php
 delete mode 100644 modules/user/helpers/group.php
 delete mode 100644 modules/user/helpers/user.php
 create mode 100644 modules/user/libraries/drivers/Identity/Gallery.php

(limited to 'modules/user')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
new file mode 100644
index 00000000..f2064127
--- /dev/null
+++ b/modules/gallery/config/identity.php
@@ -0,0 +1,36 @@
+<?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.
+ */
+/*
+ * @package  User
+ *
+ * User settings, defined as arrays, or "groups". If no group name is
+ * used when loading the cache library, the group named "default" will be used.
+ *
+ * Each group can be used independently, and multiple groups can be used at once.
+ *
+ * Group Options:
+ *  driver   - User backend driver. Gallery comes with Gallery user driver.
+ *
+ *  params   - Driver parameters, specific to each driver.
+ */
+$config["default"] = array (
+  "driver"   => "gallery",
+  "params"   => array(),
+);
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
new file mode 100644
index 00000000..e0182f9f
--- /dev/null
+++ b/modules/gallery/helpers/group.php
@@ -0,0 +1,114 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling groups.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class group_Core {
+  static function get_edit_form_admin($group) {
+    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
+    $form_group = $form->group("edit_group")->label(t("Edit Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Save"));
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  static function get_add_form_admin() {
+    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
+    $form->set_attr('class', "g-narrow");
+    $form_group = $form->group("add_group")->label(t("Add Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name");
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Add Group"));
+    $group = ORM::factory("group");
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  static function get_delete_form_admin($group) {
+    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
+                      array("id" => "g-delete-group-form"));
+    $form_group = $form->group("delete_group")->label(
+      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
+    $form_group->submit("")->value(t("Delete"));
+    return $form;
+  }
+
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Core
+   */
+  static function create($name) {
+    return Identity::instance()->create_group($name);
+  }
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Core
+   */
+  static function everybody() {
+    return Identity::instance()->everybody();
+  }
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Core
+   */
+  static function registered_users() {
+    return Identity::instance()->everybody();
+  }
+
+  /**
+   * Look up a group by id.
+   * @param integer      $id the user id
+   * @return Group_Model  the group object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return Identity::instance()->lookup_group($id);
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Core  the group object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return Identity::instance()->lookup_group_by_name($name);
+  }
+
+  /**
+   * List the groups
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  static function groups($filter=array()) {
+    return Identity::instance()->list_groups($filter);
+  }
+}
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
new file mode 100644
index 00000000..d859d9bd
--- /dev/null
+++ b/modules/gallery/helpers/user.php
@@ -0,0 +1,314 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling users.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class user_Core {
+  static function get_edit_form($user) {
+    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "g-edit-user-form"));
+    $form->set_attr("class", "g-narrow");
+    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $form->add_rules_from($user);
+
+    module::event("user_edit_form", $user, $form);
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
+
+  static function get_edit_form_admin($user) {
+    $form = new Forge(
+      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
+    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
+    $group->inputs["name"]->error_messages(
+      "in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
+    $form->add_rules_from($user);
+    $form->edit_user->password->rules("-required");
+
+    module::event("user_edit_form_admin", $user, $form);
+    $group->submit("")->value(t("Modify User"));
+    return $form;
+  }
+
+  static function get_add_form_admin() {
+    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
+    $form->set_attr('class', "g-narrow");
+    $group = $form->group("add_user")->label(t("Add User"));
+    $group->input("name")->label(t("Username"))->id("g-username")
+      ->error_messages("in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email");
+    $group->input("url")->label(t("URL"))->id("g-url");
+    self::_add_locale_dropdown($group);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
+    $user = ORM::factory("user");
+    $form->add_rules_from($user);
+
+    module::event("user_add_form_admin", $user, $form);
+    $group->submit("")->value(t("Add User"));
+    return $form;
+  }
+
+  private static function _add_locale_dropdown(&$form, $user=null) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      // Put "none" at the first position in the array
+      $locales = array_merge(array("" => t("« none »")), $locales);
+      $selected_locale = ($user && $user->locale) ? $user->locale : "";
+      $form->dropdown("locale")
+        ->label(t("Language Preference"))
+        ->options($locales)
+        ->selected($selected_locale);
+    }
+  }
+
+  static function get_delete_form_admin($user) {
+    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
+                      array("id" => "g-delete-user-form"));
+    $group = $form->group("delete_user")->label(
+      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
+    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
+    return $form;
+  }
+
+  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() {
+    return Session::instance()->get("group_ids", array(1));
+  }
+
+
+  static function cookie_locale() {
+    $cookie_data = Input::instance()->cookie("g_locale");
+    $locale = null;
+    if ($cookie_data) {
+      if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
+        $requested_locale = $matches[1];
+        $installed_locales = locales::installed();
+        if (isset($installed_locales[$requested_locale])) {
+          $locale = $requested_locale;
+        }
+      }
+    }
+    return $locale;
+  }
+
+    /**
+   * 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 = 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 what is user id===2
+    if ($user === 2) {
+      $user = model_cache::get("user", 2);
+      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);
+    }
+  }
+
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return User_Model
+   */
+  static function guest() {
+    return Identity::instance()->guest();
+  }
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Model
+   */
+  static function create($name, $full_name, $password) {
+    return Identity::instance()->create_user($name, $full_name, $password);
+  }
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  static function is_correct_password($user, $password) {
+    return Identity::instance()->is_correct_password($user, $password);
+  }
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  static function hash_password($password) {
+    return Identity::instance()->hash_password($password);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return Identity::instance()->lookup_user($id);
+  }
+
+  /**
+   * Look up a user by name.
+   * @param integer      $id the user name
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return Identity::instance()->lookup_user_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by hash.
+   * @param string       $name the user name
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_hash($hash) {
+    return Identity::instance()->lookup_user_by_field("hash", $hash);
+  }
+
+  /**
+   * List the users
+   * @param mixed      options to apply to the selection of the user(optional)
+   * @return array     the group list.
+   */
+  static function users($filter=array()) {
+    return Identity::instance()->list_users($filter);
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
new file mode 100644
index 00000000..41c25b39
--- /dev/null
+++ b/modules/gallery/libraries/Identity.php
@@ -0,0 +1,220 @@
+<?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.
+ */
+
+/**
+ * Provides a driver-based interface for managing users and groups.
+ */
+class Identity_Core {
+  protected static $instances = array();
+
+  // Configuration
+  protected $config;
+
+  // Driver object
+  protected $driver;
+
+  /**
+   * Returns a singleton instance of Identity.
+   *
+   * @param   string  configuration
+   * @return  Identity_Core
+   */
+  static function & instance($config="default") {
+   if (!isset(Identity::$instances[$config])) {
+      // Create a new instance
+      Identity::$instances[$config] = new Identity($config);
+    }
+
+    return Identity::$instances[$config];
+  }
+
+  /**
+   * Loads the configured driver and validates it.
+   *
+   * @param   array|string  custom configuration or config group name
+   * @return  void
+   */
+  public function __construct($config="default") {
+    if (is_string($config)) {
+      $name = $config;
+
+      // Test the config group name
+      if (($config = Kohana::config('identity.'.$config)) === NULL) {
+        throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
+      }
+
+      if (is_array($config)) {
+        // Append the default configuration options
+        $config += Kohana::config('identity.default');
+      } else {
+        // Load the default group
+        $config = Kohana::config('identity.default');
+      }
+
+      // Cache the config in the object
+      $this->config = $config;
+
+      // Set driver name
+      $driver = 'Identity_'.ucfirst($this->config['driver']).'_Driver';
+
+      // Load the driver
+      if ( ! Kohana::auto_load($driver)) {
+        throw new Kohana_Exception('core.driver_not_found', $this->config['driver'],
+                                   get_class($this));
+      }
+
+      // Initialize the driver
+      $this->driver = new $driver($this->config['params']);
+
+      // Validate the driver
+      if ( !($this->driver instanceof Identity_Driver))
+        throw new Kohana_Exception('core.driver_implements', $this->config['driver'],
+                                   get_class($this), 'Identity_Driver');
+
+      Kohana::log('debug', 'Identity Library initialized');
+    }
+  }
+
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return Identity_Model
+   */
+  public function guest() {
+    return $this->driver->guest();
+  }
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return Identity_Model
+   */
+  public function create_user($name, $full_name, $password) {
+    return $this->driver->create_user($name, $full_name, $password);
+  }
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user Identity Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  public function is_correct_password($user, $password) {
+    return $this->driver->is_correct_password($user, $password);
+  }
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  public function hash_password($password) {
+    return $this->driver->hash_password($password);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return Identity_Model  the user object, or null if the id was invalid.
+   */
+  public function lookup_user($id) {
+    return $this->driver->lookup_user($id);
+  }
+
+  /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return Identity_Model  the user object, or null if the name was invalid.
+   */
+  public function lookup_user_by_field($field_name, $value) {
+    return $this->driver->lookup_user_by_field($field_name, $value);
+  }
+
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  public function create_group($name) {
+    return $this->driver->create_group($name);
+  }
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Model
+   */
+  public function everybody() {
+    return $this->driver->everybody();
+  }
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Model
+   */
+  public function registered_users() {
+    return $this->driver->everybody();
+  }
+
+  /**
+   * Look up a group by id.
+   * @param integer      $id the user id
+   * @return Group_Model  the group object, or null if the id was invalid.
+   */
+  public function lookup_group($id) {
+    return $this->driver->lookup_group($id);
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Model  the group object, or null if the name was invalid.
+   */
+  public function lookup_group_by_name($name) {
+    return $this->driver->lookup_group_by_name($name);
+  }
+
+  /**
+   * List the users
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_users($filter=array()) {
+    return $this->driver->list_users($filter);
+  }
+
+  /**
+   * List the groups
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_groups($filter=array()) {
+    return $this->driver->list_groups($filter);
+  }
+} // End Identity
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
new file mode 100644
index 00000000..13af4583
--- /dev/null
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -0,0 +1,119 @@
+<?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.
+ */
+interface Identity_Driver {
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return User_Model
+   */
+  public function guest();
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Core
+   */
+  public function create_user($name, $full_name, $password);
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  public function is_correct_password($user, $password);
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  public function hash_password($password);
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Core  the user object, or null if the id was invalid.
+   */
+  public function lookup_user($id);
+
+  /**
+   * Look up a user by name.
+   * @param string      search field
+   * @param string      search value
+   * @return User_Core  the user object, or null if the name was invalid.
+   */
+  public function lookup_user_by_field($field, $value);
+
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  public function create_group($name);
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Model
+   */
+  public function everybody();
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Model
+   */
+  public function registered_users();
+
+  /**
+   * Look up a group by id.
+   * @param integer      $id the user id
+   * @return Group_Model  the group object, or null if the id was invalid.
+   */
+  public function lookup_group($id);
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Model  the group object, or null if the name was invalid.
+   */
+  public function lookup_group_by_name($name);
+
+  /**
+   * List the users
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_users($filter=array());
+
+  /**
+   * List the groups
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_groups($filter=array());
+} // End User Driver
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
deleted file mode 100644
index b13895bc..00000000
--- a/modules/user/helpers/group.php
+++ /dev/null
@@ -1,108 +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.
- */
-
-/**
- * This is the API for handling groups.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class group_Core {
-  /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Model
-   */
-  static function create($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
-      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
-    }
-
-    $group->name = $name;
-    $group->save();
-
-    return $group;
-  }
-
-  /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Model
-   */
-  static function everybody() {
-    return model_cache::get("group", 1);
-  }
-
-  /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Model
-   */
-  static function registered_users() {
-    return model_cache::get("group", 2);
-  }
-
-  /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Model  the group object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    $group = model_cache::get("group", $name, "name");
-    if ($group->loaded) {
-      return $group;
-    }
-    return null;
-  }
-
-  static function get_edit_form_admin($group) {
-    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
-    $form_group = $form->group("edit_group")->label(t("Edit Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-narrow");
-    $form_group = $form->group("add_group")->label(t("Add Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name");
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Add Group"));
-    $group = ORM::factory("group");
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_delete_form_admin($group) {
-    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
-                      array("id" => "g-delete-group-form"));
-    $form_group = $form->group("delete_group")->label(
-      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
-    $form_group->submit("")->value(t("Delete"));
-    return $form;
-  }
-}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
deleted file mode 100644
index 6ae9203d..00000000
--- a/modules/user/helpers/user.php
+++ /dev/null
@@ -1,360 +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.
- */
-
-/**
- * This is the API for handling users.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class user_Core {
-  static function get_edit_form($user) {
-    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "g-edit-user-form"));
-    $form->set_attr("class", "g-narrow");
-    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
-
-    module::event("user_edit_form", $user, $form);
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
-  static function get_edit_form_admin($user) {
-    $form = new Forge(
-      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $group = $form->group("edit_user")->label(t("Edit User"));
-    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
-    $group->inputs["name"]->error_messages(
-      "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
-
-    module::event("user_edit_form_admin", $user, $form);
-    $group->submit("")->value(t("Modify User"));
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("add_user")->label(t("Add User"));
-    $group->input("name")->label(t("Username"))->id("g-username")
-      ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email");
-    $group->input("url")->label(t("URL"))->id("g-url");
-    self::_add_locale_dropdown($group);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from($user);
-
-    module::event("user_add_form_admin", $user, $form);
-    $group->submit("")->value(t("Add User"));
-    return $form;
-  }
-
-  private static function _add_locale_dropdown(&$form, $user=null) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      // Put "none" at the first position in the array
-      $locales = array_merge(array("" => t("« none »")), $locales);
-      $selected_locale = ($user && $user->locale) ? $user->locale : "";
-      $form->dropdown("locale")
-        ->label(t("Language Preference"))
-        ->options($locales)
-        ->selected($selected_locale);
-    }
-  }
-
-  static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
-                      array("id" => "g-delete-user-form"));
-    $group = $form->group("delete_user")->label(
-      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
-    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
-    return $form;
-  }
-
-  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;
-  }
-
-  /**
-   * 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 = user::guest());
-    }
-
-    // The installer cannot set a user into the session, so it just sets an id which we should
-    // upconvert into a user.
-    if ($user === 2) {
-      $user = model_cache::get("user", 2);
-      user::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);
-    }
-  }
-
-  /**
-   * Return the array of group ids this user belongs to
-   *
-   * @return array
-   */
-  static function group_ids() {
-    return Session::instance()->get("group_ids", array(1));
-  }
-
-  /**
-   * 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 = user::guest();
-    }
-    return $user;
-  }
-
-  /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return User_Model
-   */
-  static function guest() {
-    return model_cache::get("user", 1);
-  }
-
-  /**
-   * 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();
-  }
-
-  /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
-   */
-  static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
-      throw new Exception("@todo USER_ALREADY_EXISTS $name");
-    }
-
-    $user->name = $name;
-    $user->full_name = $full_name;
-    $user->password = $password;
-
-    // Required groups
-    $user->add(group::everybody());
-    $user->add(group::registered_users());
-
-    $user->save();
-    return $user;
-  }
-
-  /**
-   * Is the password provided correct?
-   *
-   * @param user User Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
-   */
-  static function is_correct_password($user, $password) {
-    $valid = $user->password;
-
-    // Try phpass first, since that's what we generate.
-    if (strlen($valid) == 34) {
-      require_once(MODPATH . "user/lib/PasswordHash.php");
-      $hashGenerator = new PasswordHash(10, true);
-      return $hashGenerator->CheckPassword($password, $valid);
-    }
-
-    $salt = substr($valid, 0, 4);
-    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
-    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
-    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
-          : ($salt . md5($salt . $sanitizedPassword));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
-   */
-  static function hash_password($password) {
-    require_once(MODPATH . "user/lib/PasswordHash.php");
-    $hashGenerator = new PasswordHash(10, true);
-    return $hashGenerator->HashPassword($password);
-  }
-
-  /**
-   * Log in as a given user.
-   * @param object $user the user object.
-   */
-  static function login($user) {
-    $user->login_count += 1;
-    $user->last_login = time();
-    $user->save();
-
-    user::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 = user::active();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    $user = model_cache::get("user", $id);
-    if ($user->loaded) {
-      return $user;
-    }
-    return null;
-  }
-
-  /**
-   * Look up a user by name.
-   * @param integer      $id the user name
-   * @return User_Model  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    $user = model_cache::get("user", $name, "name");
-    if ($user->loaded) {
-      return $user;
-    }
-    return null;
-  }
-
-  /**
-   * Create a hashed password using md5 plus salt.
-   * @param string $password plaintext password
-   * @param string $salt (optional) salt or hash containing salt (randomly generated if omitted)
-   * @return string hashed password
-   */
-  private static function _md5Salt($password, $salt="") {
-    if (empty($salt)) {
-      for ($i = 0; $i < 4; $i++) {
-        $char = mt_rand(48, 109);
-        $char += ($char > 90) ? 13 : ($char > 57) ? 7 : 0;
-        $salt .= chr($char);
-      }
-    } else {
-      $salt = substr($salt, 0, 4);
-    }
-    return $salt . md5($salt . $password);
-  }
-
-  static function cookie_locale() {
-    $cookie_data = Input::instance()->cookie("g_locale");
-    $locale = null;
-    if ($cookie_data) {
-      if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
-        $requested_locale = $matches[1];
-        $installed_locales = locales::installed();
-        if (isset($installed_locales[$requested_locale])) {
-          $locale = $requested_locale;
-        }
-      }
-    }
-    return $locale;
-  }
-}
\ No newline at end of file
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
new file mode 100644
index 00000000..83f553c1
--- /dev/null
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -0,0 +1,226 @@
+<?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.
+ */
+/*
+ * Based on the Cache_Sqlite_Driver developed by the Kohana Team
+ */
+class Identity_Gallery_Driver implements Identity_Driver {
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return User_Model
+   */
+  public function guest() {
+    return model_cache::get("user", 1);
+  }
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Model
+   */
+  public function create_user($name, $full_name, $password) {
+    $user = ORM::factory("user")->where("name", $name)->find();
+    if ($user->loaded) {
+      throw new Exception("@todo USER_ALREADY_EXISTS $name");
+    }
+
+    $user->name = $name;
+    $user->full_name = $full_name;
+    $user->password = $password;
+
+    // Required groups
+    $user->add(group::everybody());
+    $user->add(group::registered_users());
+
+    $user->save();
+    return $user;
+  }
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  public function is_correct_password($user, $password) {
+    $valid = $user->password;
+
+    // Try phpass first, since that's what we generate.
+    if (strlen($valid) == 34) {
+      require_once(MODPATH . "user/lib/PasswordHash.php");
+      $hashGenerator = new PasswordHash(10, true);
+      return $hashGenerator->CheckPassword($password, $valid);
+    }
+
+    $salt = substr($valid, 0, 4);
+    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
+    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
+    $sanitizedPassword = html::specialchars($password, false);
+    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
+          : ($salt . md5($salt . $sanitizedPassword));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  public function hash_password($password) {
+    require_once(MODPATH . "user/lib/PasswordHash.php");
+    $hashGenerator = new PasswordHash(10, true);
+    return $hashGenerator->HashPassword($password);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  public function lookup_user($id) {
+    $user = model_cache::get("user", $id);
+    if ($user->loaded) {
+      return $user;
+    }
+    return null;
+  }
+
+  /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return User_Core  the user object, or null if the name was invalid.
+   */
+  public function lookup_user_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("user", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  public function create_group($name) {
+    $group = ORM::factory("group")->where("name", $name)->find();
+    if ($group->loaded) {
+      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
+    }
+
+    $group->name = $name;
+    $group->save();
+
+    return $group;
+  }
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Model
+   */
+  public function everybody() {
+    return model_cache::get("group", 1);
+  }
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Model
+   */
+  public function registered_users() {
+    return model_cache::get("group", 2);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  public function lookup_group($id) {
+    $group = model_cache::get("group", $id);
+    if ($group->loaded) {
+      return $group;
+    }
+    return null;
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Model  the group object, or null if the name was invalid.
+   */
+  public function lookup_group_by_name($name) {
+    try {
+      $group = model_cache::get("group", $name, "name");
+      if ($group->loaded) {
+        return $group;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * List the users
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_users($filter=array()) {
+    return ORM::factory("user")->orderby("name")->find_all();
+  }
+
+
+  /**
+   * List the groups
+   * @param mixed      options to apply to the selection of the user
+   * @return array     the group list.
+   */
+  public function list_groups($filter=array()) {
+    return ORM::factory("group")->orderby("name")->find_all();
+  }
+} // End Identity Gallery Driver
\ No newline at end of file
-- 
cgit v1.2.3


From 194cc3b27a73afe5119da9f09407c1e068dc6fa3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 5 Oct 2009 14:04:27 -0700
Subject: First pass on converting calls to the Identity interface. Will worry
 about writes and saves later. Convert the Admin_User controller Convert the
 login and password change controller Change the item model to call
 user::lookup to get the owner. On the log model, delete the relationship
 between the log and user table, and replace with a call to user::lookup

---
 modules/gallery/models/item.php          |  2 +-
 modules/gallery/models/log.php           | 17 ++++++++-
 modules/user/controllers/admin_users.php | 65 +++++++++++++++-----------------
 modules/user/controllers/login.php       |  5 +--
 modules/user/controllers/password.php    | 15 +++-----
 5 files changed, 55 insertions(+), 49 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 246d5fcd..5d356841 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -332,7 +332,7 @@ class Item_Model extends ORM_MPTT {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return model_cache::get("user", $this->owner_id);
+        return user::lookup($this->owner_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index 6734afb8..d143d7bd 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -18,5 +18,20 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Log_Model extends ORM {
-  protected $has_one = array("user");
+  /**
+   * @see ORM::__get()
+   */
+  public function __get($column) {
+    if ($column == "user") {
+      // This relationship depends on an outside module, which may not be present so handle
+      // failures gracefully.
+      try {
+        return user::lookup($this->user_id);
+      } catch (Exception $e) {
+        return null;
+      }
+    } else {
+      return parent::__get($column);
+    }
+  }
 }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 0b748955..c405c5e7 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,8 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->users = ORM::factory("user")->orderby("name")->find_all();
-    $view->content->groups = ORM::factory("group")->orderby("name")->find_all();
+    $view->content->users = user::users(array("orderby" => array("name")));
+    $view->content->groups = group::groups(array("orderby" => array("name")));
     print $view;
   }
 
@@ -32,8 +32,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form = user::get_add_form_admin();
     $valid = $form->validate();
     $name = $form->add_user->inputs["name"]->value;
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
+    if ($user = user::lookup_by_name($name)) {
       $form->add_user->inputs["name"]->add_error("in_use", 1);
       $valid = false;
     }
@@ -70,8 +69,8 @@ class Admin_Users_Controller extends Admin_Controller {
       access::forbidden();
     }
 
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -91,8 +90,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function delete_user_form($id) {
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
     print user::get_delete_form_admin($user);
@@ -101,8 +100,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_user($id) {
     access::verify_csrf();
 
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -110,12 +109,9 @@ class Admin_Users_Controller extends Admin_Controller {
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->edit_user->inputs["name"]->value;
+      $temp_user = user::lookup_by_name($new_name);
       if ($new_name != $user->name &&
-          ORM::factory("user")
-          ->where("name", $new_name)
-          ->where("id !=", $user->id)
-          ->find()
-          ->loaded) {
+          ($temp_user && $temp_user->id != $user->id)) {
         $form->edit_user->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       } else {
@@ -151,8 +147,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function edit_user_form($id) {
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -166,23 +162,23 @@ class Admin_Users_Controller extends Admin_Controller {
 
   public function add_user_to_group($user_id, $group_id) {
     access::verify_csrf();
-    $group = ORM::factory("group", $group_id);
-    $user = ORM::factory("user", $user_id);
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
     $group->add($user);
     $group->save();
   }
 
   public function remove_user_from_group($user_id, $group_id) {
     access::verify_csrf();
-    $group = ORM::factory("group", $group_id);
-    $user = ORM::factory("user", $user_id);
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
     $group->remove($user);
     $group->save();
   }
 
   public function group($group_id) {
     $view = new View("admin_users_group.html");
-    $view->group = ORM::factory("group", $group_id);
+    $view->group = group::lookup($group_id);
     print $view;
   }
 
@@ -193,8 +189,8 @@ class Admin_Users_Controller extends Admin_Controller {
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->add_group->inputs["name"]->value;
-      $group = ORM::factory("group")->where("name", $new_name)->find();
-      if ($group->loaded) {
+      $group = group::lookup_by_name($new_name);
+      if (!empty($group)) {
         $form->add_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       }
@@ -219,8 +215,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_group($id) {
     access::verify_csrf();
 
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
 
@@ -240,19 +236,20 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function delete_group_form($id) {
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
+
     print group::get_delete_form_admin($group);
   }
 
   public function edit_group($id) {
     access::verify_csrf();
 
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
-      kohana::show_404();
+    $group = group::lookup($id);
+    if (empty($group)) {
+       kohana::show_404();
     }
 
     $form = group::get_edit_form_admin($group);
@@ -260,7 +257,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     if ($valid) {
       $new_name = $form->edit_group->inputs["name"]->value;
-      $group = ORM::factory("group")->where("name", $new_name)->find();
+      $group = group::lookup_by_name($name);
       if ($group->loaded) {
         $form->edit_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
@@ -282,8 +279,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function edit_group_form($id) {
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
 
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 8bee7db5..2c4bd557 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -53,13 +53,12 @@ class Login_Controller extends Controller {
       print $form;
     }
   }
-
   private function _auth($url) {
     $form = user::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
-      $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
-      if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
+      $user = user::lookup_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
         log::warning(
           "user",
           t("Failed login for %name",
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 4629bbf2..817ff01c 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -32,10 +32,8 @@ class Password_Controller extends Controller {
     if (request::method() == "post") {
       $this->_change_password();
     } else {
-      $user = ORM::factory("user")
-        ->where("hash", Input::instance()->get("key"))
-        ->find();
-      if ($user->loaded) {
+      $user = user::lookyp_by_hash(Input::instance()->get("key"));
+      if (!empty($user)) {
         print $this->_new_password_form($user->hash);
       } else {
         throw new Exception("@todo FORBIDDEN", 503);
@@ -48,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = ORM::factory("user")->where("name", $form->reset->inputs["name"]->value)->find();
+      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
@@ -118,11 +116,8 @@ class Password_Controller extends Controller {
   private function _change_password() {
     $view = $this->_new_password_form();
     if ($view->content->validate()) {
-      $user = ORM::factory("user")
-        ->where("hash", $view->content->reset->hash->value)
-        ->find();
-
-      if (!$user->loaded) {
+      $user = user::lookyp_by_hash(Input::instance()->get("key"));
+      if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
 
-- 
cgit v1.2.3


From ca17727478b44b8bec6bb7f8ed1c8c688818b8f6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 5 Oct 2009 17:08:27 -0700
Subject: Access the form validation rules via the API for groups and users

---
 modules/gallery/helpers/group.php                   | 13 +++++++++++--
 modules/gallery/helpers/user.php                    | 17 ++++++++++++-----
 modules/gallery/libraries/Identity.php              | 10 ++++++++++
 modules/gallery/libraries/drivers/Identity.php      |  8 ++++++++
 modules/user/libraries/drivers/Identity/Gallery.php | 10 ++++++++++
 5 files changed, 51 insertions(+), 7 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index e0182f9f..074a7b83 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -31,7 +31,7 @@ class group_Core {
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
+    $form->add_rules_from(self::get_edit_rules());
     return $form;
   }
 
@@ -44,7 +44,7 @@ class group_Core {
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Add Group"));
     $group = ORM::factory("group");
-    $form->add_rules_from($group);
+    $form->add_rules_from(self::get_edit_rules());
     return $form;
   }
 
@@ -111,4 +111,13 @@ class group_Core {
   static function groups($filter=array()) {
     return Identity::instance()->list_groups($filter);
   }
+
+  /**
+   * Return the edit rules associated with an group.
+   *
+   * @return stdClass containing the rules
+   */
+  static function get_edit_rules() {
+    return Identity::instance()->get_edit_rules("group");
+  }
 }
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index d859d9bd..2044964f 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -35,7 +35,7 @@ class user_Core {
       ->matches($group->password);
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
+    $form->add_rules_from(self::get_edit_rules());
 
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
@@ -57,8 +57,7 @@ class user_Core {
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
+    $form->add_rules_from(self::get_edit_rules());
 
     module::event("user_edit_form_admin", $user, $form);
     $group->submit("")->value(t("Modify User"));
@@ -79,8 +78,7 @@ class user_Core {
     $group->input("url")->label(t("URL"))->id("g-url");
     self::_add_locale_dropdown($group);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from($user);
+    $form->add_rules_from(self::get_edit_rules());
 
     module::event("user_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
@@ -311,4 +309,13 @@ class user_Core {
   static function users($filter=array()) {
     return Identity::instance()->list_users($filter);
   }
+
+  /**
+   * Return the edit rules associated with an user.
+   *
+   * @return stdClass containing the rules
+   */
+  static function get_edit_rules() {
+    return Identity::instance()->get_edit_rules("user");
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 41c25b39..5e6f4217 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -217,4 +217,14 @@ class Identity_Core {
   public function list_groups($filter=array()) {
     return $this->driver->list_groups($filter);
   }
+
+  /**
+   * Return the edit rules associated with an group.
+   *
+   * @param  string   $object_type to return rules for ("user"|"group")
+   * @return stdClass containing the rules
+   */
+  public function get_edit_rules($object_type) {
+    return $this->driver->get_edit_rules($object_type);
+  }
 } // End Identity
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 13af4583..65a3891c 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -116,4 +116,12 @@ interface Identity_Driver {
    * @return array     the group list.
    */
   public function list_groups($filter=array());
+
+  /**
+   * Return the edit rules associated with an group.
+   *
+   * @param  string   $object_type to return rules for ("user"|"group")
+   * @return stdClass containing the rules
+   */
+  public function get_edit_rules($object_type);
 } // End User Driver
\ No newline at end of file
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 83f553c1..ab162a4c 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -223,4 +223,14 @@ class Identity_Gallery_Driver implements Identity_Driver {
   public function list_groups($filter=array()) {
     return ORM::factory("group")->orderby("name")->find_all();
   }
+
+  /**
+   * Return the edit rules associated with an group.
+   *
+   * @param  string   $object_type to return rules for ("user"|"group")
+   * @return stdClass containing the rules
+   */
+  public function get_edit_rules($object_type) {
+    return (object)ORM::factory($object_type)->rules;
+  }
 } // End Identity Gallery Driver
\ No newline at end of file
-- 
cgit v1.2.3


From 8285cd58e27dfdc2f013f44c1e69aa82f87b7c83 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 5 Oct 2009 18:10:39 -0700
Subject: Handle the filters on Identity/Gallery::list_users and
 Identity/Gallery::list_groups

---
 modules/gallery/libraries/drivers/Identity.php      |  2 ++
 modules/user/controllers/admin_users.php            |  4 ++--
 modules/user/libraries/drivers/Identity/Gallery.php | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 65a3891c..31bcfe39 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -106,6 +106,7 @@ interface Identity_Driver {
   /**
    * List the users
    * @param mixed      options to apply to the selection of the user
+   *                   @todo Do a longer write up on format of filters (@see Database.php)
    * @return array     the group list.
    */
   public function list_users($filter=array());
@@ -113,6 +114,7 @@ interface Identity_Driver {
   /**
    * List the groups
    * @param mixed      options to apply to the selection of the user
+   *                   @todo Do a longer write up on format of filters (@see Database.php)
    * @return array     the group list.
    */
   public function list_groups($filter=array());
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index c405c5e7..6c72440a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,8 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->users = user::users(array("orderby" => array("name")));
-    $view->content->groups = group::groups(array("orderby" => array("name")));
+    $view->content->users = user::users(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::groups(array("orderby" => array("name" => "ASC")));
     print $view;
   }
 
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index ab162a4c..774ef77c 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -211,7 +211,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_users($filter=array()) {
-    return ORM::factory("user")->orderby("name")->find_all();
+    $user = ORM::factory("user");
+    foreach($filter as $method => $args) {
+      $user->$method($args);
+    }
+
+    return $user->find_all();
   }
 
 
@@ -221,7 +226,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_groups($filter=array()) {
-    return ORM::factory("group")->orderby("name")->find_all();
+    $user = ORM::factory("group");
+    foreach($filter as $method => $args) {
+      $user->$method($args);
+    }
+
+    return $user->find_all();
   }
 
   /**
-- 
cgit v1.2.3


From 6e59de2fb5b379a7a839e27c92f7546ee568cf00 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 6 Oct 2009 07:55:31 -0700
Subject: Change the notification handler to use the Identity API to lookup
 subscribers for event notifications.  This drove out some issues in the
 user::users and group::groups API backend.

---
 modules/notification/helpers/notification.php      | 21 ++++++++-----
 .../user/libraries/drivers/Identity/Gallery.php    | 36 ++++++++++++++--------
 2 files changed, 37 insertions(+), 20 deletions(-)

(limited to 'modules/user')

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 88d92b16..8cf9f428 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -67,15 +67,20 @@ class notification {
   }
 
   static function get_subscribers($item) {
-    // @todo don't access the user table directly
     // @todo only return distinct email addresses
-    $users = ORM::factory("user")
-      ->join("subscriptions", "users.id", "subscriptions.user_id")
-      ->join("items", "subscriptions.item_id", "items.id")
-      ->where("email IS NOT", null)
-      ->where("items.left_ptr <=", $item->left_ptr)
-      ->where("items.right_ptr >", $item->right_ptr)
-      ->find_all();
+    $subscriber_ids = array();
+    foreach (ORM::factory("subscription")
+             ->select("user_id")
+             ->join("items", "subscriptions.item_id", "items.id")
+             ->where("items.left_ptr <=", $item->left_ptr)
+             ->where("items.right_ptr >", $item->right_ptr)
+             ->find_all()
+             ->as_array() as $subscriber) {
+      $subscriber_ids[] = $subscriber->user_id;
+    }
+
+    $users = user::users(array("in" => array("id", $subscriber_ids),
+                               "where" => array("email IS NOT" => null)));
 
     $subscribers = array();
     foreach ($users as $user) {
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 774ef77c..5e201cb7 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -211,12 +211,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_users($filter=array()) {
-    $user = ORM::factory("user");
-    foreach($filter as $method => $args) {
-      $user->$method($args);
-    }
-
-    return $user->find_all();
+    return $this->_do_search("user", $filter);
   }
 
 
@@ -226,12 +221,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_groups($filter=array()) {
-    $user = ORM::factory("group");
-    foreach($filter as $method => $args) {
-      $user->$method($args);
-    }
-
-    return $user->find_all();
+    return $this->_do_search("group", $filter);
   }
 
   /**
@@ -243,4 +233,26 @@ class Identity_Gallery_Driver implements Identity_Driver {
   public function get_edit_rules($object_type) {
     return (object)ORM::factory($object_type)->rules;
   }
+
+  /**
+   * Build the query based on the supplied filters for the specified model.
+   * @param  string   $object_type to return rules for ("user"|"group")
+   * @param  mixed    $filters options to apply to the selection.
+   */
+  private function _do_search($object_type, $filter) {
+    $object = ORM::factory($object_type);
+
+    foreach ($filter as $method => $args) {
+      switch ($method) {
+      case "in":
+        $object->in($args[0], $args[1]);
+        break;
+      default:
+        $object->$method($args);
+      }
+    }
+
+    return $object->find_all();
+  }
+
 } // End Identity Gallery Driver
\ No newline at end of file
-- 
cgit v1.2.3


From c0683845048a0610316b5f3aaa9111793273f420 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 6 Oct 2009 11:20:51 -0700
Subject: Encapsulate the user and group model in Gallery_User and
 Gallery_Group classes which extend the User_Definition and Group_Definition
 classes defined in the Identity API

---
 modules/gallery/libraries/drivers/Identity.php     | 175 ++++++++++++++++++++-
 .../user/libraries/drivers/Identity/Gallery.php    |  87 ++++++++--
 modules/user/models/user.php                       |  21 +--
 3 files changed, 248 insertions(+), 35 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 31bcfe39..558679be 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -126,4 +126,177 @@ interface Identity_Driver {
    * @return stdClass containing the rules
    */
   public function get_edit_rules($object_type);
-} // End User Driver
\ No newline at end of file
+} // End Identity Driver Definition
+
+/**
+ * User Data wrapper
+ */
+abstract class User_Definition {
+  protected $user;
+  public function __get($column) {
+    switch ($column) {
+    case "id":
+    case "name":
+    case "full_name":
+    case "password":
+    case "login_count":
+    case "last_login":
+    case "email":
+    case "admin":
+    case "guest":
+    case "hash":
+    case "url":
+    case "locale":
+      return $this->user->$column;
+    case "hashed_password":
+      throw new Exception("@todo WRITE ONLY FIELD: $column");
+      break;
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  public function __set($column, $value) {
+    switch ($column) {
+    case "id":
+      throw new Exception("@todo READ ONLY FIELD: $column");
+      break;
+    case "name":
+    case "full_name":
+    case "hashed_password":
+    case "password":
+    case "login_count":
+    case "last_login":
+    case "email":
+    case "admin":
+    case "guest":
+    case "hash":
+    case "url":
+    case "locale":
+      return $this->user->$column;
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  public function __isset($column) {
+    return isset($this->user->$column);
+  }
+
+  public function __unset($column) {
+    switch ($column) {
+    case "id":
+      throw new Exception("@todo READ ONLY FIELD: $column");
+      break;
+    case "name":
+    case "full_name":
+    case "password":
+    case "login_count":
+    case "last_login":
+    case "email":
+    case "admin":
+    case "guest":
+    case "hash":
+    case "url":
+    case "locale":
+      unset($this->user->$column);
+      break;
+    case "hashed_password":
+      throw new Exception("@todo WRITE ONLY FIELD: $column");
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  /**
+   * Return a url to the user's avatar image.
+   * @param integer $size the target size of the image (default 80px)
+   * @return string a url
+   */
+  public function avatar_url($size=80, $default=null) {
+    return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
+                   md5($this->user->email), $size, $default ? "&d=" . urlencode($default) : "");
+  }
+
+  /**
+   * Return the best version of the user's name.  Either their specified full name, or fall back
+   * to the user name.
+   * @return string
+   */
+  public function display_name() {
+    return empty($this->user->full_name) ? $this->user->name : $this->user->full_name;
+  }
+
+  public function uncloaked() {
+    return $this->user;
+  }
+
+  abstract public function save();
+  abstract public function delete();
+}
+
+/**
+ * Group Data wrapper
+ */
+abstract class Group_Definition {
+  protected $group;
+
+  public function __get($column) {
+    switch ($column) {
+    case "id":
+    case "name":
+    case "special":
+    case "users":
+      return $this->group->$column;
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  public function __set($column, $value) {
+    switch ($column) {
+    case "id":
+    case "users":
+      throw new Exception("@todo READ ONLY FIELD: $column");
+      break;
+    case "name":
+    case "special":
+      $this->group->$column = $value;
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  public function __isset($column) {
+    return isset($this->group->$column);
+  }
+
+  public function __unset($column) {
+    switch ($column) {
+    case "id":
+    case "users":
+      throw new Exception("@todo READ ONLY FIELD: $column");
+      break;
+    case "name":
+    case "special":
+      unset($this->group->$column);
+    default:
+      throw new Exception("@todo UNSUPPORTED FIELD: $column");
+      break;
+    }
+  }
+
+  public function uncloaked() {
+    return $this->group;
+  }
+
+  abstract public function save();
+  abstract public function delete();
+  abstract public function add($user);
+  abstract public function remove($user);
+}
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 5e201cb7..f8816644 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -29,7 +29,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return User_Model
    */
   public function guest() {
-    return model_cache::get("user", 1);
+    return new Gallery_User(model_cache::get("user", 1));
   }
 
   /**
@@ -51,11 +51,11 @@ class Identity_Gallery_Driver implements Identity_Driver {
     $user->password = $password;
 
     // Required groups
-    $user->add(group::everybody());
-    $user->add(group::registered_users());
+    $user->add($this->everybody()->uncloaked());
+    $user->add($this->registered_users()->uncloaked());
 
     $user->save();
-    return $user;
+    return new Gallery_User($user);
   }
 
   /**
@@ -112,7 +112,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   public function lookup_user($id) {
     $user = model_cache::get("user", $id);
     if ($user->loaded) {
-      return $user;
+      return new Gallery_User($user);
     }
     return null;
   }
@@ -127,7 +127,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
     try {
       $user = model_cache::get("user", $value, $field_name);
       if ($user->loaded) {
-        return $user;
+        return new Gallery_User($user);
       }
     } catch (Exception $e) {
       if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
@@ -152,7 +152,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
     $group->name = $name;
     $group->save();
 
-    return $group;
+    return new Gallery_Group($group);
   }
 
   /**
@@ -161,7 +161,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return Group_Model
    */
   public function everybody() {
-    return model_cache::get("group", 1);
+    return new Gallery_Group(model_cache::get("group", 1));
   }
 
   /**
@@ -170,7 +170,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return Group_Model
    */
   public function registered_users() {
-    return model_cache::get("group", 2);
+    return new Gallery_Group(model_cache::get("group", 2));
   }
 
   /**
@@ -181,7 +181,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   public function lookup_group($id) {
     $group = model_cache::get("group", $id);
     if ($group->loaded) {
-      return $group;
+      return new Gallery_Group($group);
     }
     return null;
   }
@@ -195,7 +195,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
     try {
       $group = model_cache::get("group", $name, "name");
       if ($group->loaded) {
-        return $group;
+        return new Gallery_Group($group);
       }
     } catch (Exception $e) {
       if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
@@ -211,7 +211,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_users($filter=array()) {
-    return $this->_do_search("user", $filter);
+    $results = $this->_do_search("user", $filter);
+    $users = array();
+    foreach ($results->as_array() as $user) {
+      $users[] = new Gallery_User($user);
+    }
+    return $users;
   }
 
 
@@ -221,7 +226,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_groups($filter=array()) {
-    return $this->_do_search("group", $filter);
+    $results = $this->_do_search("group", $filter);
+    $groups = array();
+    foreach ($results->as_array() as $group) {
+      $groups[] = new Gallery_Group($group);
+    }
+    return $groups;
   }
 
   /**
@@ -255,4 +265,53 @@ class Identity_Gallery_Driver implements Identity_Driver {
     return $object->find_all();
   }
 
-} // End Identity Gallery Driver
\ No newline at end of file
+} // End Identity Gallery Driver
+
+/**
+ * User Data wrapper
+ */
+class Gallery_User extends User_Definition {
+  /*
+   *  Not for general user, allows the back-end to easily create the interface object
+   */
+  function __construct($user) {
+    $this->user = $user;
+  }
+
+  public function save() {
+    $this->user->save();
+  }
+
+  public function delete() {
+    $this->user->delete();
+  }
+
+}
+
+/**
+ * Group Data wrapper
+ */
+class Gallery_Group extends Group_Definition {
+  /*
+   *  Not for general user, allows the back-end to easily create the interface object
+   */
+  function __construct($group) {
+    $this->group = $group;
+  }
+
+  public function save() {
+    $this->group->save();
+  }
+
+  public function delete() {
+    $this->group->delete();
+  }
+
+  public function add($user) {
+    $this->group->add($user->uncloaked());
+  }
+
+  public function remove($user) {
+    $this->group->remove($user->uncloaked());
+  }
+}
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 55562f34..1993bd05 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -51,16 +51,6 @@ class User_Model extends ORM {
     module::event("user_deleted", $old);
   }
 
-  /**
-   * Return a url to the user's avatar image.
-   * @param integer $size the target size of the image (default 80px)
-   * @return string a url
-   */
-  public function avatar_url($size=80, $default=null) {
-    return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
-                   md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
-  }
-
   public function save() {
     if (!$this->loaded) {
         $created = 1;
@@ -73,13 +63,4 @@ class User_Model extends ORM {
     }
     return $this;
   }
-
-  /**
-   * Return the best version of the user's name.  Either their specified full name, or fall back
-   * to the user name.
-   * @return string
-   */
-  public function display_name() {
-    return empty($this->full_name) ? $this->name : $this->full_name;
-  }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 7f38d6ff29e3554031496c3f98e357f7a87a2671 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 6 Oct 2009 18:30:11 -0700
Subject: 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.

---
 modules/gallery/controllers/admin_users.php        | 290 +++++++++++++++++++++
 modules/gallery/controllers/login.php              |  81 ++++++
 modules/gallery/controllers/logout.php             |  38 +++
 modules/gallery/controllers/password.php           | 133 ++++++++++
 modules/gallery/controllers/users.php              |  67 +++++
 modules/gallery/helpers/gallery_block.php          |  23 ++
 modules/gallery/helpers/gallery_event.php          |  12 +
 modules/gallery/helpers/gallery_theme.php          |  13 +
 modules/gallery/helpers/locales.php                |  17 ++
 modules/gallery/views/admin_users.html.php         | 128 +++++++++
 modules/gallery/views/admin_users_group.html.php   |  38 +++
 modules/gallery/views/login.html.php               |  22 ++
 modules/gallery/views/login_ajax.html.php          |  43 +++
 modules/gallery/views/reset_password.html.php      |  17 ++
 .../gallery/views/user_languages_block.html.php    |  19 ++
 modules/user/controllers/admin_users.php           | 290 ---------------------
 modules/user/controllers/login.php                 |  81 ------
 modules/user/controllers/logout.php                |  38 ---
 modules/user/controllers/password.php              | 133 ----------
 modules/user/controllers/users.php                 |  67 -----
 modules/user/helpers/user_block.php                |  46 ----
 modules/user/helpers/user_event.php                |  53 ----
 modules/user/helpers/user_theme.php                |  36 ---
 modules/user/views/admin_users.html.php            | 128 ---------
 modules/user/views/admin_users_group.html.php      |  38 ---
 modules/user/views/login.html.php                  |  22 --
 modules/user/views/login_ajax.html.php             |  43 ---
 modules/user/views/reset_password.html.php         |  17 --
 modules/user/views/user_languages_block.html.php   |  19 --
 29 files changed, 941 insertions(+), 1011 deletions(-)
 create mode 100644 modules/gallery/controllers/admin_users.php
 create mode 100644 modules/gallery/controllers/login.php
 create mode 100644 modules/gallery/controllers/logout.php
 create mode 100644 modules/gallery/controllers/password.php
 create mode 100644 modules/gallery/controllers/users.php
 create mode 100644 modules/gallery/views/admin_users.html.php
 create mode 100644 modules/gallery/views/admin_users_group.html.php
 create mode 100644 modules/gallery/views/login.html.php
 create mode 100644 modules/gallery/views/login_ajax.html.php
 create mode 100644 modules/gallery/views/reset_password.html.php
 create mode 100644 modules/gallery/views/user_languages_block.html.php
 delete mode 100644 modules/user/controllers/admin_users.php
 delete mode 100644 modules/user/controllers/login.php
 delete mode 100644 modules/user/controllers/logout.php
 delete mode 100644 modules/user/controllers/password.php
 delete mode 100644 modules/user/controllers/users.php
 delete mode 100644 modules/user/helpers/user_block.php
 delete mode 100644 modules/user/helpers/user_event.php
 delete mode 100644 modules/user/helpers/user_theme.php
 delete mode 100644 modules/user/views/admin_users.html.php
 delete mode 100644 modules/user/views/admin_users_group.html.php
 delete mode 100644 modules/user/views/login.html.php
 delete mode 100644 modules/user/views/login_ajax.html.php
 delete mode 100644 modules/user/views/reset_password.html.php
 delete mode 100644 modules/user/views/user_languages_block.html.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
new file mode 100644
index 00000000..6c72440a
--- /dev/null
+++ b/modules/gallery/controllers/admin_users.php
@@ -0,0 +1,290 @@
+<?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 Admin_Users_Controller extends Admin_Controller {
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_users.html");
+    $view->content->users = user::users(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::groups(array("orderby" => array("name" => "ASC")));
+    print $view;
+  }
+
+  public function add_user() {
+    access::verify_csrf();
+
+    $form = user::get_add_form_admin();
+    $valid = $form->validate();
+    $name = $form->add_user->inputs["name"]->value;
+    if ($user = user::lookup_by_name($name)) {
+      $form->add_user->inputs["name"]->add_error("in_use", 1);
+      $valid = false;
+    }
+
+    if ($valid) {
+      $user = user::create(
+        $name, $form->add_user->full_name->value, $form->add_user->password->value);
+      $user->email = $form->add_user->email->value;
+      $user->admin = $form->add_user->admin->checked;
+
+      if ($form->add_user->locale) {
+        $desired_locale = $form->add_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+      $user->save();
+      module::event("user_add_form_admin_completed", $user, $form);
+
+      message::success(t("Created user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_user_form() {
+    print user::get_add_form_admin();
+  }
+
+  public function delete_user($id) {
+    access::verify_csrf();
+
+    if ($id == user::active()->id || $id == user::guest()->id) {
+      access::forbidden();
+    }
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_delete_form_admin($user);
+    if($form->validate()) {
+      $name = $user->name;
+      $user->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted user %user_name", array("user_name" => $name));
+    log::success("user", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+    print user::get_delete_form_admin($user);
+  }
+
+  public function edit_user($id) {
+    access::verify_csrf();
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->edit_user->inputs["name"]->value;
+      $temp_user = user::lookup_by_name($new_name);
+      if ($new_name != $user->name &&
+          ($temp_user && $temp_user->id != $user->id)) {
+        $form->edit_user->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      } else {
+        $user->name = $new_name;
+      }
+    }
+
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+
+      // An admin can change the admin status for any user but themselves
+      if ($user->id != user::active()->id) {
+        $user->admin = $form->edit_user->admin->checked;
+      }
+      $user->save();
+      module::event("user_edit_form_admin_completed", $user, $form);
+
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    // Don't allow the user to control their own admin bit, else you can lock yourself out
+    if ($user->id == user::active()->id) {
+      $form->edit_user->admin->disabled(1);
+    }
+    print $form;
+  }
+
+  public function add_user_to_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->add($user);
+    $group->save();
+  }
+
+  public function remove_user_from_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->remove($user);
+    $group->save();
+  }
+
+  public function group($group_id) {
+    $view = new View("admin_users_group.html");
+    $view->group = group::lookup($group_id);
+    print $view;
+  }
+
+  public function add_group() {
+    access::verify_csrf();
+
+    $form = group::get_add_form_admin();
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->add_group->inputs["name"]->value;
+      $group = group::lookup_by_name($new_name);
+      if (!empty($group)) {
+        $form->add_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group = group::create($new_name);
+      $group->save();
+      message::success(
+        t("Created group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_group_form() {
+    print group::get_add_form_admin();
+  }
+
+  public function delete_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    $form = group::get_delete_form_admin($group);
+    if ($form->validate()) {
+      $name = $group->name;
+      $group->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted group %group_name", array("group_name" => $name));
+    log::success("group", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_delete_form_admin($group);
+  }
+
+  public function edit_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+       kohana::show_404();
+    }
+
+    $form = group::get_edit_form_admin($group);
+    $valid = $form->validate();
+
+    if ($valid) {
+      $new_name = $form->edit_group->inputs["name"]->value;
+      $group = group::lookup_by_name($name);
+      if ($group->loaded) {
+        $form->edit_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group->name = $form->edit_group->inputs["name"]->value;
+      $group->save();
+      message::success(
+        t("Changed group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      message::error(
+        t("Failed to change group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_edit_form_admin($group);
+  }
+
+}
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
new file mode 100644
index 00000000..2c4bd557
--- /dev/null
+++ b/modules/gallery/controllers/login.php
@@ -0,0 +1,81 @@
+<?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_Controller extends Controller {
+
+  public function ajax() {
+    $view = new View("login_ajax.html");
+    $view->form = user::get_login_form("login/auth_ajax");
+    print $view;
+  }
+
+  public function auth_ajax() {
+    access::verify_csrf();
+
+    list ($valid, $form) = $this->_auth("login/auth_ajax");
+    if ($valid) {
+      print json_encode(
+        array("result" => "success"));
+    } else {
+      print json_encode(
+        array("result" => "error",
+              "form" => $form->__toString()));
+    }
+  }
+
+  public function html() {
+    print user::get_login_form("login/auth_html");
+  }
+
+  public function auth_html() {
+    access::verify_csrf();
+
+    list ($valid, $form) = $this->_auth("login/auth_html");
+    if ($valid) {
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $form;
+    }
+  }
+  private function _auth($url) {
+    $form = user::get_login_form($url);
+    $valid = $form->validate();
+    if ($valid) {
+      $user = user::lookup_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
+        log::warning(
+          "user",
+          t("Failed login for %name",
+            array("name" => $form->login->inputs["name"]->value)));
+        $form->login->inputs["name"]->add_error("invalid_login", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      user::login($user);
+      log::info("user", t("User %name logged in", array("name" => $user->name)));
+    }
+
+    // Either way, regenerate the session id to avoid session trapping
+    Session::instance()->regenerate();
+
+    return array($valid, $form);
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
new file mode 100644
index 00000000..45d397ad
--- /dev/null
+++ b/modules/gallery/controllers/logout.php
@@ -0,0 +1,38 @@
+<?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 Logout_Controller extends Controller {
+  public function index() {
+    //access::verify_csrf();
+
+    $user = user::active();
+    user::logout();
+    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")) {
+      $item = url::get_item_from_uri($continue_url);
+      if (access::can("view", $item)) {
+        // Don't use url::redirect() because it'll call url::site() and munge the continue url.
+        header("Location: $continue_url");
+      } else {
+        url::redirect(item::root()->abs_url());
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/password.php b/modules/gallery/controllers/password.php
new file mode 100644
index 00000000..817ff01c
--- /dev/null
+++ b/modules/gallery/controllers/password.php
@@ -0,0 +1,133 @@
+<?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 Password_Controller extends Controller {
+  public function reset() {
+    if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
+      $this->_send_reset();
+    } else {
+      print $this->_reset_form();
+    }
+  }
+
+  public function do_reset() {
+    if (request::method() == "post") {
+      $this->_change_password();
+    } else {
+      $user = user::lookyp_by_hash(Input::instance()->get("key"));
+      if (!empty($user)) {
+        print $this->_new_password_form($user->hash);
+      } else {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+    }
+  }
+
+  private function _send_reset() {
+    $form = $this->_reset_form();
+
+    $valid = $form->validate();
+    if ($valid) {
+      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
+      if (!$user->loaded || empty($user->email)) {
+        $form->reset->inputs["name"]->add_error("no_email", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $user->hash = md5(rand());
+      $user->save();
+      $message = new View("reset_password.html");
+      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
+      $message->user = $user;
+
+      Sendmail::factory()
+        ->to($user->email)
+        ->subject(t("Password Reset Request"))
+        ->header("Mime-Version", "1.0")
+        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->message($message->render())
+        ->send();
+
+      log::success(
+        "user",
+        t("Password reset email sent for user %name", array("name" => $user->name)));
+    } else {
+      // Don't include the username here until you're sure that it's XSS safe
+      log::warning(
+        "user", "Password reset email requested for bogus user");
+    }
+
+    message::success(t("Password reset email sent"));
+    print json_encode(
+      array("result" => "success"));
+  }
+
+  private function _reset_form() {
+    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
+    $group = $form->group("reset")->label(t("Reset Password"));
+    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
+    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
+    $group->submit("")->value(t("Reset"));
+
+    return $form;
+  }
+
+  private function _new_password_form($hash=null) {
+    $template = new Theme_View("page.html", "reset");
+
+    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
+    $group = $form->group("reset")->label(t("Change Password"));
+    $hidden = $group->hidden("hash");
+    if (!empty($hash)) {
+      $hidden->value($hash);
+    }
+    $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules("required|length[1,40]");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->inputs["password2"]->error_messages(
+      "mistyped", t("The password and the confirm password must match"));
+    $group->submit("")->value(t("Update"));
+
+    $template->content = $form;
+    return $template;
+  }
+
+  private function _change_password() {
+    $view = $this->_new_password_form();
+    if ($view->content->validate()) {
+      $user = user::lookyp_by_hash(Input::instance()->get("key"));
+      if (empty($user)) {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+
+      $user->password = $view->content->reset->password->value;
+      $user->hash = null;
+      $user->save();
+      message::success(t("Password reset successfully"));
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $view;
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/users.php b/modules/gallery/controllers/users.php
new file mode 100644
index 00000000..4ad704f0
--- /dev/null
+++ b/modules/gallery/controllers/users.php
@@ -0,0 +1,67 @@
+<?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 Users_Controller extends REST_Controller {
+  protected $resource_type = "user";
+
+  public function _update($user) {
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    $form = user::get_edit_form($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $new_locale = $desired_locale == "none" ? null : $desired_locale;
+        if ($new_locale != $user->locale) {
+          // Delete the session based locale preference
+          setcookie("g_locale", "", time() - 24 * 3600, "/");
+        }
+        $user->locale = $new_locale;
+      }
+      $user->save();
+      module::event("user_edit_form_completed", $user, $form);
+
+      message::success(t("User information updated."));
+      print json_encode(
+        array("result" => "success",
+              "resource" => url::site("users/{$user->id}")));
+    } else {
+      print json_encode(
+        array("result" => "error",
+              "form" => $form->__toString()));
+    }
+  }
+
+  public function _form_edit($user) {
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    print user::get_edit_form($user);
+  }
+}
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/gallery/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
new file mode 100644
index 00000000..28daff29
--- /dev/null
+++ b/modules/gallery/views/admin_users.html.php
@@ -0,0 +1,128 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+  $(document).ready(function(){
+    $("#g-user-admin-list .core-info").draggable({
+      helper: "clone"
+    });
+    $("#g-group-admin .g-group").droppable({
+      accept: ".core-info",
+      hoverClass: "g-selected",
+      drop: function(ev, ui) {
+        var user_id = $(ui.draggable).attr("id").replace("user-", "");
+        var group_id = $(this).attr("id").replace("group-", "");
+        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+              {},
+              function() {
+                reload_group(group_id);
+              });
+      }
+    });
+    $("#group-1").droppable("destroy");
+    $("#group-2").droppable("destroy");
+  });
+
+  var reload_group = function(group_id) {
+    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
+    $.get(reload_group_url.replace("__GROUPID__", group_id),
+          {},
+          function(data) {
+            $("#group-" + group_id).html(data);
+            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
+          });
+  }
+
+  var remove_user = function(user_id, group_id) {
+    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+          {},
+          function() {
+            reload_group(group_id);
+          });
+  }
+</script>
+<div class="g-block">
+  <a href="<?= url::site("admin/users/add_user_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new user")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new user") ?>
+  </a>
+
+  <h2>
+    <?= t("User Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <table id="g-user-admin-list">
+      <tr>
+        <th><?= t("Username") ?></th>
+        <th><?= t("Full name") ?></th>
+        <th><?= t("Email") ?></th>
+        <th><?= t("Last login") ?></th>
+        <th><?= t("Actions") ?></th>
+      </tr>
+
+      <? foreach ($users as $i => $user): ?>
+      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+               alt="<?= html::clean_attribute($user->name) ?>"
+               width="20"
+               height="20" />
+          <?= html::clean($user->name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->full_name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->email) ?>
+        </td>
+        <td>
+          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
+        </td>
+        <td class="g-actions">
+          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+              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>
+          <? if (user::active()->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>
+          <? 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>
+          <? endif ?>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
+  </div>
+</div>
+
+<div id="g-group-admin" class="g-block">
+  <a href="<?= url::site("admin/users/add_group_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new group")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new group") ?>
+  </a>
+
+  <h2>
+    <?= t("Group Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <ul>
+      <? foreach ($groups as $i => $group): ?>
+      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+        <?= $v ?>
+      </li>
+      <? endforeach ?>
+    </ul>
+  </div>
+</div>
diff --git a/modules/gallery/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
new file mode 100644
index 00000000..db3645a0
--- /dev/null
+++ b/modules/gallery/views/admin_users_group.html.php
@@ -0,0 +1,38 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<h4>
+  <?= html::clean($group->name) ?>
+  <? if (!$group->special): ?>
+  <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>
+  <? 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>
+  <? endif ?>
+</h4>
+
+<? if ($group->users->count() > 0): ?>
+<ul>
+  <? foreach ($group->users as $i => $user): ?>
+  <li class="g-user">
+    <?= html::clean($user->name) ?>
+    <? if (!$group->special): ?>
+    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
+       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>
+    </a>
+    <? endif ?>
+  </li>
+  <? endforeach ?>
+</ul>
+<? else: ?>
+<div>
+  <p>
+    <?= 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/gallery/views/login.html.php b/modules/gallery/views/login.html.php
new file mode 100644
index 00000000..049ba043
--- /dev/null
+++ b/modules/gallery/views/login.html.php
@@ -0,0 +1,22 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul id="g-login-menu">
+  <? if ($user->guest): ?>
+  <li class="first">
+    <a href="<?= url::site("login/ajax") ?>"
+       title="<?= t("Login to Gallery")->for_html_attr() ?>"
+       id="g-login-link"><?= t("Login") ?></a>
+  </li>
+  <? else: ?>
+  <li class="first">
+    <?= 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() .
+      '" id="g-user-profile-link" class="g-dialog-link">' .
+      html::clean($user->display_name()) . '</a>'))) ?>
+  </li>
+  <li>
+    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
+       id="g-logout-link"><?= t("Logout") ?></a>
+  </li>
+  <? endif ?>
+</ul>
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
new file mode 100644
index 00000000..d3364b46
--- /dev/null
+++ b/modules/gallery/views/login_ajax.html.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  $("#g-login-form").ready(function() {
+    $("#g-password-reset").click(function() {
+      $.ajax({
+        url: "<?= url::site("password/reset") ?>",
+        success: function(data) {
+          $("#g-login").html(data);
+          $("#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();
+        }
+      });
+    });
+  });
+
+  function ajaxify_login_reset_form() {
+    $("#g-login form").ajaxForm({
+      dataType: "json",
+      success: function(data) {
+        if (data.form) {
+          $("#g-login form").replaceWith(data.form);
+          ajaxify_login_reset_form();
+        }
+        if (data.result == "success") {
+          $("#g-dialog").dialog("close");
+          window.location.reload();
+        }
+      }
+    });
+  };
+</script>
+<div id="g-login">
+  <ul>
+    <li id="g-login-form">
+      <?= $form ?>
+    </li>
+    <li>
+      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
+    </li>
+  </ul>
+</div>
diff --git a/modules/gallery/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
new file mode 100644
index 00000000..92ca4917
--- /dev/null
+++ b/modules/gallery/views/reset_password.html.php
@@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Password Reset Request") ?> </title>
+  </head>
+  <body>
+    <h2><?= t("Password Reset Request") ?> </h2>
+    <p>
+      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
+    </p>
+    <p>
+  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
+        array("site_url" => html::mark_clean(url::base(false, "http")),
+              "confirm_url" => $confirm_url)) ?>
+    </p>
+  </body>
+</html>
diff --git a/modules/gallery/views/user_languages_block.html.php b/modules/gallery/views/user_languages_block.html.php
new file mode 100644
index 00000000..89185967
--- /dev/null
+++ b/modules/gallery/views/user_languages_block.html.php
@@ -0,0 +1,19 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
+<script type="text/javascript">
+  $("#g-select-session-locale").change(function() {
+    var old_locale_preference = <?= html::js_string($selected) ?>;
+    var locale = $(this).val();
+    if (old_locale_preference == locale) {
+      return;
+    }
+
+    var expires = -1;
+    if (locale) {
+      expires = 365;
+    }
+    $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
+    window.location.reload(true);
+  });
+</script>
+
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
deleted file mode 100644
index 6c72440a..00000000
--- a/modules/user/controllers/admin_users.php
+++ /dev/null
@@ -1,290 +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 Admin_Users_Controller extends Admin_Controller {
-  public function index() {
-    $view = new Admin_View("admin.html");
-    $view->content = new View("admin_users.html");
-    $view->content->users = user::users(array("orderby" => array("name" => "ASC")));
-    $view->content->groups = group::groups(array("orderby" => array("name" => "ASC")));
-    print $view;
-  }
-
-  public function add_user() {
-    access::verify_csrf();
-
-    $form = user::get_add_form_admin();
-    $valid = $form->validate();
-    $name = $form->add_user->inputs["name"]->value;
-    if ($user = user::lookup_by_name($name)) {
-      $form->add_user->inputs["name"]->add_error("in_use", 1);
-      $valid = false;
-    }
-
-    if ($valid) {
-      $user = user::create(
-        $name, $form->add_user->full_name->value, $form->add_user->password->value);
-      $user->email = $form->add_user->email->value;
-      $user->admin = $form->add_user->admin->checked;
-
-      if ($form->add_user->locale) {
-        $desired_locale = $form->add_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-      $user->save();
-      module::event("user_add_form_admin_completed", $user, $form);
-
-      message::success(t("Created user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_user_form() {
-    print user::get_add_form_admin();
-  }
-
-  public function delete_user($id) {
-    access::verify_csrf();
-
-    if ($id == user::active()->id || $id == user::guest()->id) {
-      access::forbidden();
-    }
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_delete_form_admin($user);
-    if($form->validate()) {
-      $name = $user->name;
-      $user->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted user %user_name", array("user_name" => $name));
-    log::success("user", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-    print user::get_delete_form_admin($user);
-  }
-
-  public function edit_user($id) {
-    access::verify_csrf();
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->edit_user->inputs["name"]->value;
-      $temp_user = user::lookup_by_name($new_name);
-      if ($new_name != $user->name &&
-          ($temp_user && $temp_user->id != $user->id)) {
-        $form->edit_user->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      } else {
-        $user->name = $new_name;
-      }
-    }
-
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-
-      // An admin can change the admin status for any user but themselves
-      if ($user->id != user::active()->id) {
-        $user->admin = $form->edit_user->admin->checked;
-      }
-      $user->save();
-      module::event("user_edit_form_admin_completed", $user, $form);
-
-      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    // Don't allow the user to control their own admin bit, else you can lock yourself out
-    if ($user->id == user::active()->id) {
-      $form->edit_user->admin->disabled(1);
-    }
-    print $form;
-  }
-
-  public function add_user_to_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->add($user);
-    $group->save();
-  }
-
-  public function remove_user_from_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->remove($user);
-    $group->save();
-  }
-
-  public function group($group_id) {
-    $view = new View("admin_users_group.html");
-    $view->group = group::lookup($group_id);
-    print $view;
-  }
-
-  public function add_group() {
-    access::verify_csrf();
-
-    $form = group::get_add_form_admin();
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->add_group->inputs["name"]->value;
-      $group = group::lookup_by_name($new_name);
-      if (!empty($group)) {
-        $form->add_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group = group::create($new_name);
-      $group->save();
-      message::success(
-        t("Created group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_group_form() {
-    print group::get_add_form_admin();
-  }
-
-  public function delete_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    $form = group::get_delete_form_admin($group);
-    if ($form->validate()) {
-      $name = $group->name;
-      $group->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted group %group_name", array("group_name" => $name));
-    log::success("group", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_delete_form_admin($group);
-  }
-
-  public function edit_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-       kohana::show_404();
-    }
-
-    $form = group::get_edit_form_admin($group);
-    $valid = $form->validate();
-
-    if ($valid) {
-      $new_name = $form->edit_group->inputs["name"]->value;
-      $group = group::lookup_by_name($name);
-      if ($group->loaded) {
-        $form->edit_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group->name = $form->edit_group->inputs["name"]->value;
-      $group->save();
-      message::success(
-        t("Changed group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      message::error(
-        t("Failed to change group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_edit_form_admin($group);
-  }
-
-}
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
deleted file mode 100644
index 2c4bd557..00000000
--- a/modules/user/controllers/login.php
+++ /dev/null
@@ -1,81 +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_Controller extends Controller {
-
-  public function ajax() {
-    $view = new View("login_ajax.html");
-    $view->form = user::get_login_form("login/auth_ajax");
-    print $view;
-  }
-
-  public function auth_ajax() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_ajax");
-    if ($valid) {
-      print json_encode(
-        array("result" => "success"));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function html() {
-    print user::get_login_form("login/auth_html");
-  }
-
-  public function auth_html() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_html");
-    if ($valid) {
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $form;
-    }
-  }
-  private function _auth($url) {
-    $form = user::get_login_form($url);
-    $valid = $form->validate();
-    if ($valid) {
-      $user = user::lookup_by_name($form->login->inputs["name"]->value);
-      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
-        log::warning(
-          "user",
-          t("Failed login for %name",
-            array("name" => $form->login->inputs["name"]->value)));
-        $form->login->inputs["name"]->add_error("invalid_login", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      user::login($user);
-      log::info("user", t("User %name logged in", array("name" => $user->name)));
-    }
-
-    // Either way, regenerate the session id to avoid session trapping
-    Session::instance()->regenerate();
-
-    return array($valid, $form);
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
deleted file mode 100644
index 45d397ad..00000000
--- a/modules/user/controllers/logout.php
+++ /dev/null
@@ -1,38 +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 Logout_Controller extends Controller {
-  public function index() {
-    //access::verify_csrf();
-
-    $user = user::active();
-    user::logout();
-    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")) {
-      $item = url::get_item_from_uri($continue_url);
-      if (access::can("view", $item)) {
-        // Don't use url::redirect() because it'll call url::site() and munge the continue url.
-        header("Location: $continue_url");
-      } else {
-        url::redirect(item::root()->abs_url());
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
deleted file mode 100644
index 817ff01c..00000000
--- a/modules/user/controllers/password.php
+++ /dev/null
@@ -1,133 +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 Password_Controller extends Controller {
-  public function reset() {
-    if (request::method() == "post") {
-      // @todo separate the post from get parts of this function
-      access::verify_csrf();
-      $this->_send_reset();
-    } else {
-      print $this->_reset_form();
-    }
-  }
-
-  public function do_reset() {
-    if (request::method() == "post") {
-      $this->_change_password();
-    } else {
-      $user = user::lookyp_by_hash(Input::instance()->get("key"));
-      if (!empty($user)) {
-        print $this->_new_password_form($user->hash);
-      } else {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-    }
-  }
-
-  private function _send_reset() {
-    $form = $this->_reset_form();
-
-    $valid = $form->validate();
-    if ($valid) {
-      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
-        $form->reset->inputs["name"]->add_error("no_email", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $user->hash = md5(rand());
-      $user->save();
-      $message = new View("reset_password.html");
-      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
-      $message->user = $user;
-
-      Sendmail::factory()
-        ->to($user->email)
-        ->subject(t("Password Reset Request"))
-        ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
-        ->message($message->render())
-        ->send();
-
-      log::success(
-        "user",
-        t("Password reset email sent for user %name", array("name" => $user->name)));
-    } else {
-      // Don't include the username here until you're sure that it's XSS safe
-      log::warning(
-        "user", "Password reset email requested for bogus user");
-    }
-
-    message::success(t("Password reset email sent"));
-    print json_encode(
-      array("result" => "success"));
-  }
-
-  private function _reset_form() {
-    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
-    $group = $form->group("reset")->label(t("Reset Password"));
-    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
-    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
-    $group->submit("")->value(t("Reset"));
-
-    return $form;
-  }
-
-  private function _new_password_form($hash=null) {
-    $template = new Theme_View("page.html", "reset");
-
-    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
-    $group = $form->group("reset")->label(t("Change Password"));
-    $hidden = $group->hidden("hash");
-    if (!empty($hash)) {
-      $hidden->value($hash);
-    }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->inputs["password2"]->error_messages(
-      "mistyped", t("The password and the confirm password must match"));
-    $group->submit("")->value(t("Update"));
-
-    $template->content = $form;
-    return $template;
-  }
-
-  private function _change_password() {
-    $view = $this->_new_password_form();
-    if ($view->content->validate()) {
-      $user = user::lookyp_by_hash(Input::instance()->get("key"));
-      if (empty($user)) {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-
-      $user->password = $view->content->reset->password->value;
-      $user->hash = null;
-      $user->save();
-      message::success(t("Password reset successfully"));
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $view;
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
deleted file mode 100644
index 4ad704f0..00000000
--- a/modules/user/controllers/users.php
+++ /dev/null
@@ -1,67 +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 Users_Controller extends REST_Controller {
-  protected $resource_type = "user";
-
-  public function _update($user) {
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    $form = user::get_edit_form($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $new_locale = $desired_locale == "none" ? null : $desired_locale;
-        if ($new_locale != $user->locale) {
-          // Delete the session based locale preference
-          setcookie("g_locale", "", time() - 24 * 3600, "/");
-        }
-        $user->locale = $new_locale;
-      }
-      $user->save();
-      module::event("user_edit_form_completed", $user, $form);
-
-      message::success(t("User information updated."));
-      print json_encode(
-        array("result" => "success",
-              "resource" => url::site("users/{$user->id}")));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function _form_edit($user) {
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print user::get_edit_form($user);
-  }
-}
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();
-    }
-  }
-}
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
deleted file mode 100644
index 28daff29..00000000
--- a/modules/user/views/admin_users.html.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-  $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
-      helper: "clone"
-    });
-    $("#g-group-admin .g-group").droppable({
-      accept: ".core-info",
-      hoverClass: "g-selected",
-      drop: function(ev, ui) {
-        var user_id = $(ui.draggable).attr("id").replace("user-", "");
-        var group_id = $(this).attr("id").replace("group-", "");
-        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-              {},
-              function() {
-                reload_group(group_id);
-              });
-      }
-    });
-    $("#group-1").droppable("destroy");
-    $("#group-2").droppable("destroy");
-  });
-
-  var reload_group = function(group_id) {
-    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
-    $.get(reload_group_url.replace("__GROUPID__", group_id),
-          {},
-          function(data) {
-            $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
-          });
-  }
-
-  var remove_user = function(user_id, group_id) {
-    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-          {},
-          function() {
-            reload_group(group_id);
-          });
-  }
-</script>
-<div class="g-block">
-  <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new user") ?>
-  </a>
-
-  <h2>
-    <?= t("User Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <table id="g-user-admin-list">
-      <tr>
-        <th><?= t("Username") ?></th>
-        <th><?= t("Full name") ?></th>
-        <th><?= t("Email") ?></th>
-        <th><?= t("Last login") ?></th>
-        <th><?= t("Actions") ?></th>
-      </tr>
-
-      <? foreach ($users as $i => $user): ?>
-      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
-               alt="<?= html::clean_attribute($user->name) ?>"
-               width="20"
-               height="20" />
-          <?= html::clean($user->name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->full_name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->email) ?>
-        </td>
-        <td>
-          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
-        </td>
-        <td class="g-actions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-              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>
-          <? if (user::active()->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>
-          <? 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>
-          <? endif ?>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-  </div>
-</div>
-
-<div id="g-group-admin" class="g-block">
-  <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new group") ?>
-  </a>
-
-  <h2>
-    <?= t("Group Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <ul>
-      <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
-        <?= $v ?>
-      </li>
-      <? endforeach ?>
-    </ul>
-  </div>
-</div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
deleted file mode 100644
index db3645a0..00000000
--- a/modules/user/views/admin_users_group.html.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<h4>
-  <?= html::clean($group->name) ?>
-  <? if (!$group->special): ?>
-  <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>
-  <? 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>
-  <? endif ?>
-</h4>
-
-<? if ($group->users->count() > 0): ?>
-<ul>
-  <? foreach ($group->users as $i => $user): ?>
-  <li class="g-user">
-    <?= html::clean($user->name) ?>
-    <? if (!$group->special): ?>
-    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       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>
-    </a>
-    <? endif ?>
-  </li>
-  <? endforeach ?>
-</ul>
-<? else: ?>
-<div>
-  <p>
-    <?= 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/login.html.php b/modules/user/views/login.html.php
deleted file mode 100644
index 049ba043..00000000
--- a/modules/user/views/login.html.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu">
-  <? if ($user->guest): ?>
-  <li class="first">
-    <a href="<?= url::site("login/ajax") ?>"
-       title="<?= t("Login to Gallery")->for_html_attr() ?>"
-       id="g-login-link"><?= t("Login") ?></a>
-  </li>
-  <? else: ?>
-  <li class="first">
-    <?= 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() .
-      '" id="g-user-profile-link" class="g-dialog-link">' .
-      html::clean($user->display_name()) . '</a>'))) ?>
-  </li>
-  <li>
-    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
-       id="g-logout-link"><?= t("Logout") ?></a>
-  </li>
-  <? endif ?>
-</ul>
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
deleted file mode 100644
index d3364b46..00000000
--- a/modules/user/views/login_ajax.html.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#g-login-form").ready(function() {
-    $("#g-password-reset").click(function() {
-      $.ajax({
-        url: "<?= url::site("password/reset") ?>",
-        success: function(data) {
-          $("#g-login").html(data);
-          $("#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();
-        }
-      });
-    });
-  });
-
-  function ajaxify_login_reset_form() {
-    $("#g-login form").ajaxForm({
-      dataType: "json",
-      success: function(data) {
-        if (data.form) {
-          $("#g-login form").replaceWith(data.form);
-          ajaxify_login_reset_form();
-        }
-        if (data.result == "success") {
-          $("#g-dialog").dialog("close");
-          window.location.reload();
-        }
-      }
-    });
-  };
-</script>
-<div id="g-login">
-  <ul>
-    <li id="g-login-form">
-      <?= $form ?>
-    </li>
-    <li>
-      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
-    </li>
-  </ul>
-</div>
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
deleted file mode 100644
index 92ca4917..00000000
--- a/modules/user/views/reset_password.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<html>
-  <head>
-    <title><?= t("Password Reset Request") ?> </title>
-  </head>
-  <body>
-    <h2><?= t("Password Reset Request") ?> </h2>
-    <p>
-      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
-    </p>
-    <p>
-  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
-        array("site_url" => html::mark_clean(url::base(false, "http")),
-              "confirm_url" => $confirm_url)) ?>
-    </p>
-  </body>
-</html>
diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
deleted file mode 100644
index 89185967..00000000
--- a/modules/user/views/user_languages_block.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
-<script type="text/javascript">
-  $("#g-select-session-locale").change(function() {
-    var old_locale_preference = <?= html::js_string($selected) ?>;
-    var locale = $(this).val();
-    if (old_locale_preference == locale) {
-      return;
-    }
-
-    var expires = -1;
-    if (locale) {
-      expires = 365;
-    }
-    $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
-    window.location.reload(true);
-  });
-</script>
-
-- 
cgit v1.2.3


From 121fcab5c81fd4f942eea11577e4381ab4d86ddc Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 7 Oct 2009 00:46:02 -0600
Subject: Replaced most clear fix hacks with generic class.

---
 lib/gallery.common.css                        | 13 +------------
 modules/comment/views/admin_comments.html.php |  2 +-
 modules/gallery/views/admin_themes.html.php   |  8 ++++----
 modules/user/views/admin_users.html.php       |  2 +-
 themes/wind/views/album.html.php              |  2 +-
 themes/wind/views/page.html.php               |  2 +-
 themes/wind/views/pager.html.php              |  2 +-
 themes/wind/views/sidebar.html.php            |  2 +-
 8 files changed, 11 insertions(+), 22 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index d100791e..740d9e87 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -321,20 +321,9 @@ form .g-error {
  *********************************************************************/
 
 .g-clearfix,
-#g-header:after,
-#g-album-grid:after,
-.g-pager:after,
-#g-view-menu:after,
 #g-site-admin-menu:after,
-#g-header:after,
-#g-admin-comments-menu:after,
-#g-group-admin:after,
-.g-selected:after,
-.g-available .g-block:after,
 #g-module-create-form ul li ul:after,
-#g-developer-tools:after,
-#g-photo-stream:after,
-#g-view-menu:after {
+#g-developer-tools:after {
   clear: both;
   content: ".";
   display: block;
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 62c64d12..e32a843f 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -38,7 +38,7 @@
   <h1> <?= t("Manage Comments") ?> </h1>
 
   <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu">
+  <div id="g-admin-comments-menu" class="g-clearfix">
     <?= $menu ?>
   </div>
 
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index 714b3af8..a75d9f04 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -14,7 +14,7 @@
 
 <div id="g-site-theme">
   <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected">
+  <div class="g-block g-selected g-clearfix">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
@@ -29,7 +29,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
-    <div class="g-block">
+    <div class="g-block g-clearfix">
       <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
@@ -52,7 +52,7 @@
 
 <div id="g-admin-theme">
   <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected">
+  <div class="g-block g-selected g-clearfix">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
@@ -67,7 +67,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
-    <div class="g-block">
+    <div class="g-block g-clearfix">
       <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 28daff29..a127bc15 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -103,7 +103,7 @@
   </div>
 </div>
 
-<div id="g-group-admin" class="g-block">
+<div id="g-group-admin" class="g-block g-clearfix">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 5d928b2e..91646b1e 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid">
+<ul id="g-album-grid" class="g-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 6e1e3a53..fab4ba9e 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header">
+      <div id="g-header" class="g-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 5e79add6..2075fd95 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager">
+<ul class="g-pager g-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
index d2551c52..c49a7b51 100644
--- a/themes/wind/views/sidebar.html.php
+++ b/themes/wind/views/sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
 <div class="g-toolbar">
-  <div id="g-view-menu" class="g-buttonset">
+  <div id="g-view-menu" class="g-buttonset g-clearfix">
     <? if ($page_type == "album"):?>
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>
-- 
cgit v1.2.3


From f67bfd099296602f60d48914ae4b09d65b0ad8d3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 7 Oct 2009 20:26:26 -0700
Subject: Change the users.php controller so its no longer restful.  The
 problem with our approach to restfulness is that it assumes that the resource
 will be found in the gallery database.  It may well be there, but in the case
 of using plugable drivers for users management, there are no guarantees that
 it is in our database or it could be in a ldap directory.  So it was just
 easier to remove the restfulness and just call user::lookup instead. (cherry
 picked from commit b3211cb2a8282556d410c91771baeb764d47ed10)

---
 modules/user/controllers/users.php | 9 +++++----
 modules/user/helpers/user.php      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 4ad704f0..07c5a457 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Users_Controller extends REST_Controller {
-  protected $resource_type = "user";
+class Users_Controller extends Controller {
+  public function update($id) {
+    $user = user::lookup($id);
 
-  public function _update($user) {
     if ($user->guest || $user->id != user::active()->id) {
       access::forbidden();
     }
@@ -57,7 +57,8 @@ class Users_Controller extends REST_Controller {
     }
   }
 
-  public function _form_edit($user) {
+  public function form_edit($id) {
+    $user = user::lookup($id);
     if ($user->guest || $user->id != user::active()->id) {
       access::forbidden();
     }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 6ae9203d..432994d6 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -25,7 +25,7 @@
  */
 class user_Core {
   static function get_edit_form($user) {
-    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "g-edit-user-form"));
+    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
     $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-- 
cgit v1.2.3


From 00ee91837faf4807fb17dde3272ca8248a9dcd94 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 5 Oct 2009 14:04:27 -0700
Subject: Convert direct lookups for the user table using ORM to using the
 user::lookup_by_name and user_lookup API methods. Convert the Admin_User
 controller Convert the login and password change controller Change the item
 model to call user::lookup to get the owner. On the log model, delete the
 relationship between the log and user table, and replace with a call to
 user::lookup (cherry picked from commit
 194cc3b27a73afe5119da9f09407c1e068dc6fa3) Create the get_user_list,
 lookup_by_name, lookup_by_hash and get_group_list api functions

---
 modules/gallery/models/item.php          |  2 +-
 modules/gallery/models/log.php           | 17 ++++++++-
 modules/user/controllers/admin_users.php | 65 +++++++++++++++-----------------
 modules/user/controllers/login.php       |  5 +--
 modules/user/controllers/password.php    | 15 +++-----
 modules/user/helpers/group.php           | 14 +++++++
 modules/user/helpers/user.php            | 55 ++++++++++++++++++++++-----
 7 files changed, 114 insertions(+), 59 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 6499fd2d..6f0e3525 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -333,7 +333,7 @@ class Item_Model extends ORM_MPTT {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return model_cache::get("user", $this->owner_id);
+        return user::lookup($this->owner_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index 6734afb8..d143d7bd 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -18,5 +18,20 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Log_Model extends ORM {
-  protected $has_one = array("user");
+  /**
+   * @see ORM::__get()
+   */
+  public function __get($column) {
+    if ($column == "user") {
+      // This relationship depends on an outside module, which may not be present so handle
+      // failures gracefully.
+      try {
+        return user::lookup($this->user_id);
+      } catch (Exception $e) {
+        return null;
+      }
+    } else {
+      return parent::__get($column);
+    }
+  }
 }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 0b748955..a8a8cd95 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,8 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->users = ORM::factory("user")->orderby("name")->find_all();
-    $view->content->groups = ORM::factory("group")->orderby("name")->find_all();
+    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
     print $view;
   }
 
@@ -32,8 +32,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form = user::get_add_form_admin();
     $valid = $form->validate();
     $name = $form->add_user->inputs["name"]->value;
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
+    if ($user = user::lookup_by_name($name)) {
       $form->add_user->inputs["name"]->add_error("in_use", 1);
       $valid = false;
     }
@@ -70,8 +69,8 @@ class Admin_Users_Controller extends Admin_Controller {
       access::forbidden();
     }
 
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -91,8 +90,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function delete_user_form($id) {
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
     print user::get_delete_form_admin($user);
@@ -101,8 +100,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function edit_user($id) {
     access::verify_csrf();
 
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -110,12 +109,9 @@ class Admin_Users_Controller extends Admin_Controller {
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->edit_user->inputs["name"]->value;
+      $temp_user = user::lookup_by_name($new_name);
       if ($new_name != $user->name &&
-          ORM::factory("user")
-          ->where("name", $new_name)
-          ->where("id !=", $user->id)
-          ->find()
-          ->loaded) {
+          ($temp_user && $temp_user->id != $user->id)) {
         $form->edit_user->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       } else {
@@ -151,8 +147,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function edit_user_form($id) {
-    $user = ORM::factory("user", $id);
-    if (!$user->loaded) {
+    $user = user::lookup($id);
+    if (empty($user)) {
       kohana::show_404();
     }
 
@@ -166,23 +162,23 @@ class Admin_Users_Controller extends Admin_Controller {
 
   public function add_user_to_group($user_id, $group_id) {
     access::verify_csrf();
-    $group = ORM::factory("group", $group_id);
-    $user = ORM::factory("user", $user_id);
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
     $group->add($user);
     $group->save();
   }
 
   public function remove_user_from_group($user_id, $group_id) {
     access::verify_csrf();
-    $group = ORM::factory("group", $group_id);
-    $user = ORM::factory("user", $user_id);
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
     $group->remove($user);
     $group->save();
   }
 
   public function group($group_id) {
     $view = new View("admin_users_group.html");
-    $view->group = ORM::factory("group", $group_id);
+    $view->group = group::lookup($group_id);
     print $view;
   }
 
@@ -193,8 +189,8 @@ class Admin_Users_Controller extends Admin_Controller {
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->add_group->inputs["name"]->value;
-      $group = ORM::factory("group")->where("name", $new_name)->find();
-      if ($group->loaded) {
+      $group = group::lookup_by_name($new_name);
+      if (!empty($group)) {
         $form->add_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
       }
@@ -219,8 +215,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_group($id) {
     access::verify_csrf();
 
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
 
@@ -240,19 +236,20 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function delete_group_form($id) {
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
+
     print group::get_delete_form_admin($group);
   }
 
   public function edit_group($id) {
     access::verify_csrf();
 
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
-      kohana::show_404();
+    $group = group::lookup($id);
+    if (empty($group)) {
+       kohana::show_404();
     }
 
     $form = group::get_edit_form_admin($group);
@@ -260,7 +257,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     if ($valid) {
       $new_name = $form->edit_group->inputs["name"]->value;
-      $group = ORM::factory("group")->where("name", $new_name)->find();
+      $group = group::lookup_by_name($name);
       if ($group->loaded) {
         $form->edit_group->inputs["name"]->add_error("in_use", 1);
         $valid = false;
@@ -282,8 +279,8 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function edit_group_form($id) {
-    $group = ORM::factory("group", $id);
-    if (!$group->loaded) {
+    $group = group::lookup($id);
+    if (empty($group)) {
       kohana::show_404();
     }
 
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 8bee7db5..2c4bd557 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -53,13 +53,12 @@ class Login_Controller extends Controller {
       print $form;
     }
   }
-
   private function _auth($url) {
     $form = user::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
-      $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find();
-      if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) {
+      $user = user::lookup_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
         log::warning(
           "user",
           t("Failed login for %name",
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 4629bbf2..e8b08960 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -32,10 +32,8 @@ class Password_Controller extends Controller {
     if (request::method() == "post") {
       $this->_change_password();
     } else {
-      $user = ORM::factory("user")
-        ->where("hash", Input::instance()->get("key"))
-        ->find();
-      if ($user->loaded) {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (!empty($user)) {
         print $this->_new_password_form($user->hash);
       } else {
         throw new Exception("@todo FORBIDDEN", 503);
@@ -48,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = ORM::factory("user")->where("name", $form->reset->inputs["name"]->value)->find();
+      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
@@ -118,11 +116,8 @@ class Password_Controller extends Controller {
   private function _change_password() {
     $view = $this->_new_password_form();
     if ($view->content->validate()) {
-      $user = ORM::factory("user")
-        ->where("hash", $view->content->reset->hash->value)
-        ->find();
-
-      if (!$user->loaded) {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
 
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index b13895bc..2590c7d1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -73,6 +73,20 @@ class group_Core {
     return null;
   }
 
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the group list.
+   */
+  static function get_group_list($filter=array()) {
+    $group = ORM::factory("group");
+
+    foreach($filter as $method => $args) {
+      $group->$method($args);
+    }
+    return $group->find_all();
+  }
+
   static function get_edit_form_admin($group) {
     $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
     $form_group = $form->group("edit_group")->label(t("Edit Group"));
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 432994d6..6a155768 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -304,27 +304,62 @@ class user_Core {
    * @return User_Model  the user object, or null if the id was invalid.
    */
   static function lookup($id) {
-    $user = model_cache::get("user", $id);
-    if ($user->loaded) {
-      return $user;
-    }
-    return null;
+    return self::_lookup_user_by_field("id", $id);
   }
 
   /**
    * Look up a user by name.
-   * @param integer      $id the user name
+   * @param integer      $name the user name
    * @return User_Model  the user object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    $user = model_cache::get("user", $name, "name");
-    if ($user->loaded) {
-      return $user;
+    return self::_lookup_user_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by hash.
+   * @param integer      $hash the user hash value
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_hash($hash) {
+    return self::_lookup_user_by_field("hash", $hash);
+  }
+
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the user list.
+   */
+  static function get_user_list($filter=array()) {
+    $user = ORM::factory("user");
+
+    foreach($filter as $method => $args) {
+      $user->$method($args);
     }
-    return null;
+    return $user->find_all();
   }
 
   /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return User_Core  the user object, or null if the name was invalid.
+   */
+ private static function _lookup_user_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("user", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+
+ /**
    * Create a hashed password using md5 plus salt.
    * @param string $password plaintext password
    * @param string $salt (optional) salt or hash containing salt (randomly generated if omitted)
-- 
cgit v1.2.3


From 1ee7d24766a3055d4199251f6ce990714b9c3641 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 9 Oct 2009 01:12:05 -0700
Subject: Add support for the in filter to get_user_list and get_group_list.
 Convert the notifications to use user::get_user_list instead of accessing the
 table directly.

---
 modules/notification/helpers/notification.php | 21 +++++++++++++--------
 modules/user/helpers/group.php                |  8 +++++++-
 modules/user/helpers/user.php                 |  8 +++++++-
 3 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'modules/user')

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 88d92b16..150616ab 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -67,15 +67,20 @@ class notification {
   }
 
   static function get_subscribers($item) {
-    // @todo don't access the user table directly
     // @todo only return distinct email addresses
-    $users = ORM::factory("user")
-      ->join("subscriptions", "users.id", "subscriptions.user_id")
-      ->join("items", "subscriptions.item_id", "items.id")
-      ->where("email IS NOT", null)
-      ->where("items.left_ptr <=", $item->left_ptr)
-      ->where("items.right_ptr >", $item->right_ptr)
-      ->find_all();
+    $subscriber_ids = array();
+    foreach (ORM::factory("subscription")
+             ->select("user_id")
+             ->join("items", "subscriptions.item_id", "items.id")
+             ->where("items.left_ptr <=", $item->left_ptr)
+             ->where("items.right_ptr >", $item->right_ptr)
+             ->find_all()
+             ->as_array() as $subscriber) {
+      $subscriber_ids[] = $subscriber->user_id;
+    }
+
+    $users = user::get_user_list(array("in" => array("id", $subscriber_ids),
+                                       "where" => array("email IS NOT" => null)));
 
     $subscribers = array();
     foreach ($users as $user) {
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 2590c7d1..fbc5157d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -82,7 +82,13 @@ class group_Core {
     $group = ORM::factory("group");
 
     foreach($filter as $method => $args) {
-      $group->$method($args);
+      switch ($method) {
+      case "in":
+        $group->in($args[0], $args[1]);
+        break;
+      default:
+        $group->$method($args);
+      }
     }
     return $group->find_all();
   }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 6a155768..c6a7735b 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -334,7 +334,13 @@ class user_Core {
     $user = ORM::factory("user");
 
     foreach($filter as $method => $args) {
-      $user->$method($args);
+      switch ($method) {
+      case "in":
+        $user->in($args[0], $args[1]);
+        break;
+      default:
+        $user->$method($args);
+      }
     }
     return $user->find_all();
   }
-- 
cgit v1.2.3


From ab73a4092ff70a87ced1d7ffcfbe9bcee788f1f3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 12:03:55 -0700
Subject: Correct typo in method name

---
 modules/user/libraries/drivers/Identity/Gallery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index b287ed4c..f631bd63 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -166,7 +166,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @param string      search value
    * @return Group_Core  the group object, or null if the name was invalid.
    */
-  public function lookup_user_by_field($field_name, $value) {
+  public function lookup_group_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
       if ($user->loaded) {
-- 
cgit v1.2.3


From 2c711d8908137b6ff25941f06fe0a3f9ac02596d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 12:33:00 -0700
Subject: refactor locale related functionality out of the user module and into
 the gallery module.

---
 modules/gallery/helpers/gallery_block.php | 23 +++++++++++++++-
 modules/gallery/helpers/gallery_event.php |  8 ++++++
 modules/gallery/helpers/locales.php       | 34 ++++++++++++++++++++++-
 modules/user/helpers/user.php             | 15 ----------
 modules/user/helpers/user_block.php       | 46 -------------------------------
 modules/user/helpers/user_event.php       | 25 -----------------
 6 files changed, 63 insertions(+), 88 deletions(-)
 delete mode 100644 modules/user/helpers/user_block.php

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 5d49a9de..3d5ee9d3 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,8 +89,25 @@ class gallery_block_Core {
       $block->css_id = "g-block-adder";
       $block->title = t("Dashboard Content");
       $block->content = self::get_add_block_form();
-    }
 
+    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) locales::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..106aa202 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);
   }
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index ab7f7526..f0807c99 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -219,4 +219,36 @@ class locales_Core {
     }
     return array(null, 0);
   }
-}
\ No newline at end of file
+
+  static function set_request_locale() {
+    // 1. Check the session specific preference (cookie)
+    $locale = self::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);
+    }
+  }
+
+  static function cookie_locale() {
+    $cookie_data = Input::instance()->cookie("g_locale");
+    $locale = null;
+    if ($cookie_data) {
+      if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
+        $requested_locale = $matches[1];
+        $installed_locales = locales::installed();
+        if (isset($installed_locales[$requested_locale])) {
+          $locale = $requested_locale;
+        }
+      }
+    }
+    return $locale;
+  }
+}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index c6a7735b..a22e475f 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -383,19 +383,4 @@ class user_Core {
     }
     return $salt . md5($salt . $password);
   }
-
-  static function cookie_locale() {
-    $cookie_data = Input::instance()->cookie("g_locale");
-    $locale = null;
-    if ($cookie_data) {
-      if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
-        $requested_locale = $matches[1];
-        $installed_locales = locales::installed();
-        if (isset($installed_locales[$requested_locale])) {
-          $locale = $requested_locale;
-        }
-      }
-    }
-    return $locale;
-  }
 }
\ No newline at end of file
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
index ede4e515..93a92589 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -18,14 +18,6 @@
  * 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")
@@ -33,21 +25,4 @@ class user_event_Core {
                      ->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);
-    }
-  }
 }
-- 
cgit v1.2.3


From f8eee907057d92e16888549ce1c674ea968971a8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 12:38:21 -0700
Subject: remove the unused private function user::_md5Salt()

---
 modules/user/helpers/user.php | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index a22e475f..7aa990e1 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -364,23 +364,4 @@ class user_Core {
     }
     return null;
   }
-
- /**
-   * Create a hashed password using md5 plus salt.
-   * @param string $password plaintext password
-   * @param string $salt (optional) salt or hash containing salt (randomly generated if omitted)
-   * @return string hashed password
-   */
-  private static function _md5Salt($password, $salt="") {
-    if (empty($salt)) {
-      for ($i = 0; $i < 4; $i++) {
-        $char = mt_rand(48, 109);
-        $char += ($char > 90) ? 13 : ($char > 57) ? 7 : 0;
-        $salt .= chr($char);
-      }
-    } else {
-      $salt = substr($salt, 0, 4);
-    }
-    return $salt . md5($salt . $password);
-  }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 1c313e9d2da84a9dd839ea6a4910cdf6809007fb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 12:46:27 -0700
Subject: Continue to refactor locale and gallery3 ui from the user module to
 the gallery module

---
 modules/gallery/helpers/gallery_theme.php | 13 +++++++++++
 modules/user/helpers/user_theme.php       | 36 -------------------------------
 2 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 modules/user/helpers/user_theme.php

(limited to 'modules/user')

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/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();
-    }
-  }
-}
-- 
cgit v1.2.3


From 2af48060117bdf30fb48929dd8c9d22800a70843 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 13:19:17 -0700
Subject: Refactor the ui component of the user module into the gallery core
 module.

---
 modules/gallery/controllers/admin_users.php        | 290 +++++++++++++++++++++
 modules/gallery/controllers/login.php              |  81 ++++++
 modules/gallery/controllers/logout.php             |  38 +++
 modules/gallery/controllers/password.php           | 133 ++++++++++
 modules/gallery/controllers/users.php              |  68 +++++
 modules/gallery/helpers/gallery_event.php          |   4 +
 modules/gallery/views/admin_users.html.php         | 128 +++++++++
 modules/gallery/views/admin_users_group.html.php   |  38 +++
 modules/gallery/views/login.html.php               |  22 ++
 modules/gallery/views/login_ajax.html.php          |  43 +++
 modules/gallery/views/reset_password.html.php      |  17 ++
 .../gallery/views/user_languages_block.html.php    |  19 ++
 modules/user/controllers/admin_users.php           | 290 ---------------------
 modules/user/controllers/login.php                 |  81 ------
 modules/user/controllers/logout.php                |  38 ---
 modules/user/controllers/password.php              | 133 ----------
 modules/user/controllers/users.php                 |  68 -----
 modules/user/helpers/user_event.php                |  28 --
 modules/user/views/admin_users.html.php            | 128 ---------
 modules/user/views/admin_users_group.html.php      |  38 ---
 modules/user/views/login.html.php                  |  22 --
 modules/user/views/login_ajax.html.php             |  43 ---
 modules/user/views/reset_password.html.php         |  17 --
 modules/user/views/user_languages_block.html.php   |  19 --
 24 files changed, 881 insertions(+), 905 deletions(-)
 create mode 100644 modules/gallery/controllers/admin_users.php
 create mode 100644 modules/gallery/controllers/login.php
 create mode 100644 modules/gallery/controllers/logout.php
 create mode 100644 modules/gallery/controllers/password.php
 create mode 100644 modules/gallery/controllers/users.php
 create mode 100644 modules/gallery/views/admin_users.html.php
 create mode 100644 modules/gallery/views/admin_users_group.html.php
 create mode 100644 modules/gallery/views/login.html.php
 create mode 100644 modules/gallery/views/login_ajax.html.php
 create mode 100644 modules/gallery/views/reset_password.html.php
 create mode 100644 modules/gallery/views/user_languages_block.html.php
 delete mode 100644 modules/user/controllers/admin_users.php
 delete mode 100644 modules/user/controllers/login.php
 delete mode 100644 modules/user/controllers/logout.php
 delete mode 100644 modules/user/controllers/password.php
 delete mode 100644 modules/user/controllers/users.php
 delete mode 100644 modules/user/helpers/user_event.php
 delete mode 100644 modules/user/views/admin_users.html.php
 delete mode 100644 modules/user/views/admin_users_group.html.php
 delete mode 100644 modules/user/views/login.html.php
 delete mode 100644 modules/user/views/login_ajax.html.php
 delete mode 100644 modules/user/views/reset_password.html.php
 delete mode 100644 modules/user/views/user_languages_block.html.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
new file mode 100644
index 00000000..a8a8cd95
--- /dev/null
+++ b/modules/gallery/controllers/admin_users.php
@@ -0,0 +1,290 @@
+<?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 Admin_Users_Controller extends Admin_Controller {
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_users.html");
+    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
+    print $view;
+  }
+
+  public function add_user() {
+    access::verify_csrf();
+
+    $form = user::get_add_form_admin();
+    $valid = $form->validate();
+    $name = $form->add_user->inputs["name"]->value;
+    if ($user = user::lookup_by_name($name)) {
+      $form->add_user->inputs["name"]->add_error("in_use", 1);
+      $valid = false;
+    }
+
+    if ($valid) {
+      $user = user::create(
+        $name, $form->add_user->full_name->value, $form->add_user->password->value);
+      $user->email = $form->add_user->email->value;
+      $user->admin = $form->add_user->admin->checked;
+
+      if ($form->add_user->locale) {
+        $desired_locale = $form->add_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+      $user->save();
+      module::event("user_add_form_admin_completed", $user, $form);
+
+      message::success(t("Created user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_user_form() {
+    print user::get_add_form_admin();
+  }
+
+  public function delete_user($id) {
+    access::verify_csrf();
+
+    if ($id == user::active()->id || $id == user::guest()->id) {
+      access::forbidden();
+    }
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_delete_form_admin($user);
+    if($form->validate()) {
+      $name = $user->name;
+      $user->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted user %user_name", array("user_name" => $name));
+    log::success("user", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+    print user::get_delete_form_admin($user);
+  }
+
+  public function edit_user($id) {
+    access::verify_csrf();
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->edit_user->inputs["name"]->value;
+      $temp_user = user::lookup_by_name($new_name);
+      if ($new_name != $user->name &&
+          ($temp_user && $temp_user->id != $user->id)) {
+        $form->edit_user->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      } else {
+        $user->name = $new_name;
+      }
+    }
+
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+
+      // An admin can change the admin status for any user but themselves
+      if ($user->id != user::active()->id) {
+        $user->admin = $form->edit_user->admin->checked;
+      }
+      $user->save();
+      module::event("user_edit_form_admin_completed", $user, $form);
+
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    // Don't allow the user to control their own admin bit, else you can lock yourself out
+    if ($user->id == user::active()->id) {
+      $form->edit_user->admin->disabled(1);
+    }
+    print $form;
+  }
+
+  public function add_user_to_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->add($user);
+    $group->save();
+  }
+
+  public function remove_user_from_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->remove($user);
+    $group->save();
+  }
+
+  public function group($group_id) {
+    $view = new View("admin_users_group.html");
+    $view->group = group::lookup($group_id);
+    print $view;
+  }
+
+  public function add_group() {
+    access::verify_csrf();
+
+    $form = group::get_add_form_admin();
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->add_group->inputs["name"]->value;
+      $group = group::lookup_by_name($new_name);
+      if (!empty($group)) {
+        $form->add_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group = group::create($new_name);
+      $group->save();
+      message::success(
+        t("Created group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_group_form() {
+    print group::get_add_form_admin();
+  }
+
+  public function delete_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    $form = group::get_delete_form_admin($group);
+    if ($form->validate()) {
+      $name = $group->name;
+      $group->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted group %group_name", array("group_name" => $name));
+    log::success("group", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_delete_form_admin($group);
+  }
+
+  public function edit_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+       kohana::show_404();
+    }
+
+    $form = group::get_edit_form_admin($group);
+    $valid = $form->validate();
+
+    if ($valid) {
+      $new_name = $form->edit_group->inputs["name"]->value;
+      $group = group::lookup_by_name($name);
+      if ($group->loaded) {
+        $form->edit_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group->name = $form->edit_group->inputs["name"]->value;
+      $group->save();
+      message::success(
+        t("Changed group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      message::error(
+        t("Failed to change group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_edit_form_admin($group);
+  }
+
+}
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
new file mode 100644
index 00000000..2c4bd557
--- /dev/null
+++ b/modules/gallery/controllers/login.php
@@ -0,0 +1,81 @@
+<?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_Controller extends Controller {
+
+  public function ajax() {
+    $view = new View("login_ajax.html");
+    $view->form = user::get_login_form("login/auth_ajax");
+    print $view;
+  }
+
+  public function auth_ajax() {
+    access::verify_csrf();
+
+    list ($valid, $form) = $this->_auth("login/auth_ajax");
+    if ($valid) {
+      print json_encode(
+        array("result" => "success"));
+    } else {
+      print json_encode(
+        array("result" => "error",
+              "form" => $form->__toString()));
+    }
+  }
+
+  public function html() {
+    print user::get_login_form("login/auth_html");
+  }
+
+  public function auth_html() {
+    access::verify_csrf();
+
+    list ($valid, $form) = $this->_auth("login/auth_html");
+    if ($valid) {
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $form;
+    }
+  }
+  private function _auth($url) {
+    $form = user::get_login_form($url);
+    $valid = $form->validate();
+    if ($valid) {
+      $user = user::lookup_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
+        log::warning(
+          "user",
+          t("Failed login for %name",
+            array("name" => $form->login->inputs["name"]->value)));
+        $form->login->inputs["name"]->add_error("invalid_login", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      user::login($user);
+      log::info("user", t("User %name logged in", array("name" => $user->name)));
+    }
+
+    // Either way, regenerate the session id to avoid session trapping
+    Session::instance()->regenerate();
+
+    return array($valid, $form);
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
new file mode 100644
index 00000000..45d397ad
--- /dev/null
+++ b/modules/gallery/controllers/logout.php
@@ -0,0 +1,38 @@
+<?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 Logout_Controller extends Controller {
+  public function index() {
+    //access::verify_csrf();
+
+    $user = user::active();
+    user::logout();
+    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")) {
+      $item = url::get_item_from_uri($continue_url);
+      if (access::can("view", $item)) {
+        // Don't use url::redirect() because it'll call url::site() and munge the continue url.
+        header("Location: $continue_url");
+      } else {
+        url::redirect(item::root()->abs_url());
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/password.php b/modules/gallery/controllers/password.php
new file mode 100644
index 00000000..e8b08960
--- /dev/null
+++ b/modules/gallery/controllers/password.php
@@ -0,0 +1,133 @@
+<?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 Password_Controller extends Controller {
+  public function reset() {
+    if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
+      $this->_send_reset();
+    } else {
+      print $this->_reset_form();
+    }
+  }
+
+  public function do_reset() {
+    if (request::method() == "post") {
+      $this->_change_password();
+    } else {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (!empty($user)) {
+        print $this->_new_password_form($user->hash);
+      } else {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+    }
+  }
+
+  private function _send_reset() {
+    $form = $this->_reset_form();
+
+    $valid = $form->validate();
+    if ($valid) {
+      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
+      if (!$user->loaded || empty($user->email)) {
+        $form->reset->inputs["name"]->add_error("no_email", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $user->hash = md5(rand());
+      $user->save();
+      $message = new View("reset_password.html");
+      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
+      $message->user = $user;
+
+      Sendmail::factory()
+        ->to($user->email)
+        ->subject(t("Password Reset Request"))
+        ->header("Mime-Version", "1.0")
+        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->message($message->render())
+        ->send();
+
+      log::success(
+        "user",
+        t("Password reset email sent for user %name", array("name" => $user->name)));
+    } else {
+      // Don't include the username here until you're sure that it's XSS safe
+      log::warning(
+        "user", "Password reset email requested for bogus user");
+    }
+
+    message::success(t("Password reset email sent"));
+    print json_encode(
+      array("result" => "success"));
+  }
+
+  private function _reset_form() {
+    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
+    $group = $form->group("reset")->label(t("Reset Password"));
+    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
+    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
+    $group->submit("")->value(t("Reset"));
+
+    return $form;
+  }
+
+  private function _new_password_form($hash=null) {
+    $template = new Theme_View("page.html", "reset");
+
+    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
+    $group = $form->group("reset")->label(t("Change Password"));
+    $hidden = $group->hidden("hash");
+    if (!empty($hash)) {
+      $hidden->value($hash);
+    }
+    $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules("required|length[1,40]");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->inputs["password2"]->error_messages(
+      "mistyped", t("The password and the confirm password must match"));
+    $group->submit("")->value(t("Update"));
+
+    $template->content = $form;
+    return $template;
+  }
+
+  private function _change_password() {
+    $view = $this->_new_password_form();
+    if ($view->content->validate()) {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (empty($user)) {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+
+      $user->password = $view->content->reset->password->value;
+      $user->hash = null;
+      $user->save();
+      message::success(t("Password reset successfully"));
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $view;
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/controllers/users.php b/modules/gallery/controllers/users.php
new file mode 100644
index 00000000..07c5a457
--- /dev/null
+++ b/modules/gallery/controllers/users.php
@@ -0,0 +1,68 @@
+<?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 Users_Controller extends Controller {
+  public function update($id) {
+    $user = user::lookup($id);
+
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    $form = user::get_edit_form($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $new_locale = $desired_locale == "none" ? null : $desired_locale;
+        if ($new_locale != $user->locale) {
+          // Delete the session based locale preference
+          setcookie("g_locale", "", time() - 24 * 3600, "/");
+        }
+        $user->locale = $new_locale;
+      }
+      $user->save();
+      module::event("user_edit_form_completed", $user, $form);
+
+      message::success(t("User information updated."));
+      print json_encode(
+        array("result" => "success",
+              "resource" => url::site("users/{$user->id}")));
+    } else {
+      print json_encode(
+        array("result" => "error",
+              "form" => $form->__toString()));
+    }
+  }
+
+  public function form_edit($id) {
+    $user = user::lookup($id);
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    print user::get_edit_form($user);
+  }
+}
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 106aa202..e0de2152 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -187,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/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
new file mode 100644
index 00000000..a127bc15
--- /dev/null
+++ b/modules/gallery/views/admin_users.html.php
@@ -0,0 +1,128 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+  $(document).ready(function(){
+    $("#g-user-admin-list .core-info").draggable({
+      helper: "clone"
+    });
+    $("#g-group-admin .g-group").droppable({
+      accept: ".core-info",
+      hoverClass: "g-selected",
+      drop: function(ev, ui) {
+        var user_id = $(ui.draggable).attr("id").replace("user-", "");
+        var group_id = $(this).attr("id").replace("group-", "");
+        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+              {},
+              function() {
+                reload_group(group_id);
+              });
+      }
+    });
+    $("#group-1").droppable("destroy");
+    $("#group-2").droppable("destroy");
+  });
+
+  var reload_group = function(group_id) {
+    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
+    $.get(reload_group_url.replace("__GROUPID__", group_id),
+          {},
+          function(data) {
+            $("#group-" + group_id).html(data);
+            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
+          });
+  }
+
+  var remove_user = function(user_id, group_id) {
+    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+          {},
+          function() {
+            reload_group(group_id);
+          });
+  }
+</script>
+<div class="g-block">
+  <a href="<?= url::site("admin/users/add_user_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new user")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new user") ?>
+  </a>
+
+  <h2>
+    <?= t("User Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <table id="g-user-admin-list">
+      <tr>
+        <th><?= t("Username") ?></th>
+        <th><?= t("Full name") ?></th>
+        <th><?= t("Email") ?></th>
+        <th><?= t("Last login") ?></th>
+        <th><?= t("Actions") ?></th>
+      </tr>
+
+      <? foreach ($users as $i => $user): ?>
+      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+               alt="<?= html::clean_attribute($user->name) ?>"
+               width="20"
+               height="20" />
+          <?= html::clean($user->name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->full_name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->email) ?>
+        </td>
+        <td>
+          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
+        </td>
+        <td class="g-actions">
+          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+              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>
+          <? if (user::active()->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>
+          <? 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>
+          <? endif ?>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
+  </div>
+</div>
+
+<div id="g-group-admin" class="g-block g-clearfix">
+  <a href="<?= url::site("admin/users/add_group_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new group")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new group") ?>
+  </a>
+
+  <h2>
+    <?= t("Group Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <ul>
+      <? foreach ($groups as $i => $group): ?>
+      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+        <?= $v ?>
+      </li>
+      <? endforeach ?>
+    </ul>
+  </div>
+</div>
diff --git a/modules/gallery/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
new file mode 100644
index 00000000..db3645a0
--- /dev/null
+++ b/modules/gallery/views/admin_users_group.html.php
@@ -0,0 +1,38 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<h4>
+  <?= html::clean($group->name) ?>
+  <? if (!$group->special): ?>
+  <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>
+  <? 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>
+  <? endif ?>
+</h4>
+
+<? if ($group->users->count() > 0): ?>
+<ul>
+  <? foreach ($group->users as $i => $user): ?>
+  <li class="g-user">
+    <?= html::clean($user->name) ?>
+    <? if (!$group->special): ?>
+    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
+       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>
+    </a>
+    <? endif ?>
+  </li>
+  <? endforeach ?>
+</ul>
+<? else: ?>
+<div>
+  <p>
+    <?= 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/gallery/views/login.html.php b/modules/gallery/views/login.html.php
new file mode 100644
index 00000000..049ba043
--- /dev/null
+++ b/modules/gallery/views/login.html.php
@@ -0,0 +1,22 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul id="g-login-menu">
+  <? if ($user->guest): ?>
+  <li class="first">
+    <a href="<?= url::site("login/ajax") ?>"
+       title="<?= t("Login to Gallery")->for_html_attr() ?>"
+       id="g-login-link"><?= t("Login") ?></a>
+  </li>
+  <? else: ?>
+  <li class="first">
+    <?= 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() .
+      '" id="g-user-profile-link" class="g-dialog-link">' .
+      html::clean($user->display_name()) . '</a>'))) ?>
+  </li>
+  <li>
+    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
+       id="g-logout-link"><?= t("Logout") ?></a>
+  </li>
+  <? endif ?>
+</ul>
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
new file mode 100644
index 00000000..d3364b46
--- /dev/null
+++ b/modules/gallery/views/login_ajax.html.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  $("#g-login-form").ready(function() {
+    $("#g-password-reset").click(function() {
+      $.ajax({
+        url: "<?= url::site("password/reset") ?>",
+        success: function(data) {
+          $("#g-login").html(data);
+          $("#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();
+        }
+      });
+    });
+  });
+
+  function ajaxify_login_reset_form() {
+    $("#g-login form").ajaxForm({
+      dataType: "json",
+      success: function(data) {
+        if (data.form) {
+          $("#g-login form").replaceWith(data.form);
+          ajaxify_login_reset_form();
+        }
+        if (data.result == "success") {
+          $("#g-dialog").dialog("close");
+          window.location.reload();
+        }
+      }
+    });
+  };
+</script>
+<div id="g-login">
+  <ul>
+    <li id="g-login-form">
+      <?= $form ?>
+    </li>
+    <li>
+      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
+    </li>
+  </ul>
+</div>
diff --git a/modules/gallery/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
new file mode 100644
index 00000000..92ca4917
--- /dev/null
+++ b/modules/gallery/views/reset_password.html.php
@@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Password Reset Request") ?> </title>
+  </head>
+  <body>
+    <h2><?= t("Password Reset Request") ?> </h2>
+    <p>
+      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
+    </p>
+    <p>
+  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
+        array("site_url" => html::mark_clean(url::base(false, "http")),
+              "confirm_url" => $confirm_url)) ?>
+    </p>
+  </body>
+</html>
diff --git a/modules/gallery/views/user_languages_block.html.php b/modules/gallery/views/user_languages_block.html.php
new file mode 100644
index 00000000..89185967
--- /dev/null
+++ b/modules/gallery/views/user_languages_block.html.php
@@ -0,0 +1,19 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
+<script type="text/javascript">
+  $("#g-select-session-locale").change(function() {
+    var old_locale_preference = <?= html::js_string($selected) ?>;
+    var locale = $(this).val();
+    if (old_locale_preference == locale) {
+      return;
+    }
+
+    var expires = -1;
+    if (locale) {
+      expires = 365;
+    }
+    $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
+    window.location.reload(true);
+  });
+</script>
+
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
deleted file mode 100644
index a8a8cd95..00000000
--- a/modules/user/controllers/admin_users.php
+++ /dev/null
@@ -1,290 +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 Admin_Users_Controller extends Admin_Controller {
-  public function index() {
-    $view = new Admin_View("admin.html");
-    $view->content = new View("admin_users.html");
-    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
-    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
-    print $view;
-  }
-
-  public function add_user() {
-    access::verify_csrf();
-
-    $form = user::get_add_form_admin();
-    $valid = $form->validate();
-    $name = $form->add_user->inputs["name"]->value;
-    if ($user = user::lookup_by_name($name)) {
-      $form->add_user->inputs["name"]->add_error("in_use", 1);
-      $valid = false;
-    }
-
-    if ($valid) {
-      $user = user::create(
-        $name, $form->add_user->full_name->value, $form->add_user->password->value);
-      $user->email = $form->add_user->email->value;
-      $user->admin = $form->add_user->admin->checked;
-
-      if ($form->add_user->locale) {
-        $desired_locale = $form->add_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-      $user->save();
-      module::event("user_add_form_admin_completed", $user, $form);
-
-      message::success(t("Created user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_user_form() {
-    print user::get_add_form_admin();
-  }
-
-  public function delete_user($id) {
-    access::verify_csrf();
-
-    if ($id == user::active()->id || $id == user::guest()->id) {
-      access::forbidden();
-    }
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_delete_form_admin($user);
-    if($form->validate()) {
-      $name = $user->name;
-      $user->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted user %user_name", array("user_name" => $name));
-    log::success("user", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-    print user::get_delete_form_admin($user);
-  }
-
-  public function edit_user($id) {
-    access::verify_csrf();
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->edit_user->inputs["name"]->value;
-      $temp_user = user::lookup_by_name($new_name);
-      if ($new_name != $user->name &&
-          ($temp_user && $temp_user->id != $user->id)) {
-        $form->edit_user->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      } else {
-        $user->name = $new_name;
-      }
-    }
-
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-
-      // An admin can change the admin status for any user but themselves
-      if ($user->id != user::active()->id) {
-        $user->admin = $form->edit_user->admin->checked;
-      }
-      $user->save();
-      module::event("user_edit_form_admin_completed", $user, $form);
-
-      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    // Don't allow the user to control their own admin bit, else you can lock yourself out
-    if ($user->id == user::active()->id) {
-      $form->edit_user->admin->disabled(1);
-    }
-    print $form;
-  }
-
-  public function add_user_to_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->add($user);
-    $group->save();
-  }
-
-  public function remove_user_from_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->remove($user);
-    $group->save();
-  }
-
-  public function group($group_id) {
-    $view = new View("admin_users_group.html");
-    $view->group = group::lookup($group_id);
-    print $view;
-  }
-
-  public function add_group() {
-    access::verify_csrf();
-
-    $form = group::get_add_form_admin();
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->add_group->inputs["name"]->value;
-      $group = group::lookup_by_name($new_name);
-      if (!empty($group)) {
-        $form->add_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group = group::create($new_name);
-      $group->save();
-      message::success(
-        t("Created group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_group_form() {
-    print group::get_add_form_admin();
-  }
-
-  public function delete_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    $form = group::get_delete_form_admin($group);
-    if ($form->validate()) {
-      $name = $group->name;
-      $group->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted group %group_name", array("group_name" => $name));
-    log::success("group", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_delete_form_admin($group);
-  }
-
-  public function edit_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-       kohana::show_404();
-    }
-
-    $form = group::get_edit_form_admin($group);
-    $valid = $form->validate();
-
-    if ($valid) {
-      $new_name = $form->edit_group->inputs["name"]->value;
-      $group = group::lookup_by_name($name);
-      if ($group->loaded) {
-        $form->edit_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group->name = $form->edit_group->inputs["name"]->value;
-      $group->save();
-      message::success(
-        t("Changed group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      message::error(
-        t("Failed to change group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_edit_form_admin($group);
-  }
-
-}
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
deleted file mode 100644
index 2c4bd557..00000000
--- a/modules/user/controllers/login.php
+++ /dev/null
@@ -1,81 +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_Controller extends Controller {
-
-  public function ajax() {
-    $view = new View("login_ajax.html");
-    $view->form = user::get_login_form("login/auth_ajax");
-    print $view;
-  }
-
-  public function auth_ajax() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_ajax");
-    if ($valid) {
-      print json_encode(
-        array("result" => "success"));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function html() {
-    print user::get_login_form("login/auth_html");
-  }
-
-  public function auth_html() {
-    access::verify_csrf();
-
-    list ($valid, $form) = $this->_auth("login/auth_html");
-    if ($valid) {
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $form;
-    }
-  }
-  private function _auth($url) {
-    $form = user::get_login_form($url);
-    $valid = $form->validate();
-    if ($valid) {
-      $user = user::lookup_by_name($form->login->inputs["name"]->value);
-      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
-        log::warning(
-          "user",
-          t("Failed login for %name",
-            array("name" => $form->login->inputs["name"]->value)));
-        $form->login->inputs["name"]->add_error("invalid_login", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      user::login($user);
-      log::info("user", t("User %name logged in", array("name" => $user->name)));
-    }
-
-    // Either way, regenerate the session id to avoid session trapping
-    Session::instance()->regenerate();
-
-    return array($valid, $form);
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
deleted file mode 100644
index 45d397ad..00000000
--- a/modules/user/controllers/logout.php
+++ /dev/null
@@ -1,38 +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 Logout_Controller extends Controller {
-  public function index() {
-    //access::verify_csrf();
-
-    $user = user::active();
-    user::logout();
-    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")) {
-      $item = url::get_item_from_uri($continue_url);
-      if (access::can("view", $item)) {
-        // Don't use url::redirect() because it'll call url::site() and munge the continue url.
-        header("Location: $continue_url");
-      } else {
-        url::redirect(item::root()->abs_url());
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
deleted file mode 100644
index e8b08960..00000000
--- a/modules/user/controllers/password.php
+++ /dev/null
@@ -1,133 +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 Password_Controller extends Controller {
-  public function reset() {
-    if (request::method() == "post") {
-      // @todo separate the post from get parts of this function
-      access::verify_csrf();
-      $this->_send_reset();
-    } else {
-      print $this->_reset_form();
-    }
-  }
-
-  public function do_reset() {
-    if (request::method() == "post") {
-      $this->_change_password();
-    } else {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
-      if (!empty($user)) {
-        print $this->_new_password_form($user->hash);
-      } else {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-    }
-  }
-
-  private function _send_reset() {
-    $form = $this->_reset_form();
-
-    $valid = $form->validate();
-    if ($valid) {
-      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
-        $form->reset->inputs["name"]->add_error("no_email", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $user->hash = md5(rand());
-      $user->save();
-      $message = new View("reset_password.html");
-      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
-      $message->user = $user;
-
-      Sendmail::factory()
-        ->to($user->email)
-        ->subject(t("Password Reset Request"))
-        ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
-        ->message($message->render())
-        ->send();
-
-      log::success(
-        "user",
-        t("Password reset email sent for user %name", array("name" => $user->name)));
-    } else {
-      // Don't include the username here until you're sure that it's XSS safe
-      log::warning(
-        "user", "Password reset email requested for bogus user");
-    }
-
-    message::success(t("Password reset email sent"));
-    print json_encode(
-      array("result" => "success"));
-  }
-
-  private function _reset_form() {
-    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
-    $group = $form->group("reset")->label(t("Reset Password"));
-    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
-    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
-    $group->submit("")->value(t("Reset"));
-
-    return $form;
-  }
-
-  private function _new_password_form($hash=null) {
-    $template = new Theme_View("page.html", "reset");
-
-    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
-    $group = $form->group("reset")->label(t("Change Password"));
-    $hidden = $group->hidden("hash");
-    if (!empty($hash)) {
-      $hidden->value($hash);
-    }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->inputs["password2"]->error_messages(
-      "mistyped", t("The password and the confirm password must match"));
-    $group->submit("")->value(t("Update"));
-
-    $template->content = $form;
-    return $template;
-  }
-
-  private function _change_password() {
-    $view = $this->_new_password_form();
-    if ($view->content->validate()) {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
-      if (empty($user)) {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-
-      $user->password = $view->content->reset->password->value;
-      $user->hash = null;
-      $user->save();
-      message::success(t("Password reset successfully"));
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $view;
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
deleted file mode 100644
index 07c5a457..00000000
--- a/modules/user/controllers/users.php
+++ /dev/null
@@ -1,68 +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 Users_Controller extends Controller {
-  public function update($id) {
-    $user = user::lookup($id);
-
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    $form = user::get_edit_form($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $new_locale = $desired_locale == "none" ? null : $desired_locale;
-        if ($new_locale != $user->locale) {
-          // Delete the session based locale preference
-          setcookie("g_locale", "", time() - 24 * 3600, "/");
-        }
-        $user->locale = $new_locale;
-      }
-      $user->save();
-      module::event("user_edit_form_completed", $user, $form);
-
-      message::success(t("User information updated."));
-      print json_encode(
-        array("result" => "success",
-              "resource" => url::site("users/{$user->id}")));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function form_edit($id) {
-    $user = user::lookup($id);
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print user::get_edit_form($user);
-  }
-}
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
deleted file mode 100644
index 93a92589..00000000
--- a/modules/user/helpers/user_event.php
+++ /dev/null
@@ -1,28 +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 {
-  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")));
-  }
-}
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
deleted file mode 100644
index a127bc15..00000000
--- a/modules/user/views/admin_users.html.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-  $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
-      helper: "clone"
-    });
-    $("#g-group-admin .g-group").droppable({
-      accept: ".core-info",
-      hoverClass: "g-selected",
-      drop: function(ev, ui) {
-        var user_id = $(ui.draggable).attr("id").replace("user-", "");
-        var group_id = $(this).attr("id").replace("group-", "");
-        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-              {},
-              function() {
-                reload_group(group_id);
-              });
-      }
-    });
-    $("#group-1").droppable("destroy");
-    $("#group-2").droppable("destroy");
-  });
-
-  var reload_group = function(group_id) {
-    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
-    $.get(reload_group_url.replace("__GROUPID__", group_id),
-          {},
-          function(data) {
-            $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
-          });
-  }
-
-  var remove_user = function(user_id, group_id) {
-    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-          {},
-          function() {
-            reload_group(group_id);
-          });
-  }
-</script>
-<div class="g-block">
-  <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new user") ?>
-  </a>
-
-  <h2>
-    <?= t("User Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <table id="g-user-admin-list">
-      <tr>
-        <th><?= t("Username") ?></th>
-        <th><?= t("Full name") ?></th>
-        <th><?= t("Email") ?></th>
-        <th><?= t("Last login") ?></th>
-        <th><?= t("Actions") ?></th>
-      </tr>
-
-      <? foreach ($users as $i => $user): ?>
-      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
-               alt="<?= html::clean_attribute($user->name) ?>"
-               width="20"
-               height="20" />
-          <?= html::clean($user->name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->full_name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->email) ?>
-        </td>
-        <td>
-          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
-        </td>
-        <td class="g-actions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-              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>
-          <? if (user::active()->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>
-          <? 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>
-          <? endif ?>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-  </div>
-</div>
-
-<div id="g-group-admin" class="g-block g-clearfix">
-  <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new group") ?>
-  </a>
-
-  <h2>
-    <?= t("Group Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <ul>
-      <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
-        <?= $v ?>
-      </li>
-      <? endforeach ?>
-    </ul>
-  </div>
-</div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
deleted file mode 100644
index db3645a0..00000000
--- a/modules/user/views/admin_users_group.html.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<h4>
-  <?= html::clean($group->name) ?>
-  <? if (!$group->special): ?>
-  <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>
-  <? 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>
-  <? endif ?>
-</h4>
-
-<? if ($group->users->count() > 0): ?>
-<ul>
-  <? foreach ($group->users as $i => $user): ?>
-  <li class="g-user">
-    <?= html::clean($user->name) ?>
-    <? if (!$group->special): ?>
-    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       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>
-    </a>
-    <? endif ?>
-  </li>
-  <? endforeach ?>
-</ul>
-<? else: ?>
-<div>
-  <p>
-    <?= 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/login.html.php b/modules/user/views/login.html.php
deleted file mode 100644
index 049ba043..00000000
--- a/modules/user/views/login.html.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu">
-  <? if ($user->guest): ?>
-  <li class="first">
-    <a href="<?= url::site("login/ajax") ?>"
-       title="<?= t("Login to Gallery")->for_html_attr() ?>"
-       id="g-login-link"><?= t("Login") ?></a>
-  </li>
-  <? else: ?>
-  <li class="first">
-    <?= 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() .
-      '" id="g-user-profile-link" class="g-dialog-link">' .
-      html::clean($user->display_name()) . '</a>'))) ?>
-  </li>
-  <li>
-    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
-       id="g-logout-link"><?= t("Logout") ?></a>
-  </li>
-  <? endif ?>
-</ul>
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
deleted file mode 100644
index d3364b46..00000000
--- a/modules/user/views/login_ajax.html.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#g-login-form").ready(function() {
-    $("#g-password-reset").click(function() {
-      $.ajax({
-        url: "<?= url::site("password/reset") ?>",
-        success: function(data) {
-          $("#g-login").html(data);
-          $("#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();
-        }
-      });
-    });
-  });
-
-  function ajaxify_login_reset_form() {
-    $("#g-login form").ajaxForm({
-      dataType: "json",
-      success: function(data) {
-        if (data.form) {
-          $("#g-login form").replaceWith(data.form);
-          ajaxify_login_reset_form();
-        }
-        if (data.result == "success") {
-          $("#g-dialog").dialog("close");
-          window.location.reload();
-        }
-      }
-    });
-  };
-</script>
-<div id="g-login">
-  <ul>
-    <li id="g-login-form">
-      <?= $form ?>
-    </li>
-    <li>
-      <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
-    </li>
-  </ul>
-</div>
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
deleted file mode 100644
index 92ca4917..00000000
--- a/modules/user/views/reset_password.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<html>
-  <head>
-    <title><?= t("Password Reset Request") ?> </title>
-  </head>
-  <body>
-    <h2><?= t("Password Reset Request") ?> </h2>
-    <p>
-      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
-    </p>
-    <p>
-  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
-        array("site_url" => html::mark_clean(url::base(false, "http")),
-              "confirm_url" => $confirm_url)) ?>
-    </p>
-  </body>
-</html>
diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
deleted file mode 100644
index 89185967..00000000
--- a/modules/user/views/user_languages_block.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?>
-<script type="text/javascript">
-  $("#g-select-session-locale").change(function() {
-    var old_locale_preference = <?= html::js_string($selected) ?>;
-    var locale = $(this).val();
-    if (old_locale_preference == locale) {
-      return;
-    }
-
-    var expires = -1;
-    if (locale) {
-      expires = 365;
-    }
-    $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
-    window.location.reload(true);
-  });
-</script>
-
-- 
cgit v1.2.3


From 14e14003de0ae5dfe1886bec5bec435d15c7554f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 13:37:37 -0700
Subject: refactor the user and group helpers into the gallery core module.  2
 reason, first it makes sense that users and groups are a gallery requirement
 and belong in core. secondly, prepares the way for the Identity refactor.

---
 modules/gallery/helpers/group.php | 128 +++++++++++++
 modules/gallery/helpers/user.php  | 367 ++++++++++++++++++++++++++++++++++++++
 modules/user/helpers/group.php    | 128 -------------
 modules/user/helpers/user.php     | 367 --------------------------------------
 4 files changed, 495 insertions(+), 495 deletions(-)
 create mode 100644 modules/gallery/helpers/group.php
 create mode 100644 modules/gallery/helpers/user.php
 delete mode 100644 modules/user/helpers/group.php
 delete mode 100644 modules/user/helpers/user.php

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
new file mode 100644
index 00000000..fbc5157d
--- /dev/null
+++ b/modules/gallery/helpers/group.php
@@ -0,0 +1,128 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling groups.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class group_Core {
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  static function create($name) {
+    $group = ORM::factory("group")->where("name", $name)->find();
+    if ($group->loaded) {
+      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
+    }
+
+    $group->name = $name;
+    $group->save();
+
+    return $group;
+  }
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Model
+   */
+  static function everybody() {
+    return model_cache::get("group", 1);
+  }
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Model
+   */
+  static function registered_users() {
+    return model_cache::get("group", 2);
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Model  the group object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    $group = model_cache::get("group", $name, "name");
+    if ($group->loaded) {
+      return $group;
+    }
+    return null;
+  }
+
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the group list.
+   */
+  static function get_group_list($filter=array()) {
+    $group = ORM::factory("group");
+
+    foreach($filter as $method => $args) {
+      switch ($method) {
+      case "in":
+        $group->in($args[0], $args[1]);
+        break;
+      default:
+        $group->$method($args);
+      }
+    }
+    return $group->find_all();
+  }
+
+  static function get_edit_form_admin($group) {
+    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
+    $form_group = $form->group("edit_group")->label(t("Edit Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Save"));
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  static function get_add_form_admin() {
+    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
+    $form->set_attr('class', "g-narrow");
+    $form_group = $form->group("add_group")->label(t("Add Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name");
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Add Group"));
+    $group = ORM::factory("group");
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  static function get_delete_form_admin($group) {
+    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
+                      array("id" => "g-delete-group-form"));
+    $form_group = $form->group("delete_group")->label(
+      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
+    $form_group->submit("")->value(t("Delete"));
+    return $form;
+  }
+}
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
new file mode 100644
index 00000000..7aa990e1
--- /dev/null
+++ b/modules/gallery/helpers/user.php
@@ -0,0 +1,367 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling users.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class user_Core {
+  static function get_edit_form($user) {
+    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
+    $form->set_attr("class", "g-narrow");
+    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $form->add_rules_from($user);
+
+    module::event("user_edit_form", $user, $form);
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
+
+  static function get_edit_form_admin($user) {
+    $form = new Forge(
+      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
+    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
+    $group->inputs["name"]->error_messages(
+      "in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
+    $form->add_rules_from($user);
+    $form->edit_user->password->rules("-required");
+
+    module::event("user_edit_form_admin", $user, $form);
+    $group->submit("")->value(t("Modify User"));
+    return $form;
+  }
+
+  static function get_add_form_admin() {
+    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
+    $form->set_attr('class', "g-narrow");
+    $group = $form->group("add_user")->label(t("Add User"));
+    $group->input("name")->label(t("Username"))->id("g-username")
+      ->error_messages("in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email");
+    $group->input("url")->label(t("URL"))->id("g-url");
+    self::_add_locale_dropdown($group);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
+    $user = ORM::factory("user");
+    $form->add_rules_from($user);
+
+    module::event("user_add_form_admin", $user, $form);
+    $group->submit("")->value(t("Add User"));
+    return $form;
+  }
+
+  private static function _add_locale_dropdown(&$form, $user=null) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      // Put "none" at the first position in the array
+      $locales = array_merge(array("" => t("« none »")), $locales);
+      $selected_locale = ($user && $user->locale) ? $user->locale : "";
+      $form->dropdown("locale")
+        ->label(t("Language Preference"))
+        ->options($locales)
+        ->selected($selected_locale);
+    }
+  }
+
+  static function get_delete_form_admin($user) {
+    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
+                      array("id" => "g-delete-user-form"));
+    $group = $form->group("delete_user")->label(
+      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
+    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
+    return $form;
+  }
+
+  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;
+  }
+
+  /**
+   * 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 = user::guest());
+    }
+
+    // The installer cannot set a user into the session, so it just sets an id which we should
+    // upconvert into a user.
+    if ($user === 2) {
+      $user = model_cache::get("user", 2);
+      user::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);
+    }
+  }
+
+  /**
+   * Return the array of group ids this user belongs to
+   *
+   * @return array
+   */
+  static function group_ids() {
+    return Session::instance()->get("group_ids", array(1));
+  }
+
+  /**
+   * 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 = user::guest();
+    }
+    return $user;
+  }
+
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return User_Model
+   */
+  static function guest() {
+    return model_cache::get("user", 1);
+  }
+
+  /**
+   * 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();
+  }
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Model
+   */
+  static function create($name, $full_name, $password) {
+    $user = ORM::factory("user")->where("name", $name)->find();
+    if ($user->loaded) {
+      throw new Exception("@todo USER_ALREADY_EXISTS $name");
+    }
+
+    $user->name = $name;
+    $user->full_name = $full_name;
+    $user->password = $password;
+
+    // Required groups
+    $user->add(group::everybody());
+    $user->add(group::registered_users());
+
+    $user->save();
+    return $user;
+  }
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  static function is_correct_password($user, $password) {
+    $valid = $user->password;
+
+    // Try phpass first, since that's what we generate.
+    if (strlen($valid) == 34) {
+      require_once(MODPATH . "user/lib/PasswordHash.php");
+      $hashGenerator = new PasswordHash(10, true);
+      return $hashGenerator->CheckPassword($password, $valid);
+    }
+
+    $salt = substr($valid, 0, 4);
+    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
+    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
+    $sanitizedPassword = html::specialchars($password, false);
+    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
+          : ($salt . md5($salt . $sanitizedPassword));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  static function hash_password($password) {
+    require_once(MODPATH . "user/lib/PasswordHash.php");
+    $hashGenerator = new PasswordHash(10, true);
+    return $hashGenerator->HashPassword($password);
+  }
+
+  /**
+   * Log in as a given user.
+   * @param object $user the user object.
+   */
+  static function login($user) {
+    $user->login_count += 1;
+    $user->last_login = time();
+    $user->save();
+
+    user::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 = user::active();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return self::_lookup_user_by_field("id", $id);
+  }
+
+  /**
+   * Look up a user by name.
+   * @param integer      $name the user name
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return self::_lookup_user_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by hash.
+   * @param integer      $hash the user hash value
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_hash($hash) {
+    return self::_lookup_user_by_field("hash", $hash);
+  }
+
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the user list.
+   */
+  static function get_user_list($filter=array()) {
+    $user = ORM::factory("user");
+
+    foreach($filter as $method => $args) {
+      switch ($method) {
+      case "in":
+        $user->in($args[0], $args[1]);
+        break;
+      default:
+        $user->$method($args);
+      }
+    }
+    return $user->find_all();
+  }
+
+  /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return User_Core  the user object, or null if the name was invalid.
+   */
+ private static function _lookup_user_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("user", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
deleted file mode 100644
index fbc5157d..00000000
--- a/modules/user/helpers/group.php
+++ /dev/null
@@ -1,128 +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.
- */
-
-/**
- * This is the API for handling groups.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class group_Core {
-  /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Model
-   */
-  static function create($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
-      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
-    }
-
-    $group->name = $name;
-    $group->save();
-
-    return $group;
-  }
-
-  /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Model
-   */
-  static function everybody() {
-    return model_cache::get("group", 1);
-  }
-
-  /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Model
-   */
-  static function registered_users() {
-    return model_cache::get("group", 2);
-  }
-
-  /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Model  the group object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    $group = model_cache::get("group", $name, "name");
-    if ($group->loaded) {
-      return $group;
-    }
-    return null;
-  }
-
-  /**
-   * List the users
-   * @param mixed      filters (@see Database.php
-   * @return array     the group list.
-   */
-  static function get_group_list($filter=array()) {
-    $group = ORM::factory("group");
-
-    foreach($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $group->in($args[0], $args[1]);
-        break;
-      default:
-        $group->$method($args);
-      }
-    }
-    return $group->find_all();
-  }
-
-  static function get_edit_form_admin($group) {
-    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
-    $form_group = $form->group("edit_group")->label(t("Edit Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-narrow");
-    $form_group = $form->group("add_group")->label(t("Add Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name");
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Add Group"));
-    $group = ORM::factory("group");
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_delete_form_admin($group) {
-    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
-                      array("id" => "g-delete-group-form"));
-    $form_group = $form->group("delete_group")->label(
-      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
-    $form_group->submit("")->value(t("Delete"));
-    return $form;
-  }
-}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
deleted file mode 100644
index 7aa990e1..00000000
--- a/modules/user/helpers/user.php
+++ /dev/null
@@ -1,367 +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.
- */
-
-/**
- * This is the API for handling users.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class user_Core {
-  static function get_edit_form($user) {
-    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $form->set_attr("class", "g-narrow");
-    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
-
-    module::event("user_edit_form", $user, $form);
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
-  static function get_edit_form_admin($user) {
-    $form = new Forge(
-      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $group = $form->group("edit_user")->label(t("Edit User"));
-    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
-    $group->inputs["name"]->error_messages(
-      "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
-
-    module::event("user_edit_form_admin", $user, $form);
-    $group->submit("")->value(t("Modify User"));
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("add_user")->label(t("Add User"));
-    $group->input("name")->label(t("Username"))->id("g-username")
-      ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email");
-    $group->input("url")->label(t("URL"))->id("g-url");
-    self::_add_locale_dropdown($group);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from($user);
-
-    module::event("user_add_form_admin", $user, $form);
-    $group->submit("")->value(t("Add User"));
-    return $form;
-  }
-
-  private static function _add_locale_dropdown(&$form, $user=null) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      // Put "none" at the first position in the array
-      $locales = array_merge(array("" => t("« none »")), $locales);
-      $selected_locale = ($user && $user->locale) ? $user->locale : "";
-      $form->dropdown("locale")
-        ->label(t("Language Preference"))
-        ->options($locales)
-        ->selected($selected_locale);
-    }
-  }
-
-  static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
-                      array("id" => "g-delete-user-form"));
-    $group = $form->group("delete_user")->label(
-      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
-    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
-    return $form;
-  }
-
-  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;
-  }
-
-  /**
-   * 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 = user::guest());
-    }
-
-    // The installer cannot set a user into the session, so it just sets an id which we should
-    // upconvert into a user.
-    if ($user === 2) {
-      $user = model_cache::get("user", 2);
-      user::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);
-    }
-  }
-
-  /**
-   * Return the array of group ids this user belongs to
-   *
-   * @return array
-   */
-  static function group_ids() {
-    return Session::instance()->get("group_ids", array(1));
-  }
-
-  /**
-   * 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 = user::guest();
-    }
-    return $user;
-  }
-
-  /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return User_Model
-   */
-  static function guest() {
-    return model_cache::get("user", 1);
-  }
-
-  /**
-   * 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();
-  }
-
-  /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
-   */
-  static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
-      throw new Exception("@todo USER_ALREADY_EXISTS $name");
-    }
-
-    $user->name = $name;
-    $user->full_name = $full_name;
-    $user->password = $password;
-
-    // Required groups
-    $user->add(group::everybody());
-    $user->add(group::registered_users());
-
-    $user->save();
-    return $user;
-  }
-
-  /**
-   * Is the password provided correct?
-   *
-   * @param user User Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
-   */
-  static function is_correct_password($user, $password) {
-    $valid = $user->password;
-
-    // Try phpass first, since that's what we generate.
-    if (strlen($valid) == 34) {
-      require_once(MODPATH . "user/lib/PasswordHash.php");
-      $hashGenerator = new PasswordHash(10, true);
-      return $hashGenerator->CheckPassword($password, $valid);
-    }
-
-    $salt = substr($valid, 0, 4);
-    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
-    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
-    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
-          : ($salt . md5($salt . $sanitizedPassword));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
-   */
-  static function hash_password($password) {
-    require_once(MODPATH . "user/lib/PasswordHash.php");
-    $hashGenerator = new PasswordHash(10, true);
-    return $hashGenerator->HashPassword($password);
-  }
-
-  /**
-   * Log in as a given user.
-   * @param object $user the user object.
-   */
-  static function login($user) {
-    $user->login_count += 1;
-    $user->last_login = time();
-    $user->save();
-
-    user::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 = user::active();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    return self::_lookup_user_by_field("id", $id);
-  }
-
-  /**
-   * Look up a user by name.
-   * @param integer      $name the user name
-   * @return User_Model  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    return self::_lookup_user_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by hash.
-   * @param integer      $hash the user hash value
-   * @return User_Model  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_hash($hash) {
-    return self::_lookup_user_by_field("hash", $hash);
-  }
-
-  /**
-   * List the users
-   * @param mixed      filters (@see Database.php
-   * @return array     the user list.
-   */
-  static function get_user_list($filter=array()) {
-    $user = ORM::factory("user");
-
-    foreach($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $user->in($args[0], $args[1]);
-        break;
-      default:
-        $user->$method($args);
-      }
-    }
-    return $user->find_all();
-  }
-
-  /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return User_Core  the user object, or null if the name was invalid.
-   */
- private static function _lookup_user_by_field($field_name, $value) {
-    try {
-      $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
-        return $user;
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.3


From 5b4f3091636afc8de5f81707e95f43baa50b7b4d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 14 Oct 2009 09:47:04 -0700
Subject: Clean up phpDoc and change the Identity driver so only one
 configuration can be active at a given time.

---
 modules/gallery/helpers/group.php                  | 25 +++-----
 modules/gallery/helpers/user.php                   | 40 +++---------
 modules/gallery/libraries/Identity.php             | 72 ++++++---------------
 modules/gallery/libraries/drivers/Identity.php     | 51 +++++++++------
 .../user/libraries/drivers/Identity/Gallery.php    | 73 ++++++----------------
 5 files changed, 87 insertions(+), 174 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index 17dd7f70..b87ed248 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -58,28 +58,21 @@ class group_Core {
   }
 
   /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Core
+   * @see Identity_Driver::create.
    */
   static function create($name) {
     return Identity::instance()->create_group($name);
   }
 
   /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Core
+   * @see Identity_Driver::everbody.
    */
   static function everybody() {
     return Identity::instance()->everybody();
   }
 
   /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Core
+   * @see Identity_Driver::registered_users.
    */
   static function registered_users() {
     return Identity::instance()->everybody();
@@ -88,7 +81,7 @@ class group_Core {
   /**
    * Look up a group by id.
    * @param integer      $id the user id
-   * @return Group_Model  the group object, or null if the id was invalid.
+   * @return Group_Definition  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
     return Identity::instance()->lookup_group_by_field("id", $id);
@@ -97,25 +90,21 @@ class group_Core {
   /**
    * Look up a group by name.
    * @param integer      $id the group name
-   * @return Group_Core  the group object, or null if the name was invalid.
+   * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
     return Identity::instance()->lookup_group_by_field("name", $name);
   }
 
   /**
-   * List the groups
-   * @param mixed      options to apply to the selection of the user (@see Database.php)
-   * @return array     the group list.
+   * @see Identity_Driver::get_group_list.
    */
   static function get_group_list($filter=array()) {
     return Identity::instance()->get_group_list($filter);
   }
 
   /**
-   * Return the edit rules associated with an group.
-   *
-   * @return stdClass containing the rules
+   * @see Identity_Driver::get_edit_rules.
    */
   static function get_edit_rules() {
     return Identity::instance()->get_edit_rules("group");
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index 84a29efc..f09e963e 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -246,43 +246,28 @@ class user_Core {
   }
 
   /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return User_Model
+   * @see Identity_Driver::guest.
    */
-  static function guest() {
+static function guest() {
     return Identity::instance()->guest();
   }
 
   /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
+   * @see Identity_Driver::create_user.
    */
   static function create($name, $full_name, $password) {
     return Identity::instance()->create_user($name, $full_name, $password);
   }
 
   /**
-   * Is the password provided correct?
-   *
-   * @param user User Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
+   * @see Identity_Driver::is_correct_password.
    */
   static function is_correct_password($user, $password) {
     return Identity::instance()->is_correct_password($user, $password);
   }
 
   /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
+   * @see Identity_Driver::hash_password.
    */
   static function hash_password($password) {
     return Identity::instance()->hash_password($password);
@@ -291,7 +276,7 @@ class user_Core {
   /**
    * Look up a user by id.
    * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
+   * @return User_Definition  the user object, or null if the id was invalid.
    */
   static function lookup($id) {
     return Identity::instance()->lookup_user_by_field("id", $id);
@@ -300,35 +285,30 @@ class user_Core {
   /**
    * Look up a user by name.
    * @param integer      $name the user name
-   * @return User_Model  the user object, or null if the name was invalid.
+   * @return User_Definition  the user object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
     return Identity::instance()->lookup_user_by_field("name", $name);
   }
 
-
   /**
    * Look up a user by hash.
    * @param string       $name the user name
-   * @return User_Model  the user object, or null if the name was invalid.
+   * @return User_Definition  the user object, or null if the name was invalid.
    */
   static function lookup_by_hash($hash) {
     return Identity::instance()->lookup_user_by_field("hash", $hash);
   }
 
   /**
-   * List the users
-   * @param mixed      options to apply to the selection of the user(optional)
-   * @return array     the group list.
+   * @see Identity_Driver::get_user_list.
    */
   static function get_user_list($filter=array()) {
     return Identity::instance()->get_user_list($filter);
   }
 
   /**
-   * Return the edit rules associated with an user.
-   *
-   * @return stdClass containing the rules
+   * @see Identity_Driver::get_edit_rules.
    */
   static function get_edit_rules() {
     return Identity::instance()->get_edit_rules("user");
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 488cc535..88865913 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -22,7 +22,7 @@
  * Provides a driver-based interface for managing users and groups.
  */
 class Identity_Core {
-  protected static $instances = array();
+  protected static $instances;
 
   // Configuration
   protected $config;
@@ -32,17 +32,18 @@ class Identity_Core {
 
   /**
    * Returns a singleton instance of Identity.
+   * There can only be one Identity driver configured at a given point
    *
    * @param   string  configuration
    * @return  Identity_Core
    */
   static function & instance($config="default") {
-   if (!isset(Identity::$instances[$config])) {
+   if (!isset(Identity::$instances)) {
       // Create a new instance
-      Identity::$instances[$config] = new Identity($config);
+      Identity::$instances = new Identity($config);
     }
 
-    return Identity::$instances[$config];
+    return Identity::$instances;
   }
 
   /**
@@ -93,10 +94,9 @@ class Identity_Core {
   }
 
   /**
-   * Determine if a feature is supported by the driver.
+   * Determine if if the current driver supports updates.
    *
-   * @param  string  $feature the name of the feature to check
-   * @return boolean true if supported
+   * @return boolean true if the driver supports updates; false if read only
    */
   public function is_writable() {
     return !empty($this->config["allow_updates"]);
@@ -104,118 +104,84 @@ class Identity_Core {
 
 
   /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return Identity_Model
+   * @see Identity_Driver::guest.
    */
   public function guest() {
     return $this->driver->guest();
   }
 
   /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return Identity_Model
+   * @see Identity_Driver::create_user.
    */
   public function create_user($name, $full_name, $password) {
     return $this->driver->create_user($name, $full_name, $password);
   }
 
   /**
-   * Is the password provided correct?
-   *
-   * @param user Identity Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
+   * @see Identity_Driver::is_correct_password.
    */
   public function is_correct_password($user, $password) {
     return $this->driver->is_correct_password($user, $password);
   }
 
   /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
+   * @see Identity_Driver::hash_password.
    */
   public function hash_password($password) {
     return $this->driver->hash_password($password);
   }
 
   /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return Identity_Model  the user object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_user_by_field.
    */
   public function lookup_user_by_field($field_name, $value) {
     return $this->driver->lookup_user_by_field($field_name, $value);
   }
 
   /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Model
+   * @see Identity_Driver::create_group.
    */
   public function create_group($name) {
     return $this->driver->create_group($name);
   }
 
   /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Model
+   * @see Identity_Driver::everybody.
    */
   public function everybody() {
     return $this->driver->everybody();
   }
 
   /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Model
+   * @see Identity_Driver::registered_users.
    */
   public function registered_users() {
     return $this->driver->everybody();
   }
 
   /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Model  the group object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_group_by_field.
    */
   public function lookup_group_by_field($field_name, $value) {
     return $this->driver->lookup_group_by_field($field_name, $value);
   }
 
   /**
-   * List the users
-   * @param mixed      options to apply to the selection of the user
-   * @return array     the group list.
+   * @see Identity_Driver::get_user_list.
    */
   public function get_user_list($filter=array()) {
     return $this->driver->get_user_list($filter);
   }
 
   /**
-   * List the groups
-   * @param mixed      options to apply to the selection of the user
-   * @return array     the group list.
+   * @see Identity_Driver::get_group_list.
    */
   public function get_group_list($filter=array()) {
     return $this->driver->get_group_list($filter);
   }
 
   /**
-   * Return the edit rules associated with an group.
-   *
-   * @param  string   $object_type to return rules for ("user"|"group")
-   * @return stdClass containing the rules
+   * @see Identity_Driver::get_edit_rules.
    */
   public function get_edit_rules($object_type) {
     return $this->driver->get_edit_rules($object_type);
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index ca80aad5..0b789908 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -21,9 +21,7 @@ interface Identity_Driver {
   /**
    * Return the guest user.
    *
-   * @todo consider caching
-   *
-   * @return User_Model
+   * @return User_Definition the user object
    */
   public function guest();
 
@@ -33,14 +31,14 @@ interface Identity_Driver {
    * @param string  $name
    * @param string  $full_name
    * @param string  $password
-   * @return User_Core
+   * @return User_Definition the user object
    */
   public function create_user($name, $full_name, $password);
 
   /**
    * Is the password provided correct?
    *
-   * @param user User Model
+   * @param user User_Definition the user object
    * @param string $password a plaintext password
    * @return boolean true if the password is correct
    */
@@ -57,7 +55,7 @@ interface Identity_Driver {
    * Look up a user by by search the specified field.
    * @param string      search field
    * @param string      search value
-   * @return User_Core  the user object, or null if the name was invalid.
+   * @return User_Definition the user object, or null if the name was invalid.
    */
   public function lookup_user_by_field($field, $value);
 
@@ -65,28 +63,33 @@ interface Identity_Driver {
    * Create a new group.
    *
    * @param string  $name
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   public function create_group($name);
 
   /**
    * The group of all possible visitors.  This includes the guest user.
    *
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   public function everybody();
 
   /**
    * The group of all logged-in visitors.  This does not include guest users.
    *
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   public function registered_users();
 
   /**
    * List the users
    * @param mixed      options to apply to the selection of the user
-   *                   @todo Do a longer write up on format of filters (@see Database.php)
+   *                   currently supported:
+   *                     "orderby" => array(<field name>, "ASC|DESC")
+   *                     "in" => array(<field name>, array(values, ...))
+   *                     "where" => array(<field name>, value)
+   *                        <field name> follows Kohana syntax where it could contain the first
+   *                                     half of a logical expression (i.e. "field IS NOT")
    * @return array     the group list.
    */
   public function get_user_list($filter=array());
@@ -94,7 +97,12 @@ interface Identity_Driver {
   /**
    * List the groups
    * @param mixed      options to apply to the selection of the group
-   *                   @todo Do a longer write up on format of filters (@see Database.php)
+   *                   currently supported:
+   *                     "orderby" => array(<field name>, "ASC|DESC")
+   *                     "in" => array(<field name>, array(values, ...))
+   *                     "where" => array(<field name>, value)
+   *                        <field name> follows Kohana syntax where it could contain the first
+   *                                     half of a logical expression (i.e. "field IS NOT")
    * @return array     the group list.
    */
   public function get_group_list($filter=array());
@@ -128,10 +136,8 @@ abstract class User_Definition {
     case "url":
     case "locale":
     case "groups":
-      return $this->user->$column;
     case "hashed_password":
-      throw new Exception("@todo WRITE ONLY FIELD: $column");
-      break;
+      return $this->user->$column;
     default:
       throw new Exception("@todo UNSUPPORTED FIELD: $column");
       break;
@@ -185,10 +191,9 @@ abstract class User_Definition {
     case "hash":
     case "url":
     case "locale":
+    case "hashed_password":
       unset($this->user->$column);
       break;
-    case "hashed_password":
-      throw new Exception("@todo WRITE ONLY FIELD: $column");
     default:
       throw new Exception("@todo UNSUPPORTED FIELD: $column");
       break;
@@ -214,7 +219,12 @@ abstract class User_Definition {
     return empty($this->user->full_name) ? $this->user->name : $this->user->full_name;
   }
 
-  public function uncloaked() {
+  /**
+   * Return the internal user object without the wrapper.
+   * This method is used by implementing classes to access the internal user object.
+   * Consider it pseudo private and only declared public as PHP as not internal or friend modifier
+   */
+  public function _uncloaked() {
     return $this->user;
   }
 
@@ -275,7 +285,12 @@ abstract class Group_Definition {
     }
   }
 
-  public function uncloaked() {
+  /**
+   * Return the internal group object without the wrapper.
+   * This method is used by implementing classes to access the internal group object.
+   * Consider it pseudo private and only declared public as PHP as not internal or friend modifier
+   */
+  public function _uncloaked() {
     return $this->group;
   }
 
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index f631bd63..013497b6 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -22,23 +22,14 @@
  */
 class Identity_Gallery_Driver implements Identity_Driver {
   /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return User_Model
+   * @see Identity_Driver::guest.
    */
   public function guest() {
     return new Gallery_User(model_cache::get("user", 1));
   }
 
   /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
+   * @see Identity_Driver::create_user.
    */
   public function create_user($name, $full_name, $password) {
     $user = ORM::factory("user")->where("name", $name)->find();
@@ -51,19 +42,15 @@ class Identity_Gallery_Driver implements Identity_Driver {
     $user->password = $password;
 
     // Required groups
-    $user->add($this->everybody()->uncloaked());
-    $user->add($this->registered_users()->uncloaked());
+    $user->add($this->everybody()->_uncloaked());
+    $user->add($this->registered_users()->_uncloaked());
 
     $user->save();
     return new Gallery_User($user);
   }
 
   /**
-   * Is the password provided correct?
-   *
-   * @param user User Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
+   * @see Identity_Driver::is_correct_password.
    */
   public function is_correct_password($user, $password) {
     $valid = $user->password;
@@ -94,9 +81,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
+   * @see Identity_Driver::hash_password.
    */
   public function hash_password($password) {
     require_once(MODPATH . "user/lib/PasswordHash.php");
@@ -105,10 +90,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return User_Core  the user object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_user_by_field.
    */
   public function lookup_user_by_field($field_name, $value) {
     try {
@@ -125,10 +107,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Model
+   * @see Identity_Driver::create_group.
    */
   public function create_group($name) {
     $group = ORM::factory("group")->where("name", $name)->find();
@@ -143,33 +122,26 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Model
+   * @see Identity_Driver::everybody.
    */
   public function everybody() {
     return new Gallery_Group(model_cache::get("group", 1));
   }
 
   /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Model
+   * @see Identity_Driver::registered_users.
    */
   public function registered_users() {
     return new Gallery_Group(model_cache::get("group", 2));
   }
 
   /**
-   * Look up a group by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return Group_Core  the group object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_group_by_field.
    */
   public function lookup_group_by_field($field_name, $value) {
     try {
-      $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded) {
+      $group = model_cache::get("group", $value, $field_name);
+      if ($group->loaded) {
         return new Gallery_Group($group);
       }
     } catch (Exception $e) {
@@ -180,11 +152,8 @@ class Identity_Gallery_Driver implements Identity_Driver {
     return null;
   }
 
-
   /**
-   * List the users
-   * @param mixed      options to apply to the selection of the user
-   * @return array     the group list.
+   * @see Identity_Driver::get_user_list.
    */
   public function get_user_list($filter=array()) {
     $results = $this->_do_search("user", $filter);
@@ -195,11 +164,8 @@ class Identity_Gallery_Driver implements Identity_Driver {
     return $users;
   }
 
-
   /**
-   * List the groups
-   * @param mixed      options to apply to the selection of the group
-   * @return array     the group list.
+   * @see Identity_Driver::get_group_list.
    */
   public function get_group_list($filter=array()) {
     $results = $this->_do_search("group", $filter);
@@ -211,10 +177,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * Return the edit rules associated with an group.
-   *
-   * @param  string   $object_type to return rules for ("user"|"group")
-   * @return stdClass containing the rules
+   * @see Identity_Driver::get_edit_rules.
    */
   public function get_edit_rules($object_type) {
     return (object)ORM::factory($object_type)->rules;
@@ -284,10 +247,10 @@ class Gallery_Group extends Group_Definition {
   }
 
   public function add($user) {
-    $this->group->add($user->uncloaked());
+    $this->group->add($user->_uncloaked());
   }
 
   public function remove($user) {
-    $this->group->remove($user->uncloaked());
+    $this->group->remove($user->_uncloaked());
   }
 }
-- 
cgit v1.2.3


From 0d5d4c81bcca44f037deb847a4c837752f774e49 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 14 Oct 2009 21:20:30 -0700
Subject: Move the ui for user adminsitration back to the user module.

---
 modules/gallery/controllers/admin_users.php      | 290 -----------------------
 modules/gallery/views/admin_users.html.php       | 128 ----------
 modules/gallery/views/admin_users_group.html.php |  38 ---
 modules/user/controllers/admin_users.php         | 290 +++++++++++++++++++++++
 modules/user/helpers/user_event.php              |  30 +++
 modules/user/views/admin_users.html.php          | 128 ++++++++++
 modules/user/views/admin_users_group.html.php    |  38 +++
 7 files changed, 486 insertions(+), 456 deletions(-)
 delete mode 100644 modules/gallery/controllers/admin_users.php
 delete mode 100644 modules/gallery/views/admin_users.html.php
 delete mode 100644 modules/gallery/views/admin_users_group.html.php
 create mode 100644 modules/user/controllers/admin_users.php
 create mode 100644 modules/user/helpers/user_event.php
 create mode 100644 modules/user/views/admin_users.html.php
 create mode 100644 modules/user/views/admin_users_group.html.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
deleted file mode 100644
index a8a8cd95..00000000
--- a/modules/gallery/controllers/admin_users.php
+++ /dev/null
@@ -1,290 +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 Admin_Users_Controller extends Admin_Controller {
-  public function index() {
-    $view = new Admin_View("admin.html");
-    $view->content = new View("admin_users.html");
-    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
-    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
-    print $view;
-  }
-
-  public function add_user() {
-    access::verify_csrf();
-
-    $form = user::get_add_form_admin();
-    $valid = $form->validate();
-    $name = $form->add_user->inputs["name"]->value;
-    if ($user = user::lookup_by_name($name)) {
-      $form->add_user->inputs["name"]->add_error("in_use", 1);
-      $valid = false;
-    }
-
-    if ($valid) {
-      $user = user::create(
-        $name, $form->add_user->full_name->value, $form->add_user->password->value);
-      $user->email = $form->add_user->email->value;
-      $user->admin = $form->add_user->admin->checked;
-
-      if ($form->add_user->locale) {
-        $desired_locale = $form->add_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-      $user->save();
-      module::event("user_add_form_admin_completed", $user, $form);
-
-      message::success(t("Created user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_user_form() {
-    print user::get_add_form_admin();
-  }
-
-  public function delete_user($id) {
-    access::verify_csrf();
-
-    if ($id == user::active()->id || $id == user::guest()->id) {
-      access::forbidden();
-    }
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_delete_form_admin($user);
-    if($form->validate()) {
-      $name = $user->name;
-      $user->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted user %user_name", array("user_name" => $name));
-    log::success("user", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-    print user::get_delete_form_admin($user);
-  }
-
-  public function edit_user($id) {
-    access::verify_csrf();
-
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->edit_user->inputs["name"]->value;
-      $temp_user = user::lookup_by_name($new_name);
-      if ($new_name != $user->name &&
-          ($temp_user && $temp_user->id != $user->id)) {
-        $form->edit_user->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      } else {
-        $user->name = $new_name;
-      }
-    }
-
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $user->locale = $desired_locale == "none" ? null : $desired_locale;
-      }
-
-      // An admin can change the admin status for any user but themselves
-      if ($user->id != user::active()->id) {
-        $user->admin = $form->edit_user->admin->checked;
-      }
-      $user->save();
-      module::event("user_edit_form_admin_completed", $user, $form);
-
-      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_user_form($id) {
-    $user = user::lookup($id);
-    if (empty($user)) {
-      kohana::show_404();
-    }
-
-    $form = user::get_edit_form_admin($user);
-    // Don't allow the user to control their own admin bit, else you can lock yourself out
-    if ($user->id == user::active()->id) {
-      $form->edit_user->admin->disabled(1);
-    }
-    print $form;
-  }
-
-  public function add_user_to_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->add($user);
-    $group->save();
-  }
-
-  public function remove_user_from_group($user_id, $group_id) {
-    access::verify_csrf();
-    $group = group::lookup($group_id);
-    $user = user::lookup($user_id);
-    $group->remove($user);
-    $group->save();
-  }
-
-  public function group($group_id) {
-    $view = new View("admin_users_group.html");
-    $view->group = group::lookup($group_id);
-    print $view;
-  }
-
-  public function add_group() {
-    access::verify_csrf();
-
-    $form = group::get_add_form_admin();
-    $valid = $form->validate();
-    if ($valid) {
-      $new_name = $form->add_group->inputs["name"]->value;
-      $group = group::lookup_by_name($new_name);
-      if (!empty($group)) {
-        $form->add_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group = group::create($new_name);
-      $group->save();
-      message::success(
-        t("Created group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function add_group_form() {
-    print group::get_add_form_admin();
-  }
-
-  public function delete_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    $form = group::get_delete_form_admin($group);
-    if ($form->validate()) {
-      $name = $group->name;
-      $group->delete();
-    } else {
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-
-    $message = t("Deleted group %group_name", array("group_name" => $name));
-    log::success("group", $message);
-    message::success($message);
-    print json_encode(array("result" => "success"));
-  }
-
-  public function delete_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_delete_form_admin($group);
-  }
-
-  public function edit_group($id) {
-    access::verify_csrf();
-
-    $group = group::lookup($id);
-    if (empty($group)) {
-       kohana::show_404();
-    }
-
-    $form = group::get_edit_form_admin($group);
-    $valid = $form->validate();
-
-    if ($valid) {
-      $new_name = $form->edit_group->inputs["name"]->value;
-      $group = group::lookup_by_name($name);
-      if ($group->loaded) {
-        $form->edit_group->inputs["name"]->add_error("in_use", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $group->name = $form->edit_group->inputs["name"]->value;
-      $group->save();
-      message::success(
-        t("Changed group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "success"));
-    } else {
-      message::error(
-        t("Failed to change group %group_name", array("group_name" => $group->name)));
-      print json_encode(array("result" => "error",
-                              "form" => $form->__toString()));
-    }
-  }
-
-  public function edit_group_form($id) {
-    $group = group::lookup($id);
-    if (empty($group)) {
-      kohana::show_404();
-    }
-
-    print group::get_edit_form_admin($group);
-  }
-
-}
diff --git a/modules/gallery/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
deleted file mode 100644
index a127bc15..00000000
--- a/modules/gallery/views/admin_users.html.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-  $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
-      helper: "clone"
-    });
-    $("#g-group-admin .g-group").droppable({
-      accept: ".core-info",
-      hoverClass: "g-selected",
-      drop: function(ev, ui) {
-        var user_id = $(ui.draggable).attr("id").replace("user-", "");
-        var group_id = $(this).attr("id").replace("group-", "");
-        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-              {},
-              function() {
-                reload_group(group_id);
-              });
-      }
-    });
-    $("#group-1").droppable("destroy");
-    $("#group-2").droppable("destroy");
-  });
-
-  var reload_group = function(group_id) {
-    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
-    $.get(reload_group_url.replace("__GROUPID__", group_id),
-          {},
-          function(data) {
-            $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
-          });
-  }
-
-  var remove_user = function(user_id, group_id) {
-    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
-    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
-          {},
-          function() {
-            reload_group(group_id);
-          });
-  }
-</script>
-<div class="g-block">
-  <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new user") ?>
-  </a>
-
-  <h2>
-    <?= t("User Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <table id="g-user-admin-list">
-      <tr>
-        <th><?= t("Username") ?></th>
-        <th><?= t("Full name") ?></th>
-        <th><?= t("Email") ?></th>
-        <th><?= t("Last login") ?></th>
-        <th><?= t("Actions") ?></th>
-      </tr>
-
-      <? foreach ($users as $i => $user): ?>
-      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
-               alt="<?= html::clean_attribute($user->name) ?>"
-               width="20"
-               height="20" />
-          <?= html::clean($user->name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->full_name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->email) ?>
-        </td>
-        <td>
-          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
-        </td>
-        <td class="g-actions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-              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>
-          <? if (user::active()->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>
-          <? 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>
-          <? endif ?>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-  </div>
-</div>
-
-<div id="g-group-admin" class="g-block g-clearfix">
-  <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new group") ?>
-  </a>
-
-  <h2>
-    <?= t("Group Admin") ?>
-  </h2>
-
-  <div class="g-block-content">
-    <ul>
-      <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
-        <?= $v ?>
-      </li>
-      <? endforeach ?>
-    </ul>
-  </div>
-</div>
diff --git a/modules/gallery/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
deleted file mode 100644
index db3645a0..00000000
--- a/modules/gallery/views/admin_users_group.html.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<h4>
-  <?= html::clean($group->name) ?>
-  <? if (!$group->special): ?>
-  <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>
-  <? 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>
-  <? endif ?>
-</h4>
-
-<? if ($group->users->count() > 0): ?>
-<ul>
-  <? foreach ($group->users as $i => $user): ?>
-  <li class="g-user">
-    <?= html::clean($user->name) ?>
-    <? if (!$group->special): ?>
-    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       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>
-    </a>
-    <? endif ?>
-  </li>
-  <? endforeach ?>
-</ul>
-<? else: ?>
-<div>
-  <p>
-    <?= 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/controllers/admin_users.php b/modules/user/controllers/admin_users.php
new file mode 100644
index 00000000..a8a8cd95
--- /dev/null
+++ b/modules/user/controllers/admin_users.php
@@ -0,0 +1,290 @@
+<?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 Admin_Users_Controller extends Admin_Controller {
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_users.html");
+    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
+    print $view;
+  }
+
+  public function add_user() {
+    access::verify_csrf();
+
+    $form = user::get_add_form_admin();
+    $valid = $form->validate();
+    $name = $form->add_user->inputs["name"]->value;
+    if ($user = user::lookup_by_name($name)) {
+      $form->add_user->inputs["name"]->add_error("in_use", 1);
+      $valid = false;
+    }
+
+    if ($valid) {
+      $user = user::create(
+        $name, $form->add_user->full_name->value, $form->add_user->password->value);
+      $user->email = $form->add_user->email->value;
+      $user->admin = $form->add_user->admin->checked;
+
+      if ($form->add_user->locale) {
+        $desired_locale = $form->add_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+      $user->save();
+      module::event("user_add_form_admin_completed", $user, $form);
+
+      message::success(t("Created user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_user_form() {
+    print user::get_add_form_admin();
+  }
+
+  public function delete_user($id) {
+    access::verify_csrf();
+
+    if ($id == user::active()->id || $id == user::guest()->id) {
+      access::forbidden();
+    }
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_delete_form_admin($user);
+    if($form->validate()) {
+      $name = $user->name;
+      $user->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted user %user_name", array("user_name" => $name));
+    log::success("user", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+    print user::get_delete_form_admin($user);
+  }
+
+  public function edit_user($id) {
+    access::verify_csrf();
+
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->edit_user->inputs["name"]->value;
+      $temp_user = user::lookup_by_name($new_name);
+      if ($new_name != $user->name &&
+          ($temp_user && $temp_user->id != $user->id)) {
+        $form->edit_user->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      } else {
+        $user->name = $new_name;
+      }
+    }
+
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $user->locale = $desired_locale == "none" ? null : $desired_locale;
+      }
+
+      // An admin can change the admin status for any user but themselves
+      if ($user->id != user::active()->id) {
+        $user->admin = $form->edit_user->admin->checked;
+      }
+      $user->save();
+      module::event("user_edit_form_admin_completed", $user, $form);
+
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_user_form($id) {
+    $user = user::lookup($id);
+    if (empty($user)) {
+      kohana::show_404();
+    }
+
+    $form = user::get_edit_form_admin($user);
+    // Don't allow the user to control their own admin bit, else you can lock yourself out
+    if ($user->id == user::active()->id) {
+      $form->edit_user->admin->disabled(1);
+    }
+    print $form;
+  }
+
+  public function add_user_to_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->add($user);
+    $group->save();
+  }
+
+  public function remove_user_from_group($user_id, $group_id) {
+    access::verify_csrf();
+    $group = group::lookup($group_id);
+    $user = user::lookup($user_id);
+    $group->remove($user);
+    $group->save();
+  }
+
+  public function group($group_id) {
+    $view = new View("admin_users_group.html");
+    $view->group = group::lookup($group_id);
+    print $view;
+  }
+
+  public function add_group() {
+    access::verify_csrf();
+
+    $form = group::get_add_form_admin();
+    $valid = $form->validate();
+    if ($valid) {
+      $new_name = $form->add_group->inputs["name"]->value;
+      $group = group::lookup_by_name($new_name);
+      if (!empty($group)) {
+        $form->add_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group = group::create($new_name);
+      $group->save();
+      message::success(
+        t("Created group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function add_group_form() {
+    print group::get_add_form_admin();
+  }
+
+  public function delete_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    $form = group::get_delete_form_admin($group);
+    if ($form->validate()) {
+      $name = $group->name;
+      $group->delete();
+    } else {
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+
+    $message = t("Deleted group %group_name", array("group_name" => $name));
+    log::success("group", $message);
+    message::success($message);
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_delete_form_admin($group);
+  }
+
+  public function edit_group($id) {
+    access::verify_csrf();
+
+    $group = group::lookup($id);
+    if (empty($group)) {
+       kohana::show_404();
+    }
+
+    $form = group::get_edit_form_admin($group);
+    $valid = $form->validate();
+
+    if ($valid) {
+      $new_name = $form->edit_group->inputs["name"]->value;
+      $group = group::lookup_by_name($name);
+      if ($group->loaded) {
+        $form->edit_group->inputs["name"]->add_error("in_use", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $group->name = $form->edit_group->inputs["name"]->value;
+      $group->save();
+      message::success(
+        t("Changed group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "success"));
+    } else {
+      message::error(
+        t("Failed to change group %group_name", array("group_name" => $group->name)));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
+  }
+
+  public function edit_group_form($id) {
+    $group = group::lookup($id);
+    if (empty($group)) {
+      kohana::show_404();
+    }
+
+    print group::get_edit_form_admin($group);
+  }
+
+}
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
new file mode 100644
index 00000000..78b009eb
--- /dev/null
+++ b/modules/user/helpers/user_event.php
@@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-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 {
+  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")));
+    return $menu;
+  }
+}
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
new file mode 100644
index 00000000..a127bc15
--- /dev/null
+++ b/modules/user/views/admin_users.html.php
@@ -0,0 +1,128 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+  $(document).ready(function(){
+    $("#g-user-admin-list .core-info").draggable({
+      helper: "clone"
+    });
+    $("#g-group-admin .g-group").droppable({
+      accept: ".core-info",
+      hoverClass: "g-selected",
+      drop: function(ev, ui) {
+        var user_id = $(ui.draggable).attr("id").replace("user-", "");
+        var group_id = $(this).attr("id").replace("group-", "");
+        $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+              {},
+              function() {
+                reload_group(group_id);
+              });
+      }
+    });
+    $("#group-1").droppable("destroy");
+    $("#group-2").droppable("destroy");
+  });
+
+  var reload_group = function(group_id) {
+    var reload_group_url = "<?= url::site("admin/users/group/__GROUPID__") ?>";
+    $.get(reload_group_url.replace("__GROUPID__", group_id),
+          {},
+          function(data) {
+            $("#group-" + group_id).html(data);
+            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
+          });
+  }
+
+  var remove_user = function(user_id, group_id) {
+    var remove_user_url = "<?= url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
+    $.get(remove_user_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
+          {},
+          function() {
+            reload_group(group_id);
+          });
+  }
+</script>
+<div class="g-block">
+  <a href="<?= url::site("admin/users/add_user_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new user")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new user") ?>
+  </a>
+
+  <h2>
+    <?= t("User Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <table id="g-user-admin-list">
+      <tr>
+        <th><?= t("Username") ?></th>
+        <th><?= t("Full name") ?></th>
+        <th><?= t("Email") ?></th>
+        <th><?= t("Last login") ?></th>
+        <th><?= t("Actions") ?></th>
+      </tr>
+
+      <? foreach ($users as $i => $user): ?>
+      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+               alt="<?= html::clean_attribute($user->name) ?>"
+               width="20"
+               height="20" />
+          <?= html::clean($user->name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->full_name) ?>
+        </td>
+        <td>
+          <?= html::clean($user->email) ?>
+        </td>
+        <td>
+          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
+        </td>
+        <td class="g-actions">
+          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+              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>
+          <? if (user::active()->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>
+          <? 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>
+          <? endif ?>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
+  </div>
+</div>
+
+<div id="g-group-admin" class="g-block g-clearfix">
+  <a href="<?= url::site("admin/users/add_group_form") ?>"
+      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+      title="<?= t("Create a new group")->for_html_attr() ?>">
+    <span class="ui-icon ui-icon-circle-plus"></span>
+    <?= t("Add a new group") ?>
+  </a>
+
+  <h2>
+    <?= t("Group Admin") ?>
+  </h2>
+
+  <div class="g-block-content">
+    <ul>
+      <? foreach ($groups as $i => $group): ?>
+      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+        <?= $v ?>
+      </li>
+      <? endforeach ?>
+    </ul>
+  </div>
+</div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
new file mode 100644
index 00000000..db3645a0
--- /dev/null
+++ b/modules/user/views/admin_users_group.html.php
@@ -0,0 +1,38 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<h4>
+  <?= html::clean($group->name) ?>
+  <? if (!$group->special): ?>
+  <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>
+  <? 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>
+  <? endif ?>
+</h4>
+
+<? if ($group->users->count() > 0): ?>
+<ul>
+  <? foreach ($group->users as $i => $user): ?>
+  <li class="g-user">
+    <?= html::clean($user->name) ?>
+    <? if (!$group->special): ?>
+    <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
+       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>
+    </a>
+    <? endif ?>
+  </li>
+  <? endforeach ?>
+</ul>
+<? else: ?>
+<div>
+  <p>
+    <?= t("Drag &amp; drop users from the User Admin above into this group box to add group members.") ?>
+  </p>
+</div>
+<? endif ?>
-- 
cgit v1.2.3


From f5dd8d487eefe9aa0b4e1f38db79d3ee952b783a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 15 Oct 2009 08:56:31 -0700
Subject: Move all the edit/update forms for users and groups back to the user
 module.

---
 modules/gallery/controllers/users.php    |  68 ----------------
 modules/gallery/helpers/group.php        |  33 --------
 modules/gallery/helpers/user.php         |  88 ---------------------
 modules/user/controllers/admin_users.php | 128 ++++++++++++++++++++++++++++---
 modules/user/controllers/users.php       | 103 +++++++++++++++++++++++++
 5 files changed, 219 insertions(+), 201 deletions(-)
 delete mode 100644 modules/gallery/controllers/users.php
 create mode 100644 modules/user/controllers/users.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/users.php b/modules/gallery/controllers/users.php
deleted file mode 100644
index 07c5a457..00000000
--- a/modules/gallery/controllers/users.php
+++ /dev/null
@@ -1,68 +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 Users_Controller extends Controller {
-  public function update($id) {
-    $user = user::lookup($id);
-
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    $form = user::get_edit_form($user);
-    $valid = $form->validate();
-    if ($valid) {
-      $user->full_name = $form->edit_user->full_name->value;
-      if ($form->edit_user->password->value) {
-        $user->password = $form->edit_user->password->value;
-      }
-      $user->email = $form->edit_user->email->value;
-      $user->url = $form->edit_user->url->value;
-      if ($form->edit_user->locale) {
-        $desired_locale = $form->edit_user->locale->value;
-        $new_locale = $desired_locale == "none" ? null : $desired_locale;
-        if ($new_locale != $user->locale) {
-          // Delete the session based locale preference
-          setcookie("g_locale", "", time() - 24 * 3600, "/");
-        }
-        $user->locale = $new_locale;
-      }
-      $user->save();
-      module::event("user_edit_form_completed", $user, $form);
-
-      message::success(t("User information updated."));
-      print json_encode(
-        array("result" => "success",
-              "resource" => url::site("users/{$user->id}")));
-    } else {
-      print json_encode(
-        array("result" => "error",
-              "form" => $form->__toString()));
-    }
-  }
-
-  public function form_edit($id) {
-    $user = user::lookup($id);
-    if ($user->guest || $user->id != user::active()->id) {
-      access::forbidden();
-    }
-
-    print user::get_edit_form($user);
-  }
-}
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
index dbfa03fe..1702fb87 100644
--- a/modules/gallery/helpers/group.php
+++ b/modules/gallery/helpers/group.php
@@ -117,37 +117,4 @@ class group_Core {
     }
     return $group->find_all();
   }
-
-  static function get_edit_form_admin($group) {
-    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
-    $form_group = $form->group("edit_group")->label(t("Edit Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-narrow");
-    $form_group = $form->group("add_group")->label(t("Add Group"));
-    $form_group->input("name")->label(t("Name"))->id("g-name");
-    $form_group->inputs["name"]->error_messages(
-      "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Add Group"));
-    $group = ORM::factory("group");
-    $form->add_rules_from($group);
-    return $form;
-  }
-
-  static function get_delete_form_admin($group) {
-    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
-                      array("id" => "g-delete-group-form"));
-    $form_group = $form->group("delete_group")->label(
-      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
-    $form_group->submit("")->value(t("Delete"));
-    return $form;
-  }
 }
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index cb205170..e7e75d64 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -24,94 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_Core {
-  static function get_edit_form($user) {
-    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $form->set_attr("class", "g-narrow");
-    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
-
-    module::event("user_edit_form", $user, $form);
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
-  static function get_edit_form_admin($user) {
-    $form = new Forge(
-      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $group = $form->group("edit_user")->label(t("Edit User"));
-    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
-    $group->inputs["name"]->error_messages(
-      "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-    self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
-    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
-
-    module::event("user_edit_form_admin", $user, $form);
-    $group->submit("")->value(t("Modify User"));
-    return $form;
-  }
-
-  static function get_add_form_admin() {
-    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $form->set_attr('class', "g-narrow");
-    $group = $form->group("add_user")->label(t("Add User"));
-    $group->input("name")->label(t("Username"))->id("g-username")
-      ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->input("email")->label(t("Email"))->id("g-email");
-    $group->input("url")->label(t("URL"))->id("g-url");
-    self::_add_locale_dropdown($group);
-    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from($user);
-
-    module::event("user_add_form_admin", $user, $form);
-    $group->submit("")->value(t("Add User"));
-    return $form;
-  }
-
-  private static function _add_locale_dropdown(&$form, $user=null) {
-    $locales = locales::installed();
-    foreach ($locales as $locale => $display_name) {
-      $locales[$locale] = SafeString::of_safe_html($display_name);
-    }
-    if (count($locales) > 1) {
-      // Put "none" at the first position in the array
-      $locales = array_merge(array("" => t("« none »")), $locales);
-      $selected_locale = ($user && $user->locale) ? $user->locale : "";
-      $form->dropdown("locale")
-        ->label(t("Language Preference"))
-        ->options($locales)
-        ->selected($selected_locale);
-    }
-  }
-
-  static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
-                      array("id" => "g-delete-user-form"));
-    $group = $form->group("delete_user")->label(
-      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
-    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
-    return $form;
-  }
-
   static function get_login_form($url) {
     $form = new Forge($url, "", "post", array("id" => "g-login-form"));
     $form->set_attr('class', "g-narrow");
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index a8a8cd95..5950c358 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -29,7 +29,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function add_user() {
     access::verify_csrf();
 
-    $form = user::get_add_form_admin();
+    $form = $this->_get_user_add_form_admin();
     $valid = $form->validate();
     $name = $form->add_user->inputs["name"]->value;
     if ($user = user::lookup_by_name($name)) {
@@ -59,7 +59,7 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_user_form() {
-    print user::get_add_form_admin();
+    print $this->_get_user_add_form_admin();
   }
 
   public function delete_user($id) {
@@ -74,7 +74,7 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = user::get_delete_form_admin($user);
+    $form = $this->_get_user_delete_form_admin($user);
     if($form->validate()) {
       $name = $user->name;
       $user->delete();
@@ -94,7 +94,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if (empty($user)) {
       kohana::show_404();
     }
-    print user::get_delete_form_admin($user);
+    print $this->_get_user_delete_form_admin($user);
   }
 
   public function edit_user($id) {
@@ -105,7 +105,7 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = user::get_edit_form_admin($user);
+    $form = $this->_get_user_edit_form_admin($user);
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->edit_user->inputs["name"]->value;
@@ -152,7 +152,7 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = user::get_edit_form_admin($user);
+    $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 == user::active()->id) {
       $form->edit_user->admin->disabled(1);
@@ -185,7 +185,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function add_group() {
     access::verify_csrf();
 
-    $form = group::get_add_form_admin();
+    $form = $this->_get_group_add_form_admin();
     $valid = $form->validate();
     if ($valid) {
       $new_name = $form->add_group->inputs["name"]->value;
@@ -209,7 +209,7 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_group_form() {
-    print group::get_add_form_admin();
+    print $this->_get_group_add_form_admin();
   }
 
   public function delete_group($id) {
@@ -220,7 +220,7 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = group::get_delete_form_admin($group);
+    $form = $this->_get_group_delete_form_admin($group);
     if ($form->validate()) {
       $name = $group->name;
       $group->delete();
@@ -241,7 +241,7 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    print group::get_delete_form_admin($group);
+    print $this->_get_group_delete_form_admin($group);
   }
 
   public function edit_group($id) {
@@ -252,7 +252,7 @@ class Admin_Users_Controller extends Admin_Controller {
        kohana::show_404();
     }
 
-    $form = group::get_edit_form_admin($group);
+    $form = $this->_get_group_edit_form_admin($group);
     $valid = $form->validate();
 
     if ($valid) {
@@ -284,7 +284,111 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    print group::get_edit_form_admin($group);
+    print $this->_get_group_edit_form_admin($group);
   }
 
+  /* User Form Definitions */
+  static function _get_user_edit_form_admin($user) {
+    $form = new Forge(
+      "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
+    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
+    $group->inputs["name"]->error_messages(
+      "in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
+    $form->add_rules_from($user);
+    $form->edit_user->password->rules("-required");
+
+    module::event("user_edit_form_admin", $user, $form);
+    $group->submit("")->value(t("Modify User"));
+    return $form;
+  }
+
+  static function _get_user_add_form_admin() {
+    $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
+    $form->set_attr('class', "g-narrow");
+    $group = $form->group("add_user")->label(t("Add User"));
+    $group->input("name")->label(t("Username"))->id("g-username")
+      ->error_messages("in_use", t("There is already a user with that username"));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email");
+    $group->input("url")->label(t("URL"))->id("g-url");
+    self::_add_locale_dropdown($group);
+    $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
+    $user = ORM::factory("user");
+    $form->add_rules_from($user);
+
+    module::event("user_add_form_admin", $user, $form);
+    $group->submit("")->value(t("Add User"));
+    return $form;
+  }
+
+  private function _add_locale_dropdown(&$form, $user=null) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      // Put "none" at the first position in the array
+      $locales = array_merge(array("" => t("« none »")), $locales);
+      $selected_locale = ($user && $user->locale) ? $user->locale : "";
+      $form->dropdown("locale")
+        ->label(t("Language Preference"))
+        ->options($locales)
+        ->selected($selected_locale);
+    }
+  }
+
+  private function _get_user_delete_form_admin($user) {
+    $form = new Forge("admin/users/delete_user/$user->id", "", "post",
+                      array("id" => "g-delete-user-form"));
+    $group = $form->group("delete_user")->label(
+      t("Are you sure you want to delete user %name?", array("name" => $user->name)));
+    $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
+    return $form;
+  }
+
+  /* Group Form Definitions */
+  private function _get_group_edit_form_admin($group) {
+    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
+    $form_group = $form->group("edit_group")->label(t("Edit Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Save"));
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  private function _get_group_add_form_admin() {
+    $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
+    $form->set_attr('class', "g-narrow");
+    $form_group = $form->group("add_group")->label(t("Add Group"));
+    $form_group->input("name")->label(t("Name"))->id("g-name");
+    $form_group->inputs["name"]->error_messages(
+      "in_use", t("There is already a group with that name"));
+    $form_group->submit("")->value(t("Add Group"));
+    $group = ORM::factory("group");
+    $form->add_rules_from($group);
+    return $form;
+  }
+
+  private function _get_group_delete_form_admin($group) {
+    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
+                      array("id" => "g-delete-group-form"));
+    $form_group = $form->group("delete_group")->label(
+      t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
+    $form_group->submit("")->value(t("Delete"));
+    return $form;
+  }
 }
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
new file mode 100644
index 00000000..b03a47cc
--- /dev/null
+++ b/modules/user/controllers/users.php
@@ -0,0 +1,103 @@
+<?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 Users_Controller extends Controller {
+  public function update($id) {
+    $user = user::lookup($id);
+
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    $form = $this->_get_edit_form($user);
+    $valid = $form->validate();
+    if ($valid) {
+      $user->full_name = $form->edit_user->full_name->value;
+      if ($form->edit_user->password->value) {
+        $user->password = $form->edit_user->password->value;
+      }
+      $user->email = $form->edit_user->email->value;
+      $user->url = $form->edit_user->url->value;
+      if ($form->edit_user->locale) {
+        $desired_locale = $form->edit_user->locale->value;
+        $new_locale = $desired_locale == "none" ? null : $desired_locale;
+        if ($new_locale != $user->locale) {
+          // Delete the session based locale preference
+          setcookie("g_locale", "", time() - 24 * 3600, "/");
+        }
+        $user->locale = $new_locale;
+      }
+      $user->save();
+      module::event("user_edit_form_completed", $user, $form);
+
+      message::success(t("User information updated."));
+      print json_encode(
+        array("result" => "success",
+              "resource" => url::site("users/{$user->id}")));
+    } else {
+      print json_encode(
+        array("result" => "error",
+              "form" => $form->__toString()));
+    }
+  }
+
+  public function form_edit($id) {
+    $user = user::lookup($id);
+    if ($user->guest || $user->id != user::active()->id) {
+      access::forbidden();
+    }
+
+    print $this->_get_edit_form($user);
+  }
+
+  private function _get_edit_form($user) {
+    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
+    $form->set_attr("class", "g-narrow");
+    $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
+    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    self::_add_locale_dropdown($group, $user);
+    $group->password("password")->label(t("Password"))->id("g-password");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
+    $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
+    $form->add_rules_from($user);
+
+    module::event("user_edit_form", $user, $form);
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
+
+  /** @todo combine with Admin_Users_Controller::_add_locale_dropdown */
+  private function _add_locale_dropdown(&$form, $user=null) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      // Put "none" at the first position in the array
+      $locales = array_merge(array("" => t("« none »")), $locales);
+      $selected_locale = ($user && $user->locale) ? $user->locale : "";
+      $form->dropdown("locale")
+        ->label(t("Language Preference"))
+        ->options($locales)
+        ->selected($selected_locale);
+    }
+  }
+}
-- 
cgit v1.2.3


From be6765336eb894535d62055fab577dfc951b6b6a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 15 Oct 2009 10:44:25 -0700
Subject: Finish integrating the move of the user edit/update functions into
 the user module.  The premise is that the plugable user module will provide
 the update screens if the user backend supports updates.

---
 modules/gallery/controllers/albums.php        |  1 -
 modules/gallery/controllers/login.php         |  1 -
 modules/gallery/helpers/gallery_event.php     |  4 ++++
 modules/gallery/helpers/gallery_theme.php     |  1 -
 modules/gallery/helpers/user.php              |  1 -
 modules/gallery/libraries/Identity.php        |  1 -
 modules/gallery/views/login.html.php          |  6 +++++-
 modules/gallery/views/login_ajax.html.php     |  2 +-
 modules/user/controllers/admin_users.php      |  9 ++++----
 modules/user/controllers/users.php            |  2 +-
 modules/user/views/admin_users.html.php       | 31 +++++++++++----------------
 modules/user/views/admin_users_group.html.php |  4 ++--
 12 files changed, 29 insertions(+), 34 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 95d63308..9733d1cd 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -29,7 +29,6 @@ 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->writable = user::is_writable();
         $view->content->form = user::get_login_form("login/auth_html");
         print $view;
         return;
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 85f6db5d..2c4bd557 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -21,7 +21,6 @@ class Login_Controller extends Controller {
 
   public function ajax() {
     $view = new View("login_ajax.html");
-    $view->writable = user::is_writable();
     $view->form = user::get_login_form("login/auth_ajax");
     print $view;
   }
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index e0de2152..4a6b14b6 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,6 +23,10 @@ class gallery_event_Core {
    * Initialization.
    */
   static function gallery_ready() {
+    // Call Identity::instance() now to force the load of the user interface classes.
+    // user::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();
     user::load_user();
     locales::set_request_locale();
   }
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 54b35fb7..a342b4bd 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -55,7 +55,6 @@ class gallery_theme_Core {
     if ($theme->page_type != "login") {
       $view = new View("login.html");
       $view->user = user::active();
-      $view->writable = user::is_writable();
       return $view->render();
     }
   }
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index efe08830..c51a4a9c 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -78,7 +78,6 @@ class user_Core {
    * driver classes.
    */
   static function load_user() {
-    Identity::instance();
     $session = Session::instance();
     if (!($user = $session->get("user"))) {
       $session->set("user", $user = self::guest());
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 88865913..86b15935 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -102,7 +102,6 @@ class Identity_Core {
     return !empty($this->config["allow_updates"]);
   }
 
-
   /**
    * @see Identity_Driver::guest.
    */
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 5256f1ac..2d8119d0 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -8,11 +8,15 @@
   </li>
   <? else: ?>
   <li class="first">
+    <? if (user::is_writable()): ?>
     <?= t('Logged in as %name', array('name' => html::mark_clean(
       '<a href="' . url::site("form/edit/users/{$user->id}") .
-      '" title="' . ($writable ? t("Edit Your Profile")->for_html_attr() : t("Display 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: ?>
+    <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
+    <? endif ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index 332a5365..d71ca719 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -36,7 +36,7 @@
     <li id="g-login-form">
       <?= $form ?>
     </li>
-    <? if (!empty($writable)): ?>
+    <? if (user::is_writable()): ?>
     <li>
       <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
     </li>
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 70348a69..64f19ecd 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,7 +21,6 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->writable = user::is_writable();
     $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
     $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
     print $view;
@@ -304,7 +303,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from($user);
+    $form->add_rules_from(user::get_edit_rules());
     $form->edit_user->password->rules("-required");
 
     module::event("user_edit_form_admin", $user, $form);
@@ -327,7 +326,7 @@ class Admin_Users_Controller extends Admin_Controller {
     self::_add_locale_dropdown($group);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
     $user = ORM::factory("user");
-    $form->add_rules_from($user);
+    $form->add_rules_from(user::get_edit_rules());
 
     module::event("user_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
@@ -367,7 +366,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from($group);
+    $form->add_rules_from(group::get_edit_rules());
     return $form;
   }
 
@@ -380,7 +379,7 @@ class Admin_Users_Controller extends Admin_Controller {
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Add Group"));
     $group = ORM::factory("group");
-    $form->add_rules_from($group);
+    $form->add_rules_from(group::get_edit_rules());
     return $form;
   }
 
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index b03a47cc..7c2e7833 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -77,7 +77,7 @@ class Users_Controller extends Controller {
       ->matches($group->password);
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from($user);
+    $form->add_rules_from(user::get_edit_rules());
 
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 82d0926c..a29f24b1 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,14 +43,12 @@
   }
 </script>
 <div class="g-block">
-  <? if (!empty($writable)): ?>
   <a href="<?= url::site("admin/users/add_user_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
   </a>
-  <? endif ?>
 
   <h2>
     <?= t("User Admin") ?>
@@ -68,7 +66,7 @@
 
       <? foreach ($users as $i => $user): ?>
       <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info <?= !empty($writable) ? "g-draggable" : "" ?> ">
+        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
                alt="<?= html::clean_attribute($user->name) ?>"
@@ -90,18 +88,16 @@
               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">
-              <?= (!empty($writable)) ? t("edit") : t("display") ?>
+              <?= t("edit") ?>
             </span></a>
-          <? if (!empty($writable)): ?>
-            <? if (user::active()->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>
-            <? 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>
-            <? endif ?>
+          <? if (user::active()->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>
+          <? 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>
           <? endif ?>
         </td>
       </tr>
@@ -111,14 +107,12 @@
 </div>
 
 <div id="g-group-admin" class="g-block g-clearfix">
-  <? if (!empty($writable)): ?>
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
   </a>
-  <? endif ?>
 
   <h2>
     <?= t("Group Admin") ?>
@@ -127,9 +121,8 @@
   <div class="g-block-content">
     <ul>
       <? foreach ($groups as $i => $group): ?>
-      <? $class = !empty($writable) ? "" : "g-group-disable" ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= $class ?> <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; $v->writable = !empty($writable) ?>
+      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
         <?= $v ?>
       </li>
       <? endforeach ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 539f69b7..db3645a0 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,7 +4,7 @@
   <? if (!$group->special): ?>
   <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 <?= !empty($writable) ? "" : "ui-state-disabled"  ?>">
+    class="g-dialog-link g-button ui-state-default ui-corner-all">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? else: ?>
   <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="g-button ui-state-default ui-corner-all ui-icon-left <?= !empty($writable) ? "" : "ui-state-disabled"  ?>"
+       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>
-- 
cgit v1.2.3


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/akismet/tests/Akismet_Helper_Test.php      |   2 +-
 modules/comment/controllers/comments.php           |   8 +-
 modules/comment/helpers/comment.php                |   2 +-
 modules/comment/models/comment.php                 |   2 +-
 modules/comment/tests/Comment_Event_Test.php       |   2 +-
 modules/comment/tests/Comment_Helper_Test.php      |   4 +-
 modules/comment/tests/Comment_Model_Test.php       |   8 +-
 modules/digibug/controllers/digibug.php            |   2 +-
 modules/digibug/tests/Digibug_Controller_Test.php  |   4 +-
 modules/g2_import/helpers/g2_import.php            |  15 +-
 modules/gallery/controllers/admin.php              |   2 +-
 modules/gallery/controllers/albums.php             |   6 +-
 modules/gallery/controllers/l10n_client.php        |   4 +-
 modules/gallery/controllers/login.php              |  12 +-
 modules/gallery/controllers/logout.php             |   4 +-
 modules/gallery/controllers/password.php           |   6 +-
 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/group.php                  |  79 --------
 modules/gallery/helpers/item.php                   |   4 +-
 modules/gallery/helpers/locales.php                |   2 +-
 modules/gallery/helpers/log.php                    |   2 +-
 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/helpers/user.php                   | 223 ---------------------
 modules/gallery/libraries/Admin_View.php           |   4 +-
 modules/gallery/libraries/Identity.php             | 196 +++++++++++++++---
 modules/gallery/libraries/Theme_View.php           |   6 +-
 modules/gallery/models/item.php                    |   2 +-
 modules/gallery/models/log.php                     |   2 +-
 modules/gallery/models/task.php                    |   2 +-
 modules/gallery/tests/Access_Helper_Test.php       | 142 ++++++-------
 modules/gallery/tests/Albums_Controller_Test.php   |   4 +-
 modules/gallery/tests/Item_Helper_Test.php         |   6 +-
 modules/gallery/tests/Photos_Controller_Test.php   |   6 +-
 modules/gallery/views/kohana_error_page.php        |   2 +-
 modules/gallery/views/login.html.php               |   2 +-
 modules/gallery/views/login_ajax.html.php          |   2 +-
 modules/gallery/views/maintenance.html.php         |   2 +-
 modules/notification/helpers/notification.php      |  10 +-
 .../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/helpers/group.php                     |  79 ++++++++
 modules/user/helpers/user.php                      | 109 ++++++++++
 modules/user/views/admin_users.html.php            |   2 +-
 57 files changed, 520 insertions(+), 505 deletions(-)
 delete mode 100644 modules/gallery/helpers/group.php
 delete mode 100644 modules/gallery/helpers/user.php
 create mode 100644 modules/user/helpers/group.php
 create mode 100644 modules/user/helpers/user.php

(limited to 'modules/user')

diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index d001d3ad..6788e7a3 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -26,7 +26,7 @@ class Akismet_Helper_Test extends Unit_Test_Case {
 
     $root = ORM::factory("item", 1);
     $this->_comment = comment::create(
-      $root, user::guest(), "This is a comment",
+      $root, Identity::guest(), "This is a comment",
       "John Doe", "john@gallery2.org", "http://gallery2.org");
     foreach ($this->_comment->list_fields("comments") as $name => $field) {
       if (strpos($name, "server_") === 0) {
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 82b12893..84d6ca47 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 (user::active()->guest && !$form->add_comment->inputs["name"]->value) {
+      if (Identity::active()->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, user::active(),
+        $item, Identity::active(),
         $form->add_comment->text->value,
         $form->add_comment->inputs["name"]->value,
         $form->add_comment->email->value,
         $form->add_comment->url->value);
 
-      $active = user::active();
+      $active = Identity::active();
       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 (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       access::forbidden();
     }
     print comment::get_edit_form($comment);
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 7b2332a8..38d65db6 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 = user::active();
+    $active = Identity::active();
     if (!$active->guest) {
       $group->inputs["name"]->value($active->full_name)->disabled("disabled");
       $group->email->value($active->email)->disabled("disabled");
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index de9b0cd6..5e29e778 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -23,7 +23,7 @@ class Comment_Model extends ORM {
   }
 
   function author() {
-    return user::lookup($this->author_id);
+    return Identity::lookup_user($this->author_id);
   }
 
   function author_name() {
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index c51c65c9..eb301893 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -22,7 +22,7 @@ class Comment_Event_Test extends Unit_Test_Case {
     $rand = rand();
     $album = album::create(ORM::factory("item", 1), "test_$rand", "test_$rand");
     $comment = comment::create(
-      $album, user::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $album, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $album->delete();
 
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index f84fe0f9..e8ab7c79 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -48,7 +48,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $comment = comment::create(
-      $root, user::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $root, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $this->assert_equal("name_$rand", $comment->author_name());
     $this->assert_equal("email_$rand", $comment->author_email());
@@ -77,7 +77,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function create_comment_for_user_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
-    $admin = user::lookup(2);
+    $admin = Identity::lookup_user(2);
     $comment = comment::create(
       $root, $admin, "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index f4c68b15..76de2a34 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -22,17 +22,17 @@ class Comment_Model_Test extends Unit_Test_Case {
   public function cant_view_comments_for_unviewable_items_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), rand(), rand());
-    $comment = comment::create($album, user::guest(), "text", "name", "email", "url");
-    user::set_active(user::guest());
+    $comment = comment::create($album, Identity::guest(), "text", "name", "email", "url");
+    Identity::set_active(Identity::guest());
 
     // We can see the comment when permissions are granted on the album
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 0939704b..8ea83601 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -23,7 +23,7 @@ class Digibug_Controller extends Controller {
     $item = ORM::factory("item", $id);
     access::required("view", $item);
 
-    if (access::group_can(group::everybody(), "view_full", $item)) {
+    if (access::group_can(Identity::everybody(), "view_full", $item)) {
       $full_url = $item->file_url(true);
       $thumb_url = $item->thumb_url(true);
     } else {
diff --git a/modules/digibug/tests/Digibug_Controller_Test.php b/modules/digibug/tests/Digibug_Controller_Test.php
index 859ff637..19f57972 100644
--- a/modules/digibug/tests/Digibug_Controller_Test.php
+++ b/modules/digibug/tests/Digibug_Controller_Test.php
@@ -35,8 +35,8 @@ class Digibug_Controller_Test extends Unit_Test_Case {
 
     $root = ORM::factory("item", 1);
     $this->_album = album::create($root,  rand(), "test album");
-    access::deny(group::everybody(), "view_full", $this->_album);
-    access::deny(group::registered_users(), "view_full", $this->_album);
+    access::deny(Identity::everybody(), "view_full", $this->_album);
+    access::deny(Identity::registered_users(), "view_full", $this->_album);
 
     $rand = rand();
     $this->_item = photo::create($this->_album, MODPATH . "gallery/tests/test.jpg", "$rand.jpg",
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 7e5c6f75..8b48f727 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -230,16 +230,16 @@ class g2_import_Core {
     switch ($g2_group->getGroupType()) {
     case GROUP_NORMAL:
       try {
-        $group = group::create($g2_group->getGroupName());
+        $group = Identity::create_group($g2_group->getGroupName());
       } catch (Exception $e) {
         // @todo For now we assume this is a "duplicate group" exception
-        $group = group::lookup_by_name($g2_group->getGroupname());
+        $group = Identity::lookup_user_by_name($g2_group->getGroupname());
       }
       $message = t("Group '%name' was imported", array("name" => $g2_group->getGroupname()));
       break;
 
     case GROUP_ALL_USERS:
-      $group = group::registered_users();
+      $group = Identity::registered_users();
       $message = t("Group 'Registered' was converted to '%name'", array("name" => $group->name));
       break;
 
@@ -248,7 +248,7 @@ class g2_import_Core {
       break;  // This is not a group in G3
 
     case GROUP_EVERYBODY:
-      $group = group::everybody();
+      $group = Identity::everybody();
       $message = t("Group 'Everybody' was converted to '%name'", array("name" => $group->name));
       break;
     }
@@ -270,7 +270,7 @@ class g2_import_Core {
     }
 
     if (g2(GalleryCoreApi::isAnonymousUser($g2_user_id))) {
-      self::set_map($g2_user_id, user::guest()->id);
+      self::set_map($g2_user_id, Identity::guest()->id);
       return t("Skipping Anonymous User");
     }
 
@@ -285,11 +285,11 @@ class g2_import_Core {
     $g2_groups = g2(GalleryCoreApi::fetchGroupsForUser($g2_user->getId()));
 
     try {
-      $user = user::create($g2_user->getUsername(), $g2_user->getfullname(), "");
+      $user = Identity::create_user($g2_user->getUsername(), $g2_user->getfullname(), "");
       $message = t("Created user: '%name'.", array("name" => $user->name));
     } catch (Exception $e) {
       // @todo For now we assume this is a "duplicate user" exception
-      $user = user::lookup_by_name($g2_user->getUsername());
+      $user = Identity::lookup_user_by_name($g2_user->getUsername());
       $message = t("Loaded existing user: '%name'.", array("name" => $user->name));
     }
 
@@ -313,7 +313,6 @@ class g2_import_Core {
     return $message;
   }
 
-
   /**
    * Import a single album.
    */
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index b92a32cd..8a4181a6 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 (!(user::active()->admin)) {
+    if (!(Identity::active()->admin)) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9733d1cd..fdf06ec0 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 = user::get_login_form("login/auth_html");
+        $view->content->form = Identity::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"),
-        user::active()->id,
+        Identity::active()->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"),
-        user::active()->id);
+        Identity::active()->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 6fdbb3a1..b3929c5d 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 (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       access::forbidden();
     }
 
@@ -85,7 +85,7 @@ class L10n_Client_Controller extends Controller {
 
   public function toggle_l10n_mode() {
     access::verify_csrf();
-    if (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 2c4bd557..c8b771ca 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 = user::get_login_form("login/auth_ajax");
+    $view->form = Identity::get_login_form("login/auth_ajax");
     print $view;
   }
 
@@ -40,7 +40,7 @@ class Login_Controller extends Controller {
   }
 
   public function html() {
-    print user::get_login_form("login/auth_html");
+    print Identity::get_login_form("login/auth_html");
   }
 
   public function auth_html() {
@@ -54,11 +54,11 @@ class Login_Controller extends Controller {
     }
   }
   private function _auth($url) {
-    $form = user::get_login_form($url);
+    $form = Identity::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
-      $user = user::lookup_by_name($form->login->inputs["name"]->value);
-      if (empty($user) || !user::is_correct_password($user, $form->login->password->value)) {
+      $user = Identity::lookup_user_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !Identity::is_correct_password($user, $form->login->password->value)) {
         log::warning(
           "user",
           t("Failed login for %name",
@@ -69,7 +69,7 @@ class Login_Controller extends Controller {
     }
 
     if ($valid) {
-      user::login($user);
+      Identity::login($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 45d397ad..6841b870 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -21,8 +21,8 @@ class Logout_Controller extends Controller {
   public function index() {
     //access::verify_csrf();
 
-    $user = user::active();
-    user::logout();
+    $user = Identity::active();
+    Identity::logout();
     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/password.php b/modules/gallery/controllers/password.php
index e8b08960..ce6d67b1 100644
--- a/modules/gallery/controllers/password.php
+++ b/modules/gallery/controllers/password.php
@@ -32,7 +32,7 @@ class Password_Controller extends Controller {
     if (request::method() == "post") {
       $this->_change_password();
     } else {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      $user = Identity::lookup_user_by_hash(Input::instance()->get("key"));
       if (!empty($user)) {
         print $this->_new_password_form($user->hash);
       } else {
@@ -46,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
+      $user = Identity::lookup_user_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
@@ -116,7 +116,7 @@ class Password_Controller extends Controller {
   private function _change_password() {
     $view = $this->_new_password_form();
     if ($view->content->validate()) {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      $user = Identity::lookup_user_by_hash(Input::instance()->get("key"));
       if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 8d75862e..6b1e926f 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(user::active(), "edit", $item)) {
+        if (!access::user_can(Identity::active(), "edit", $item)) {
           access::allow($group, $perm->name, $item);
         }
       }
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 0f6cbc2c..f6ca4c8a 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 = user::active()->admin || $session->get("can_upgrade");
+    $view->can_upgrade = Identity::active()->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 (!user::active()->admin && !Session::instance()->get("can_upgrade", false)) {
+    } else if (!Identity::active()->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 8fd1e0a0..c093b67d 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 (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       url::redirect(item::root()->abs_url());
     }
 
     $v = new View("welcome_message.html");
-    $v->user = user::active();
+    $v->user = Identity::active();
     print $v;
   }
 }
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 949aea84..0e0e749e 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(user::active(), $perm_name, $item);
+    return self::user_can(Identity::active(), $perm_name, $item);
   }
 
   /**
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 50e2c43b..e1fa2a7c 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) && !user::active()->admin) {
+    if (Router::$controller != "login" && !empty($maintenance_mode) && !Identity::active()->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 4a6b14b6..abead9e3 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.
-    // user::load_user will attempt to load the active user from the session and needs
+    // Identity::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();
-    user::load_user();
+    Identity::load_user();
     locales::set_request_locale();
   }
 
@@ -139,7 +139,7 @@ class gallery_event_Core {
         }
       }
 
-      if (user::active()->admin) {
+      if (Identity::active()->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 a342b4bd..cc46a88a 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 = user::active();
+      $view->user = Identity::active();
       return $view->render();
     }
   }
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
deleted file mode 100644
index 295e5f50..00000000
--- a/modules/gallery/helpers/group.php
+++ /dev/null
@@ -1,79 +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.
- */
-
-/**
- * This is the API for handling groups.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class group_Core {
-  /**
-   * @see Identity_Driver::create.
-   */
-  static function create($name) {
-    return Identity::instance()->create_group($name);
-  }
-
-  /**
-   * @see Identity_Driver::everbody.
-   */
-  static function everybody() {
-    return Identity::instance()->everybody();
-  }
-
-  /**
-   * @see Identity_Driver::registered_users.
-   */
-  static function registered_users() {
-    return Identity::instance()->everybody();
-  }
-
-  /**
-   * Look up a group by id.
-   * @param integer      $id the user id
-   * @return Group_Definition  the group object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    return Identity::instance()->lookup_group_by_field("id", $id);
-  }
-
-  /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Definition  the group object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    return Identity::instance()->lookup_group_by_field("name", $name);
-  }
-
-  /**
-   * @see Identity_Driver::get_group_list.
-   */
-  static function get_group_list($filter=array()) {
-    return Identity::instance()->get_group_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  static function get_edit_rules() {
-    return Identity::instance()->get_edit_rules("group");
-  }
-}
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 084bbc15..bce83bb3 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 (!user::active()->admin) {
-      foreach (user::group_ids() as $id) {
+    if (!Identity::active()->admin) {
+      foreach (Identity::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 2cd8b0c2..2dfc7f21 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 = user::active()->locale;
+      $locale = Identity::active()->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 c8e94b45..512723dd 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 = user::active()->id;
+    $log->user_id = Identity::active()->id;
     $log->save();
   }
 
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 9ca28fe6..32a27646 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 : user::active();
+    $movie->owner_id = $owner_id ? $owner_id : Identity::active();
     $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 6677ddc9..cf316819 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 : user::active();
+    $photo->owner_id = $owner_id ? $owner_id : Identity::active();
     $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 b7c6de9a..3f7ff19d 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 (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       return;
     }
     $buf = array();
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 9fa04305..4735c36c 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 = user::active()->id;
+    $task->owner_id = Identity::active()->id;
     $task->context = serialize($context);
     $task->save();
 
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
deleted file mode 100644
index c51a4a9c..00000000
--- a/modules/gallery/helpers/user.php
+++ /dev/null
@@ -1,223 +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.
- */
-
-/**
- * This is the API for handling users.
- *
- * 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-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() {
-    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 what is user id===2
-    if ($user === 2) {
-      $user = model_cache::get("user", 2);
-      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);
-    }
-  }
-
-  /**
-   * @see Identity_Core::is_writable.
-   */
-  static function is_writable() {
-    return Identity::instance()->is_writable();
-  }
-
-  /**
-   * @see Identity_Driver::guest.
-   */
-  static function guest() {
-    return Identity::instance()->guest();
-  }
-
-  /**
-   * @see Identity_Driver::create_user.
-   */
-  static function create($name, $full_name, $password) {
-    return Identity::instance()->create_user($name, $full_name, $password);
-  }
-
-  /**
-   * @see Identity_Driver::is_correct_password.
-   */
-  static function is_correct_password($user, $password) {
-    return Identity::instance()->is_correct_password($user, $password);
-  }
-
-  /**
-   * @see Identity_Driver::hash_password.
-   */
-  static function hash_password($password) {
-    return Identity::instance()->hash_password($password);
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Definition  the user object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    return Identity::instance()->lookup_user_by_field("id", $id);
-  }
-
-  /**
-   * Look up a user by name.
-   * @param integer      $name the user name
-   * @return User_Definition  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    return Identity::instance()->lookup_user_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by hash.
-   * @param string       $name the user name
-   * @return User_Definition  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_hash($hash) {
-    return Identity::instance()->lookup_user_by_field("hash", $hash);
-  }
-
-  /**
-   * @see Identity_Driver::get_user_list.
-   */
-  static function get_user_list($filter=array()) {
-    return Identity::instance()->get_user_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  static function get_edit_rules() {
-    return Identity::instance()->get_edit_rules("user");
-  }
-
-  private static function _lookup_user_by_field($field_name, $value) {
-    try {
-      $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
-        return $user;
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index fa6d1dd3..b1bb4ada 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 (user::active()->admin) {
+    if (Identity::active()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
     $this->sidebar = "";
     $this->set_global("theme", $this);
-    $this->set_global("user", user::active());
+    $this->set_global("user", Identity::active());
   }
 
   public function admin_menu() {
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 86b15935..229d0da9 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -22,7 +22,7 @@
  * Provides a driver-based interface for managing users and groups.
  */
 class Identity_Core {
-  protected static $instances;
+  protected static $instance;
 
   // Configuration
   protected $config;
@@ -38,12 +38,12 @@ class Identity_Core {
    * @return  Identity_Core
    */
   static function & instance($config="default") {
-   if (!isset(Identity::$instances)) {
+   if (!isset(Identity::$instance)) {
       // Create a new instance
-      Identity::$instances = new Identity($config);
+      Identity::$instance = new Identity($config);
     }
 
-    return Identity::$instances;
+    return Identity::$instance;
   }
 
   /**
@@ -85,9 +85,10 @@ class Identity_Core {
       $this->driver = new $driver($this->config["params"]);
 
       // Validate the driver
-      if ( !($this->driver instanceof Identity_Driver))
+      if ( !($this->driver instanceof Identity_Driver)) {
         throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
                                    get_class($this), "Identity_Driver");
+      }
 
       Kohana::log("debug", "Identity Library initialized");
     }
@@ -98,91 +99,220 @@ class Identity_Core {
    *
    * @return boolean true if the driver supports updates; false if read only
    */
-  public function is_writable() {
-    return !empty($this->config["allow_updates"]);
+  static function is_writable() {
+    return !empty(self::instance()->config["allow_updates"]);
   }
 
   /**
    * @see Identity_Driver::guest.
    */
-  public function guest() {
-    return $this->driver->guest();
+  static function guest() {
+    return self::instance()->driver->guest();
   }
 
   /**
    * @see Identity_Driver::create_user.
    */
-  public function create_user($name, $full_name, $password) {
-    return $this->driver->create_user($name, $full_name, $password);
+  static function create_user($name, $full_name, $password) {
+    return self::instance()->driver->create_user($name, $full_name, $password);
   }
 
   /**
    * @see Identity_Driver::is_correct_password.
    */
-  public function is_correct_password($user, $password) {
-    return $this->driver->is_correct_password($user, $password);
+  static function is_correct_password($user, $password) {
+    return self::instance()->driver->is_correct_password($user, $password);
   }
 
   /**
    * @see Identity_Driver::hash_password.
    */
-  public function hash_password($password) {
-    return $this->driver->hash_password($password);
+  static function hash_password($password) {
+    return self::instance()->driver->hash_password($password);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Definition  the user object, or null if the id was invalid.
+   */
+  static function lookup_user($id) {
+    return self::instance()->driver->lookup_user_by_field("id", $id);
+  }
+
+  /**
+   * Look up a user by name.
+   * @param integer      $name the user name
+   * @return User_Definition  the user object, or null if the name was invalid.
+   */
+  static function lookup_user_by_name($name) {
+    return self::instance()->driver->lookup_user_by_field("name", $name);
   }
 
   /**
-   * @see Identity_Driver::lookup_user_by_field.
+   * Look up a user by hash.
+   * @param string       $name the user name
+   * @return User_Definition  the user object, or null if the name was invalid.
    */
-  public function lookup_user_by_field($field_name, $value) {
-    return $this->driver->lookup_user_by_field($field_name, $value);
+  static function lookup_user_by_hash($hash) {
+    return self::instance()->driver->lookup_user_by_field("hash", $hash);
   }
 
   /**
    * @see Identity_Driver::create_group.
    */
-  public function create_group($name) {
-    return $this->driver->create_group($name);
+  static function create_group($name) {
+    return self::instance()->driver->create_group($name);
   }
 
   /**
    * @see Identity_Driver::everybody.
    */
-  public function everybody() {
-    return $this->driver->everybody();
+  static function everybody() {
+    return self::instance()->driver->everybody();
   }
 
   /**
    * @see Identity_Driver::registered_users.
    */
-  public function registered_users() {
-    return $this->driver->everybody();
+  static function registered_users() {
+    return self::instance()->driver->everybody();
   }
 
   /**
-   * @see Identity_Driver::lookup_group_by_field.
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Definition  the group object, or null if the name was invalid.
    */
-  public function lookup_group_by_field($field_name, $value) {
-    return $this->driver->lookup_group_by_field($field_name, $value);
+  static function lookup_group_by_name($name) {
+    return self::instance()->driver->lookup_group_by_field("name", $name);
   }
 
   /**
    * @see Identity_Driver::get_user_list.
    */
-  public function get_user_list($filter=array()) {
-    return $this->driver->get_user_list($filter);
+  static function get_user_list($filter=array()) {
+    return self::instance()->driver->get_user_list($filter);
   }
 
   /**
    * @see Identity_Driver::get_group_list.
    */
-  public function get_group_list($filter=array()) {
-    return $this->driver->get_group_list($filter);
+  static function get_group_list($filter=array()) {
+    return self::instance()->driver->get_group_list($filter);
   }
 
   /**
    * @see Identity_Driver::get_edit_rules.
    */
-  public function get_edit_rules($object_type) {
-    return $this->driver->get_edit_rules($object_type);
+  static function get_edit_rules($object_type) {
+    return self::instance()->driver->get_edit_rules($object_type);
+  }
+
+  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/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index cba436e8..4e87f4fb 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 (user::active()->admin) {
+    if (Identity::active()->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", user::active());
+    $this->set_global("user", Identity::active());
     $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) && user::active()->admin) {
+    if (empty($sidebar) && Identity::active()->admin) {
       $sidebar = new View("no_sidebar.html");
     }
     return $sidebar;
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 6f0e3525..ba44709f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -333,7 +333,7 @@ class Item_Model extends ORM_MPTT {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return user::lookup($this->owner_id);
+        return Identity::lookup_user($this->owner_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index d143d7bd..1d639857 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -26,7 +26,7 @@ class Log_Model extends ORM {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return user::lookup($this->user_id);
+        return Identity::lookup_user($this->user_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/task.php b/modules/gallery/models/task.php
index b7e255a2..548e5f9c 100644
--- a/modules/gallery/models/task.php
+++ b/modules/gallery/models/task.php
@@ -46,7 +46,7 @@ class Task_Model extends ORM {
   }
 
   public function owner() {
-    return user::lookup($this->owner_id);
+    return Identity::lookup_user($this->owner_id);
   }
 
   /**
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 72d7e04c..4904887a 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -33,7 +33,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     } catch (Exception $e) { }
 
     try {
-      $user = user::lookup_by_name("access_test");
+      $user = Identity::lookup_user_by_name("access_test");
       if ($user->loaded) {
         $user->delete();
       }
@@ -41,16 +41,16 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     // Reset some permissions that we mangle below
     $root = ORM::factory("item", 1);
-    access::allow(group::everybody(), "view", $root);
+    access::allow(Identity::everybody(), "view", $root);
   }
 
   public function setup() {
-    user::set_active(user::guest());
+    Identity::set_active(Identity::guest());
   }
 
   public function groups_and_permissions_are_bound_to_columns_test() {
     access::register_permission("access_test", "Access Test");
-    $group = group::create("access_test");
+    $group = Identity::create_group("access_test");
 
     // We have a new column for this perm / group combo
     $fields = Database::instance()->list_fields("access_caches");
@@ -65,17 +65,17 @@ class Access_Helper_Test extends Unit_Test_Case {
   }
 
   public function user_can_access_test() {
-    $access_test = group::create("access_test");
+    $access_test = Identity::create_group("access_test");
 
     $root = ORM::factory("item", 1);
     access::allow($access_test, "view", $root);
 
     $item = album::create($root,  rand(), "test album");
 
-    access::deny(group::everybody(), "view", $item);
-    access::deny(group::registered_users(), "view", $item);
+    access::deny(Identity::everybody(), "view", $item);
+    access::deny(Identity::registered_users(), "view", $item);
 
-    $user = user::create("access_test", "Access Test", "");
+    $user = Identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
@@ -89,10 +89,10 @@ class Access_Helper_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
     $item = album::create($root,  rand(), "test album");
 
-    access::deny(group::everybody(), "view", $item);
-    access::deny(group::registered_users(), "view", $item);
+    access::deny(Identity::everybody(), "view", $item);
+    access::deny(Identity::registered_users(), "view", $item);
 
-    $user = user::create("access_test", "Access Test", "");
+    $user = Identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
@@ -121,14 +121,14 @@ class Access_Helper_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
 
     $album = album::create($root, rand(), "test album");
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
 
     $photo = ORM::factory("item");
     $photo->type = "photo";
     $photo->add_to_parent($album);
     access::add_item($photo);
 
-    $this->assert_true($photo->__get("view_" . group::everybody()->id));
+    $this->assert_true($photo->__get("view_" . Identity::everybody()->id));
   }
 
   public function can_allow_deny_and_reset_intent_test() {
@@ -137,23 +137,23 @@ class Access_Helper_Test extends Unit_Test_Case {
     $intent = ORM::factory("access_intent")->where("item_id", $album)->find();
 
     // Allow
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_same(access::ALLOW, $intent->reload()->view_1);
 
     // Deny
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_same(
       access::DENY,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_same(
       access::ALLOW,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
 
-    access::reset(group::everybody(), "view", $album);
+    access::reset(Identity::everybody(), "view", $album);
     $this->assert_same(
       null,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
@@ -161,7 +161,7 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function cant_reset_root_item_test() {
     try {
-      access::reset(group::everybody(), "view", ORM::factory("item", 1));
+      access::reset(Identity::everybody(), "view", ORM::factory("item", 1));
     } catch (Exception $e) {
       return;
     }
@@ -170,17 +170,17 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function can_view_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(group::everybody(), "view", $root);
-    $this->assert_true(access::group_can(group::everybody(), "view", $root));
+    access::allow(Identity::everybody(), "view", $root);
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $root));
   }
 
   public function can_always_fails_on_unloaded_items_test() {
     $root = ORM::factory("item", 1);
-    access::allow(group::everybody(), "view", $root);
-    $this->assert_true(access::group_can(group::everybody(), "view", $root));
+    access::allow(Identity::everybody(), "view", $root);
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $root));
 
     $bogus = ORM::factory("item", -1);
-    $this->assert_false(access::group_can(group::everybody(), "view", $bogus));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $bogus));
   }
 
   public function cant_view_child_of_hidden_parent_test() {
@@ -188,21 +188,21 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = album::create($root, rand(), "test album");
 
     $root->reload();
-    access::deny(group::everybody(), "view", $root);
-    access::reset(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $root);
+    access::reset(Identity::everybody(), "view", $album);
 
     $album->reload();
-    $this->assert_false(access::group_can(group::everybody(), "view", $album));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $album));
   }
 
   public function view_permissions_propagate_down_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
 
-    access::allow(group::everybody(), "view", $root);
-    access::reset(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $root);
+    access::reset(Identity::everybody(), "view", $album);
     $album->reload();
-    $this->assert_true(access::group_can(group::everybody(), "view", $album));
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $album));
   }
 
   public function can_toggle_view_permissions_propagate_down_test() {
@@ -217,18 +217,18 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album3->reload();
     $album4->reload();
 
-    access::allow(group::everybody(), "view", $root);
-    access::deny(group::everybody(), "view", $album1);
-    access::reset(group::everybody(), "view", $album2);
-    access::reset(group::everybody(), "view", $album3);
-    access::reset(group::everybody(), "view", $album4);
+    access::allow(Identity::everybody(), "view", $root);
+    access::deny(Identity::everybody(), "view", $album1);
+    access::reset(Identity::everybody(), "view", $album2);
+    access::reset(Identity::everybody(), "view", $album3);
+    access::reset(Identity::everybody(), "view", $album4);
 
     $album4->reload();
-    $this->assert_false(access::group_can(group::everybody(), "view", $album4));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $album4));
 
-    access::allow(group::everybody(), "view", $album1);
+    access::allow(Identity::everybody(), "view", $album1);
     $album4->reload();
-    $this->assert_true(access::group_can(group::everybody(), "view", $album4));
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $album4));
   }
 
   public function revoked_view_permissions_cant_be_allowed_lower_down_test() {
@@ -237,29 +237,29 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album2 = album::create($album1, rand(), "test album");
 
     $root->reload();
-    access::deny(group::everybody(), "view", $root);
-    access::allow(group::everybody(), "view", $album2);
+    access::deny(Identity::everybody(), "view", $root);
+    access::allow(Identity::everybody(), "view", $album2);
 
     $album1->reload();
-    $this->assert_false(access::group_can(group::everybody(), "view", $album1));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $album1));
 
     $album2->reload();
-    $this->assert_false(access::group_can(group::everybody(), "view", $album2));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $album2));
   }
 
   public function can_edit_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(group::everybody(), "edit", $root);
-    $this->assert_true(access::group_can(group::everybody(), "edit", $root));
+    access::allow(Identity::everybody(), "edit", $root);
+    $this->assert_true(access::group_can(Identity::everybody(), "edit", $root));
   }
 
   public function non_view_permissions_propagate_down_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
 
-    access::allow(group::everybody(), "edit", $root);
-    access::reset(group::everybody(), "edit", $album);
-    $this->assert_true(access::group_can(group::everybody(), "edit", $album));
+    access::allow(Identity::everybody(), "edit", $root);
+    access::reset(Identity::everybody(), "edit", $album);
+    $this->assert_true(access::group_can(Identity::everybody(), "edit", $album));
   }
 
   public function non_view_permissions_can_be_revoked_lower_down_test() {
@@ -279,36 +279,36 @@ class Access_Helper_Test extends Unit_Test_Case {
     $outer->reload();
     $inner->reload();
 
-    access::allow(group::everybody(), "edit", $root);
-    access::deny(group::everybody(), "edit", $outer);
-    access::allow(group::everybody(), "edit", $inner);
+    access::allow(Identity::everybody(), "edit", $root);
+    access::deny(Identity::everybody(), "edit", $outer);
+    access::allow(Identity::everybody(), "edit", $inner);
 
     // Outer album is not editable, inner one is.
-    $this->assert_false(access::group_can(group::everybody(), "edit", $outer_photo));
-    $this->assert_true(access::group_can(group::everybody(), "edit", $inner_photo));
+    $this->assert_false(access::group_can(Identity::everybody(), "edit", $outer_photo));
+    $this->assert_true(access::group_can(Identity::everybody(), "edit", $inner_photo));
   }
 
   public function i_can_edit_test() {
     // Create a new user that belongs to no groups
-    $user = user::create("access_test", "Access Test", "");
+    $user = Identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
     $user->save();
-    user::set_active($user);
+    Identity::set_active($user);
 
     // This user can't edit anything
     $root = ORM::factory("item", 1);
     $this->assert_false(access::can("edit", $root));
 
     // Now add them to a group that has edit permission
-    $group = group::create("access_test");
+    $group = Identity::create_group("access_test");
     $group->add($user);
     $group->save();
     access::allow($group, "edit", $root);
 
-    $user = user::lookup($user->id);  // reload() does not flush related columns
-    user::set_active($user);
+    $user = Identity::lookup_user($user->id);  // reload() does not flush related columns
+    Identity::set_active($user);
 
     // And verify that the user can edit.
     $this->assert_true(access::can("edit", $root));
@@ -320,16 +320,16 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
 
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
 
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
 
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
 
-    access::reset(group::everybody(), "view", $album);
+    access::reset(Identity::everybody(), "view", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
   }
 
@@ -341,44 +341,44 @@ class Access_Helper_Test extends Unit_Test_Case {
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::deny(group::everybody(), "view_full", $album);
+    access::deny(Identity::everybody(), "view_full", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::allow(group::everybody(), "view_full", $album);
+    access::allow(Identity::everybody(), "view_full", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::deny(group::everybody(), "view_full", $album);
+    access::deny(Identity::everybody(), "view_full", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::reset(group::everybody(), "view_full", $album);
+    access::reset(Identity::everybody(), "view_full", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
   }
 
   public function moved_items_inherit_new_permissions_test() {
-    user::set_active(user::lookup_by_name("admin"));
+    Identity::set_active(Identity::lookup_user_by_name("admin"));
 
     $root = ORM::factory("item", 1);
     $public_album = album::create($root, rand(), "public album");
     $public_photo = photo::create($public_album, MODPATH . "gallery/images/gallery.png", "", "");
-    access::allow(group::everybody(), "view", $public_album);
+    access::allow(Identity::everybody(), "view", $public_album);
 
     $root->reload();  // Account for MPTT changes
 
     $private_album = album::create($root, rand(), "private album");
-    access::deny(group::everybody(), "view", $private_album);
+    access::deny(Identity::everybody(), "view", $private_album);
     $private_photo = photo::create($private_album, MODPATH . "gallery/images/gallery.png", "", "");
 
     // Make sure that we now have a public photo and private photo.
-    $this->assert_true(access::group_can(group::everybody(), "view", $public_photo));
-    $this->assert_false(access::group_can(group::everybody(), "view", $private_photo));
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $public_photo));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $private_photo));
 
     // Swap the photos
     item::move($public_photo, $private_album);
@@ -394,7 +394,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     $public_photo->reload();
 
     // Make sure that the public_photo is now private, and the private_photo is now public.
-    $this->assert_false(access::group_can(group::everybody(), "view", $public_photo));
-    $this->assert_true(access::group_can(group::everybody(), "view", $private_photo));
+    $this->assert_false(access::group_can(Identity::everybody(), "view", $public_photo));
+    $this->assert_true(access::group_can(Identity::everybody(), "view", $private_photo));
   }
 }
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index d65946c7..046cb5ad 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -44,7 +44,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["direction"] = "ASC";
     $_POST["csrf"] = access::csrf_token();
     $_POST["_method"] = "put";
-    access::allow(group::everybody(), "edit", $root);
+    access::allow(Identity::everybody(), "edit", $root);
 
     ob_start();
     $controller->_update($this->_album);
@@ -68,7 +68,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
-    access::allow(group::everybody(), "edit", $root);
+    access::allow(Identity::everybody(), "edit", $root);
 
     try {
       $controller->_update($this->_album);
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 33fcdb73..d4cfebba 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -23,16 +23,16 @@ 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);
-    user::set_active(user::guest());
+    Identity::set_active(Identity::guest());
 
     // We can see the item when permissions are granted
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
       ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
 
     // We can't see the item when permissions are denied
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
       ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 0159b420..3f99e037 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", user::active(), "slug");
+      "test", "test", Identity::active(), "slug");
     $orig_name = $photo->name;
 
     $_POST["filename"] = "test.jpeg";
@@ -40,7 +40,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $_POST["description"] = "new description";
     $_POST["slug"] = "new-slug";
     $_POST["csrf"] = access::csrf_token();
-    access::allow(group::everybody(), "edit", $root);
+    access::allow(Identity::everybody(), "edit", $root);
 
     ob_start();
     $controller->_update($photo);
@@ -64,7 +64,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
-    access::allow(group::everybody(), "edit", $root);
+    access::allow(Identity::everybody(), "edit", $root);
 
     try {
       $controller->_update($photo);
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index 314a9923..bca29298 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 = user::active(); } catch (Exception $e) { } ?>
+    <? try { $user = Identity::active(); } 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/login.html.php b/modules/gallery/views/login.html.php
index 2d8119d0..6695d564 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -8,7 +8,7 @@
   </li>
   <? else: ?>
   <li class="first">
-    <? if (user::is_writable()): ?>
+    <? 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() .
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index d71ca719..6ed40571 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -36,7 +36,7 @@
     <li id="g-login-form">
       <?= $form ?>
     </li>
-    <? if (user::is_writable()): ?>
+    <? if (Identity::is_writable()): ?>
     <li>
       <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
     </li>
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>
 
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 150616ab..4c58bc29 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 = user::active();
+      $user = Identity::active();
     }
 
     return ORM::factory("subscription")
@@ -31,7 +31,7 @@ class notification {
 
   static function is_watching($item, $user=null) {
     if (empty($user)) {
-      $user = user::active();
+      $user = Identity::active();
     }
 
     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 = user::active();
+        $user = Identity::active();
       }
       $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 = user::active();
+        $user = Identity::active();
       }
 
       $subscription = ORM::factory("subscription")
@@ -79,7 +79,7 @@ class notification {
       $subscriber_ids[] = $subscriber->user_id;
     }
 
-    $users = user::get_user_list(array("in" => array("id", $subscriber_ids),
+    $users = Identity::get_user_list(array("in" => array("id", $subscriber_ids),
                                        "where" => array("email IS NOT" => null)));
 
     $subscribers = array();
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 06c5bc44..d519bdc4 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 (!user::active()->guest) {
+    if (!Identity::active()->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 069b5b77..86107714 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 (!user::active()->admin) {
-      foreach (user::group_ids() as $id) {
+    if (!Identity::active()->admin) {
+      foreach (Identity::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 9769cd6f..701c89fd 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 != user::active()->id) {
+    if (!$task->loaded || $task->owner_id != Identity::active()->id) {
       access::forbidden();
     }
 
@@ -207,7 +207,7 @@ class Server_Add_Controller extends Admin_Controller {
         $task->set("mode", "done");
       }
 
-      $owner_id = user::active()->id;
+      $owner_id = Identity::active()->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 4db83f74..76357871 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 && user::active()->admin && $item->is_album() && !empty($paths) &&
+    if ($item && Identity::active()->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 2ba2e167..cecb90b4 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 (user::active()->admin) {
+    if (Identity::active()->admin) {
       $theme->script("server_add.js");
     }
   }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 64f19ecd..3465c4b1 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -65,7 +65,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function delete_user($id) {
     access::verify_csrf();
 
-    if ($id == user::active()->id || $id == user::guest()->id) {
+    if ($id == Identity::active()->id || $id == user::guest()->id) {
       access::forbidden();
     }
 
@@ -132,7 +132,7 @@ class Admin_Users_Controller extends Admin_Controller {
       }
 
       // An admin can change the admin status for any user but themselves
-      if ($user->id != user::active()->id) {
+      if ($user->id != Identity::active()->id) {
         $user->admin = $form->edit_user->admin->checked;
       }
       $user->save();
@@ -154,7 +154,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 == user::active()->id) {
+    if ($user->id == Identity::active()->id) {
       $form->edit_user->admin->disabled(1);
     }
     print $form;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 7c2e7833..6e666ba3 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 != user::active()->id) {
+    if ($user->guest || $user->id != Identity::active()->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 != user::active()->id) {
+    if ($user->guest || $user->id != Identity::active()->id) {
       access::forbidden();
     }
 
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
new file mode 100644
index 00000000..295e5f50
--- /dev/null
+++ b/modules/user/helpers/group.php
@@ -0,0 +1,79 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling groups.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class group_Core {
+  /**
+   * @see Identity_Driver::create.
+   */
+  static function create($name) {
+    return Identity::instance()->create_group($name);
+  }
+
+  /**
+   * @see Identity_Driver::everbody.
+   */
+  static function everybody() {
+    return Identity::instance()->everybody();
+  }
+
+  /**
+   * @see Identity_Driver::registered_users.
+   */
+  static function registered_users() {
+    return Identity::instance()->everybody();
+  }
+
+  /**
+   * Look up a group by id.
+   * @param integer      $id the user id
+   * @return Group_Definition  the group object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return Identity::instance()->lookup_group_by_field("id", $id);
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Definition  the group object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return Identity::instance()->lookup_group_by_field("name", $name);
+  }
+
+  /**
+   * @see Identity_Driver::get_group_list.
+   */
+  static function get_group_list($filter=array()) {
+    return Identity::instance()->get_group_list($filter);
+  }
+
+  /**
+   * @see Identity_Driver::get_edit_rules.
+   */
+  static function get_edit_rules() {
+    return Identity::instance()->get_edit_rules("group");
+  }
+}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
new file mode 100644
index 00000000..394f8185
--- /dev/null
+++ b/modules/user/helpers/user.php
@@ -0,0 +1,109 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling users.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class user_Core {
+  /**
+   * @see Identity_Driver::guest.
+   */
+  static function guest() {
+    return Identity::guest();
+  }
+
+  /**
+   * @see Identity_Driver::create_user.
+   */
+  static function create($name, $full_name, $password) {
+    return Identity::create_user($name, $full_name, $password);
+  }
+
+  /**
+   * @see Identity_Driver::is_correct_password.
+   */
+  static function is_correct_password($user, $password) {
+    return Identity::is_correct_password($user, $password);
+  }
+
+  /**
+   * @see Identity_Driver::hash_password.
+   */
+  static function hash_password($password) {
+    return Identity::hash_password($password);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Definition  the user object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return self::_lookup_user_by_field("id", $id);
+  }
+
+  /**
+   * Look up a user by name.
+   * @param integer      $name the user name
+   * @return User_Definition  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return self::_lookup_user_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by hash.
+   * @param string       $name the user name
+   * @return User_Definition  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_hash($hash) {
+    return self::_lookup_user_by_field("hash", $hash);
+  }
+
+  /**
+   * @see Identity_Driver::get_user_list.
+   */
+  static function get_user_list($filter=array()) {
+    return Identity::get_user_list($filter);
+  }
+
+  /**
+   * @see Identity_Driver::get_edit_rules.
+   */
+  static function get_edit_rules() {
+    return Identity::get_edit_rules("user");
+  }
+
+  private static function _lookup_user_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("user", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a29f24b1..400686cc 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 (user::active()->id != $user->id && !$user->guest): ?>
+          <? if (Identity::active()->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 bc241e44c2e4d10ac19ccc32a40c90426672d963 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 16 Oct 2009 07:41:33 -0700
Subject: Cleanup merge of user/group helpers into Identity interface.  Reduce
 redundant code in the user module and remove references to the Identity
 helper from the user module as the user module should be able to access
 things directly. Simplify the get_user_list api method to just accept an
 array of ids to return user objects for.

---
 modules/gallery/helpers/movie.php                  |   2 +-
 modules/gallery/helpers/photo.php                  |   2 +-
 modules/gallery/libraries/Identity.php             |  18 +--
 modules/gallery/libraries/drivers/Identity.php     |  41 +------
 modules/notification/helpers/notification.php      |   8 +-
 modules/user/controllers/admin_users.php           |  18 +--
 modules/user/controllers/users.php                 |   2 +-
 modules/user/helpers/group.php                     |  34 ++++--
 modules/user/helpers/user.php                      |  56 ++++------
 .../user/libraries/drivers/Identity/Gallery.php    | 124 +++++----------------
 modules/user/models/user.php                       |  19 ++++
 11 files changed, 113 insertions(+), 211 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 32a27646..bc0efa01 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();
+    $movie->owner_id = $owner_id ? $owner_id : Identity::active()->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 cf316819..ad23e322 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();
+    $photo->owner_id = $owner_id ? $owner_id : Identity::active()->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/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 229d0da9..fb553de6 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -191,22 +191,8 @@ class Identity_Core {
   /**
    * @see Identity_Driver::get_user_list.
    */
-  static function get_user_list($filter=array()) {
-    return self::instance()->driver->get_user_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_group_list.
-   */
-  static function get_group_list($filter=array()) {
-    return self::instance()->driver->get_group_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  static function get_edit_rules($object_type) {
-    return self::instance()->driver->get_edit_rules($object_type);
+  static function get_user_list($ids) {
+    return self::instance()->driver->get_user_list($ids);
   }
 
   static function get_login_form($url) {
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 0b789908..a9e1a75b 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -83,37 +83,11 @@ interface Identity_Driver {
 
   /**
    * List the users
-   * @param mixed      options to apply to the selection of the user
-   *                   currently supported:
-   *                     "orderby" => array(<field name>, "ASC|DESC")
-   *                     "in" => array(<field name>, array(values, ...))
-   *                     "where" => array(<field name>, value)
-   *                        <field name> follows Kohana syntax where it could contain the first
-   *                                     half of a logical expression (i.e. "field IS NOT")
-   * @return array     the group list.
+   * @param array      array of ids to return the user objects for
+   * @return array     the user list.
    */
-  public function get_user_list($filter=array());
+  public function get_user_list($ids);
 
-  /**
-   * List the groups
-   * @param mixed      options to apply to the selection of the group
-   *                   currently supported:
-   *                     "orderby" => array(<field name>, "ASC|DESC")
-   *                     "in" => array(<field name>, array(values, ...))
-   *                     "where" => array(<field name>, value)
-   *                        <field name> follows Kohana syntax where it could contain the first
-   *                                     half of a logical expression (i.e. "field IS NOT")
-   * @return array     the group list.
-   */
-  public function get_group_list($filter=array());
-
-  /**
-   * Return the edit rules associated with an group.
-   *
-   * @param  string   $object_type to return rules for ("user"|"group")
-   * @return stdClass containing the rules
-   */
-  public function get_edit_rules($object_type);
 } // End Identity Driver Definition
 
 /**
@@ -205,19 +179,14 @@ abstract class User_Definition {
    * @param integer $size the target size of the image (default 80px)
    * @return string a url
    */
-  public function avatar_url($size=80, $default=null) {
-    return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
-                   md5($this->user->email), $size, $default ? "&d=" . urlencode($default) : "");
-  }
+  abstract public function avatar_url($size=80, $default=null);
 
   /**
    * Return the best version of the user's name.  Either their specified full name, or fall back
    * to the user name.
    * @return string
    */
-  public function display_name() {
-    return empty($this->user->full_name) ? $this->user->name : $this->user->full_name;
-  }
+  abstract public function display_name();
 
   /**
    * Return the internal user object without the wrapper.
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 4c58bc29..2e22eeae 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -67,8 +67,7 @@ class notification {
   }
 
   static function get_subscribers($item) {
-    // @todo only return distinct email addresses
-    $subscriber_ids = array();
+   $subscriber_ids = array();
     foreach (ORM::factory("subscription")
              ->select("user_id")
              ->join("items", "subscriptions.item_id", "items.id")
@@ -79,12 +78,11 @@ class notification {
       $subscriber_ids[] = $subscriber->user_id;
     }
 
-    $users = Identity::get_user_list(array("in" => array("id", $subscriber_ids),
-                                       "where" => array("email IS NOT" => null)));
+    $users = Identity::get_user_list($subscriber_ids);
 
     $subscribers = array();
     foreach ($users as $user) {
-      if (access::user_can($user, "view", $item)) {
+      if (access::user_can($user, "view", $item) && !empty($user->email)) {
         $subscribers[$user->email] = 1;
       }
     }
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 3465c4b1..fed872a5 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,8 +21,12 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC")));
-    $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC")));
+    $view->content->users = ORM::factory("user")
+      ->orderby("name", "ASC")
+      ->find_all();
+    $view->content->groups = ORM::factory("group")
+      ->orderby("name", "ASC")
+      ->find_all();
     print $view;
   }
 
@@ -303,7 +307,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
-    $form->add_rules_from(user::get_edit_rules());
+    $form->add_rules_from($user);
     $form->edit_user->password->rules("-required");
 
     module::event("user_edit_form_admin", $user, $form);
@@ -325,8 +329,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->input("url")->label(t("URL"))->id("g-url");
     self::_add_locale_dropdown($group);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
-    $user = ORM::factory("user");
-    $form->add_rules_from(user::get_edit_rules());
+    $form->add_rules_from(ORM::factory("user"));
 
     module::event("user_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
@@ -366,7 +369,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Save"));
-    $form->add_rules_from(group::get_edit_rules());
+    $form->add_rules_from($group);
     return $form;
   }
 
@@ -378,8 +381,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
     $form_group->submit("")->value(t("Add Group"));
-    $group = ORM::factory("group");
-    $form->add_rules_from(group::get_edit_rules());
+    $form->add_rules_from(ORM::factory("group"));
     return $form;
   }
 
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 6e666ba3..ebce1d8d 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -77,7 +77,7 @@ class Users_Controller extends Controller {
       ->matches($group->password);
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
-    $form->add_rules_from(user::get_edit_rules());
+    $form->add_rules_from($user);
 
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 295e5f50..cf5c050f 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -28,7 +28,14 @@ class group_Core {
    * @see Identity_Driver::create.
    */
   static function create($name) {
-    return Identity::instance()->create_group($name);
+    $group = ORM::factory("group")->where("name", $name)->find();
+    if ($group->loaded) {
+      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
+    }
+
+    $group->name = $name;
+    $group->save();
+    return $group;
   }
 
   /**
@@ -51,7 +58,7 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return Identity::instance()->lookup_group_by_field("id", $id);
+    return self::lookup_by_field("id", $id);
   }
 
   /**
@@ -60,20 +67,23 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return Identity::instance()->lookup_group_by_field("name", $name);
+    return self::lookup_by_field("name", $name);
   }
 
   /**
    * @see Identity_Driver::get_group_list.
    */
-  static function get_group_list($filter=array()) {
-    return Identity::instance()->get_group_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  static function get_edit_rules() {
-    return Identity::instance()->get_edit_rules("group");
+  static function lookup_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("group", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
   }
 }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 394f8185..fa7b320f 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -28,28 +28,37 @@ class user_Core {
    * @see Identity_Driver::guest.
    */
   static function guest() {
-    return Identity::guest();
+    return model_cache::get("user", 1);
   }
 
   /**
    * @see Identity_Driver::create_user.
    */
   static function create($name, $full_name, $password) {
-    return Identity::create_user($name, $full_name, $password);
-  }
+    $user = ORM::factory("user")->where("name", $name)->find();
+    if ($user->loaded) {
+      throw new Exception("@todo USER_ALREADY_EXISTS $name");
+    }
 
-  /**
-   * @see Identity_Driver::is_correct_password.
-   */
-  static function is_correct_password($user, $password) {
-    return Identity::is_correct_password($user, $password);
+    $user->name = $name;
+    $user->full_name = $full_name;
+    $user->password = $password;
+
+    // Required groups
+    $user->add(group::everybody());
+    $user->add(group::registered_users());
+
+    $user->save();
+    return $user;
   }
 
   /**
    * @see Identity_Driver::hash_password.
    */
   static function hash_password($password) {
-    return Identity::hash_password($password);
+    require_once(MODPATH . "user/lib/PasswordHash.php");
+    $hashGenerator = new PasswordHash(10, true);
+    return $hashGenerator->HashPassword($password);
   }
 
   /**
@@ -58,7 +67,7 @@ class user_Core {
    * @return User_Definition  the user object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return self::_lookup_user_by_field("id", $id);
+    return self::lookup_by_field("id", $id);
   }
 
   /**
@@ -67,33 +76,10 @@ class user_Core {
    * @return User_Definition  the user object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return self::_lookup_user_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by hash.
-   * @param string       $name the user name
-   * @return User_Definition  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_hash($hash) {
-    return self::_lookup_user_by_field("hash", $hash);
-  }
-
-  /**
-   * @see Identity_Driver::get_user_list.
-   */
-  static function get_user_list($filter=array()) {
-    return Identity::get_user_list($filter);
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  static function get_edit_rules() {
-    return Identity::get_edit_rules("user");
+    return self::lookup_by_field("name", $name);
   }
 
-  private static function _lookup_user_by_field($field_name, $value) {
+  static function lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("user", $value, $field_name);
       if ($user->loaded) {
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 013497b6..77db11a3 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -25,28 +25,14 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @see Identity_Driver::guest.
    */
   public function guest() {
-    return new Gallery_User(model_cache::get("user", 1));
+    return new Gallery_User(user::guest());
   }
 
   /**
    * @see Identity_Driver::create_user.
    */
   public function create_user($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
-      throw new Exception("@todo USER_ALREADY_EXISTS $name");
-    }
-
-    $user->name = $name;
-    $user->full_name = $full_name;
-    $user->password = $password;
-
-    // Required groups
-    $user->add($this->everybody()->_uncloaked());
-    $user->add($this->registered_users()->_uncloaked());
-
-    $user->save();
-    return new Gallery_User($user);
+    return new Gallery_User(user::create($name, $full_name, $password));
   }
 
   /**
@@ -84,126 +70,58 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @see Identity_Driver::hash_password.
    */
   public function hash_password($password) {
-    require_once(MODPATH . "user/lib/PasswordHash.php");
-    $hashGenerator = new PasswordHash(10, true);
-    return $hashGenerator->HashPassword($password);
+    return user::hash_password($password);
   }
 
   /**
    * @see Identity_Driver::lookup_user_by_field.
    */
   public function lookup_user_by_field($field_name, $value) {
-    try {
-      $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
-        return new Gallery_User($user);
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
+    return new Gallery_User(user::lookup_by_field($field_name, $value));
   }
 
   /**
    * @see Identity_Driver::create_group.
    */
   public function create_group($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
-      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
-    }
-
-    $group->name = $name;
-    $group->save();
-
-    return new Gallery_Group($group);
+    return new Gallery_Group(group::create($name));
   }
 
   /**
    * @see Identity_Driver::everybody.
    */
   public function everybody() {
-    return new Gallery_Group(model_cache::get("group", 1));
+    return new Gallery_Group(group::everybody());
   }
 
   /**
    * @see Identity_Driver::registered_users.
    */
   public function registered_users() {
-    return new Gallery_Group(model_cache::get("group", 2));
+    return new Gallery_Group(group::registered_users());
   }
 
   /**
    * @see Identity_Driver::lookup_group_by_field.
    */
   public function lookup_group_by_field($field_name, $value) {
-    try {
-      $group = model_cache::get("group", $value, $field_name);
-      if ($group->loaded) {
-        return new Gallery_Group($group);
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
+    return new Gallery_Group(group::lookup_by_field($field_name, $value));
   }
 
   /**
    * @see Identity_Driver::get_user_list.
    */
-  public function get_user_list($filter=array()) {
-    $results = $this->_do_search("user", $filter);
+  public function get_user_list($ids) {
+    $results = ORM::factory("user")
+      ->in("id", ids)
+      ->find_all()
+      ->as_array();;
     $users = array();
-    foreach ($results->as_array() as $user) {
+    foreach ($results as $user) {
       $users[] = new Gallery_User($user);
     }
     return $users;
   }
-
-  /**
-   * @see Identity_Driver::get_group_list.
-   */
-  public function get_group_list($filter=array()) {
-    $results = $this->_do_search("group", $filter);
-    $groups = array();
-    foreach ($results->as_array() as $group) {
-      $groups[] = new Gallery_Group($group);
-    }
-    return $groups;
-  }
-
-  /**
-   * @see Identity_Driver::get_edit_rules.
-   */
-  public function get_edit_rules($object_type) {
-    return (object)ORM::factory($object_type)->rules;
-  }
-
-  /**
-   * Build the query based on the supplied filters for the specified model.
-   * @param  string   $object_type to return rules for ("user"|"group")
-   * @param  mixed    $filters options to apply to the selection.
-   */
-  private function _do_search($object_type, $filter) {
-    $object = ORM::factory($object_type);
-
-    foreach ($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $object->in($args[0], $args[1]);
-        break;
-      default:
-        $object->$method($args);
-      }
-    }
-
-    return $object->find_all();
-  }
-
 } // End Identity Gallery Driver
 
 /**
@@ -217,6 +135,20 @@ class Gallery_User extends User_Definition {
     $this->user = $user;
   }
 
+  /**
+   * @see User_Definition::avatar_url
+   */
+  public function avatar_url($size=80, $default=null) {
+    return $this->user->avatar_url($size, $default);
+  }
+
+  /**
+   * @see User_Definition::display_name
+   */
+  public function display_name() {
+    return $this->user->display_name();
+  }
+
   public function save() {
     $this->user->save();
   }
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 1993bd05..d99603b2 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -51,6 +51,16 @@ class User_Model extends ORM {
     module::event("user_deleted", $old);
   }
 
+  /**
+   * Return a url to the user's avatar image.
+   * @param integer $size the target size of the image (default 80px)
+   * @return string a url
+   */
+  public function avatar_url($size=80, $default=null) {
+    return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
+                   md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
+  }
+
   public function save() {
     if (!$this->loaded) {
         $created = 1;
@@ -63,4 +73,13 @@ class User_Model extends ORM {
     }
     return $this;
   }
+
+  /**
+   * Return the best version of the user's name.  Either their specified full name, or fall back
+   * to the user name.
+   * @return string
+   */
+  public function display_name() {
+    return empty($this->full_name) ? $this->name : $this->full_name;
+  }
 }
-- 
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/user')

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 ad0497a8d2956a73d174445a30d9190b1f970caf Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 17 Oct 2009 12:58:31 -0600
Subject: Drop our g-clearfix in favor of using jQuery UI's ui-helper-clearfix.

---
 lib/gallery.common.css                        | 13 -------------
 modules/comment/views/admin_comments.html.php |  2 +-
 modules/gallery/views/admin_themes.html.php   |  8 ++++----
 modules/user/views/admin_users.html.php       |  2 +-
 themes/admin_wind/css/fix-ie.css              |  2 +-
 themes/admin_wind/views/admin.html.php        |  2 +-
 themes/night_wind/css/fix-ie.css              |  2 +-
 themes/night_wind/views/album.html.php        |  2 +-
 themes/night_wind/views/page.html.php         |  2 +-
 themes/night_wind/views/pager.html.php        |  2 +-
 themes/night_wind/views/photo.html.php        |  2 +-
 themes/night_wind/views/sidebar.html.php      |  2 +-
 themes/wind/css/fix-ie.css                    |  2 +-
 themes/wind/views/album.html.php              |  2 +-
 themes/wind/views/page.html.php               |  2 +-
 themes/wind/views/pager.html.php              |  2 +-
 themes/wind/views/photo.html.php              |  2 +-
 themes/wind/views/sidebar.html.php            |  2 +-
 18 files changed, 20 insertions(+), 33 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 23262087..74a9642f 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -7,7 +7,6 @@
  *  3)  States and interactions
  *  4)  Positioning and order
  *  5)  Containers/widgets
- *  6)  Browser hacks
  */
 
 /** *******************************************************************
@@ -325,15 +324,3 @@ form .g-error {
 #g-dialog .g-cancel {
   margin: .4em 1em;
 }
-
-/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-.g-clearfix:after {
-  clear: both;
-  content: ".";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index e32a843f..8f719f05 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -38,7 +38,7 @@
   <h1> <?= t("Manage Comments") ?> </h1>
 
   <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu" class="g-clearfix">
+  <div id="g-admin-comments-menu" class="ui-helper-clearfix">
     <?= $menu ?>
   </div>
 
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index a75d9f04..f7e77a01 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -14,7 +14,7 @@
 
 <div id="g-site-theme">
   <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected g-clearfix">
+  <div class="g-block g-selected ui-helper-clearfix">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
@@ -29,7 +29,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
-    <div class="g-block g-clearfix">
+    <div class="g-block ui-helper-clearfix">
       <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
@@ -52,7 +52,7 @@
 
 <div id="g-admin-theme">
   <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected g-clearfix">
+  <div class="g-block g-selected ui-helper-clearfix">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
@@ -67,7 +67,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
-    <div class="g-block g-clearfix">
+    <div class="g-block ui-helper-clearfix">
       <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a127bc15..2f8d8673 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -103,7 +103,7 @@
   </div>
 </div>
 
-<div id="g-group-admin" class="g-block g-clearfix">
+<div id="g-group-admin" class="g-block ui-helper-clearfix">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css
index 106fe4a1..fe6e32ab 100644
--- a/themes/admin_wind/css/fix-ie.css
+++ b/themes/admin_wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6 and 7
  */
 
-.g-clearfix,
+.ui-helper-clearfix,
 #g-group-admin,
 #g-developer-tools {
   zoom: 1;
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 4ee08d95..b788eb93 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -50,7 +50,7 @@
         <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
-        <div id="g-site-admin-menu" class="g-clearfix">
+        <div id="g-site-admin-menu" class="ui-helper-clearfix">
           <?= $theme->admin_menu() ?>
         </div>
         <?= $theme->admin_header_bottom() ?>
diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css
index 60abc08d..c32d2cab 100644
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
+.ui-helper-clearfix {
   zoom: 1;
 }
 
diff --git a/themes/night_wind/views/album.html.php b/themes/night_wind/views/album.html.php
index 91646b1e..1163630d 100644
--- a/themes/night_wind/views/album.html.php
+++ b/themes/night_wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid" class="g-clearfix">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index fab4ba9e..c8b08129 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header" class="g-clearfix">
+      <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php
index 2075fd95..337d658f 100644
--- a/themes/night_wind/views/pager.html.php
+++ b/themes/night_wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager g-clearfix">
+<ul class="g-pager ui-helper-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php
index c9c30017..b33e2afa 100644
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager g-clearfix">
+  <ul class="g-pager ui-helper-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
diff --git a/themes/night_wind/views/sidebar.html.php b/themes/night_wind/views/sidebar.html.php
index 151c6365..cd50fc01 100644
--- a/themes/night_wind/views/sidebar.html.php
+++ b/themes/night_wind/views/sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
-<div id="g-view-menu" class="g-buttonset g-clearfix">
+<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
   <? if ($page_type == "album"):?>
     <?= $theme->album_menu() ?>
   <? elseif ($page_type == "photo") : ?>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 60abc08d..c32d2cab 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
+.ui-helper-clearfix {
   zoom: 1;
 }
 
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 91646b1e..1163630d 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid" class="g-clearfix">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index fab4ba9e..c8b08129 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header" class="g-clearfix">
+      <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 2075fd95..337d658f 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager g-clearfix">
+<ul class="g-pager ui-helper-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index c9c30017..b33e2afa 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager g-clearfix">
+  <ul class="g-pager ui-helper-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
index 151c6365..cd50fc01 100644
--- a/themes/wind/views/sidebar.html.php
+++ b/themes/wind/views/sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
-<div id="g-view-menu" class="g-buttonset g-clearfix">
+<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
   <? if ($page_type == "album"):?>
     <?= $theme->album_menu() ?>
   <? elseif ($page_type == "photo") : ?>
-- 
cgit v1.2.3


From 6d5c12e13e6f1199a96180e69cac69d77ecbbcc2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 17 Oct 2009 10:36:50 -0700
Subject: Move the default identity config into the users module and change the
 Identity constructor to look in module::get_var(gallery, identity_provider)
 for the current identity driver. In addition, don't just arbitrarily lock the
 use module.  Only lock gallery and the module that is referenced by
 "user_driver_module" variable.

---
 modules/gallery/config/identity.php    | 37 -------------------
 modules/gallery/helpers/module.php     |  3 +-
 modules/gallery/libraries/Identity.php | 66 ++++++++++++++--------------------
 modules/user/config/identity.php       | 37 +++++++++++++++++++
 4 files changed, 65 insertions(+), 78 deletions(-)
 delete mode 100644 modules/gallery/config/identity.php
 create mode 100644 modules/user/config/identity.php

(limited to 'modules/user')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
deleted file mode 100644
index 0479d08b..00000000
--- a/modules/gallery/config/identity.php
+++ /dev/null
@@ -1,37 +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.
- */
-/*
- * @package  Identity
- *
- * User settings, defined as arrays, or "groups". If no group name is
- * used when loading the cache library, the group named "default" will be used.
- *
- * Each group can be used independently, and multiple groups can be used at once.
- *
- * Group Options:
- *  driver   - User backend driver. Gallery comes with Gallery user driver.
- *
- *  params   - Driver parameters, specific to each driver.
- */
-$config["default"] = array (
-  "driver"   => "gallery",
-  "allow_updates" => true,
-  "params"   => array(),
-);
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index fe37f4f9..eab94500 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -90,7 +90,8 @@ class module_Core {
 
       // Lock certain modules
       $modules->gallery->locked = true;
-      $modules->user->locked = true;
+      $identity_module = self::get_var("gallery", "identity_provider", "user");
+      $modules->$identity_module->locked = true;
       $modules->ksort();
       self::$available = $modules;
     }
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index f844cf8f..9eb4b83b 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -49,49 +49,35 @@ class Identity_Core {
   /**
    * Loads the configured driver and validates it.
    *
-   * @param   array|string  custom configuration or config group name
    * @return  void
    */
-  public function __construct($config="default") {
-    if (is_string($config)) {
-      $name = $config;
-
-      // Test the config group name
-      if (($config = Kohana::config("identity.".$config)) === NULL) {
-        throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
-      }
-
-      if (is_array($config)) {
-        // Append the default configuration options
-        $config += Kohana::config("identity.default");
-      } else {
-        // Load the default group
-        $config = Kohana::config("identity.default");
-      }
-
-      // Cache the config in the object
-      $this->config = $config;
-
-      // Set driver name
-      $driver = "Identity_".ucfirst($this->config["driver"])."_Driver";
-
-      // Load the driver
-      if ( ! Kohana::auto_load($driver)) {
-        throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
-                                   get_class($this));
-      }
-
-      // Initialize the driver
-      $this->driver = new $driver($this->config["params"]);
-
-      // Validate the driver
-      if ( !($this->driver instanceof Identity_Driver)) {
-        throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
-                                   get_class($this), "Identity_Driver");
-      }
-
-      Kohana::log("debug", "Identity Library initialized");
+  public function __construct() {
+    $name = $config = module::get_var("gallery", "identity_provider", "user");
+
+    // Test the config group name
+    if (($this->config = Kohana::config("identity.".$config)) === NULL) {
+      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
+    }
+
+    // Set driver name
+    $driver = "Identity_".ucfirst($this->config["driver"])."_Driver";
+
+    // Load the driver
+    if ( ! Kohana::auto_load($driver)) {
+      throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
+                                 get_class($this));
     }
+
+    // Initialize the driver
+    $this->driver = new $driver($this->config["params"]);
+
+    // Validate the driver
+    if ( !($this->driver instanceof Identity_Driver)) {
+      throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
+                                 get_class($this), "Identity_Driver");
+    }
+
+    Kohana::log("debug", "Identity Library initialized");
   }
 
   /**
diff --git a/modules/user/config/identity.php b/modules/user/config/identity.php
new file mode 100644
index 00000000..f9f013aa
--- /dev/null
+++ b/modules/user/config/identity.php
@@ -0,0 +1,37 @@
+<?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.
+ */
+/*
+ * @package  Identity
+ *
+ * User settings, defined as arrays, or "groups". If no group name is
+ * used when loading the cache library, the group named "default" will be used.
+ *
+ * Each group can be used independently, and multiple groups can be used at once.
+ *
+ * Group Options:
+ *  driver        - User backend driver. Gallery comes with Gallery user driver.
+ *  allow_updates - Flag to indicate that the back end allows updates.
+ *  params        - Driver parameters, specific to each driver.
+ */
+$config["user"] = array (
+  "driver"        => "gallery",
+  "allow_updates" => true,
+  "params"        => array(),
+);
-- 
cgit v1.2.3


From c9a030dd08711f89a985504ce26378a315d7ff1f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 18 Oct 2009 09:21:34 -0700
Subject: Add a menu item to manage the Identity drivers if there is more than
 one installed

---
 modules/gallery/helpers/gallery_event.php | 18 +++++++++++++-----
 modules/gallery/libraries/Identity.php    | 22 ++++++++++++++++++++++
 modules/user/helpers/user_event.php       | 15 ++++++++++-----
 3 files changed, 45 insertions(+), 10 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index a6aa0657..84b84f7d 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -190,11 +190,19 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->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")))
+                        ->url(url::site("admin/sidebar"))));
+    if (count(Identity::active()) > 1) {
+      $menu
+        ->append(Menu::factory("submenu")
+                 ->id("identity_menu")
+                 ->label(t("Identity Management"))
+                 ->append(Menu::factory("link")
+                          ->id("identity_drivers")
+                          ->label(t("Identity Drivers"))
+                          ->url(url::site("admin/identity"))));
+    }
+
+    $menu
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 9eb4b83b..9e5f0bb5 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -24,6 +24,8 @@
 class Identity_Core {
   protected static $instance;
 
+  protected static $active;
+
   // Configuration
   protected $config;
 
@@ -80,6 +82,26 @@ class Identity_Core {
     Kohana::log("debug", "Identity Library initialized");
   }
 
+  /**
+   * Return a list of installed and activated Identity Drivers.
+   *
+   * @return boolean true if the driver supports updates; false if read only
+   */
+  static function active() {
+    if (empty(self::$active)) {
+      $drivers = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+      foreach (module::active() as $module) {
+        $module_name = $module->name;
+        if (file_exists(MODPATH . "{$module->name}/config/identity.php") &&
+            ($info = module::info($module_name))) {
+          $drivers->$module_name = $info->description;
+        }
+      }
+      self::$active = $drivers;
+    }
+    return self::$active;
+  }
+
   /**
    * Determine if if the current driver supports updates.
    *
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 78b009eb..00ccbb29 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,11 +20,16 @@
 
 class user_event_Core {
   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")));
+    $user_group_menu = Menu::factory("link")
+      ->id("users_groups")
+      ->label(t("Users/Groups"))
+      ->url(url::site("admin/users"));
+    $identity_menu = $menu->get("identity_menu");
+    if (empty($identity_menu)) {
+      $menu->add_after("appearance_menu", $user_group_menu);
+    }else {
+      $identity_menu->append($user_group_menu);
+    }
     return $menu;
   }
 }
-- 
cgit v1.2.3


From 5f56cbf997c12ab1aaf14403873fd9dfc33690ef Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 20:22:10 -0600
Subject: Wrap all admin views in g-block and g-block content. This provides
 the means to visually separate the view's title and description from
 everything else. Primary admin view title should always be h1, and only one
 h1 per view. Removed some unused admin CSS id's.

---
 lib/gallery.common.css                             |   5 +
 modules/akismet/views/admin_akismet.html.php       |  15 +-
 modules/comment/views/admin_comments.html.php      | 305 ++++++++---------
 modules/digibug/views/admin_digibug.html.php       |  10 +-
 modules/g2_import/views/admin_g2_import.html.php   | 142 ++++----
 modules/gallery/controllers/admin_languages.php    |   3 +-
 modules/gallery/views/admin_graphics.html.php      |  30 +-
 modules/gallery/views/admin_languages.html.php     | 187 ++++++-----
 modules/gallery/views/admin_maintenance.html.php   | 368 +++++++++++----------
 modules/gallery/views/admin_modules.html.php       |  52 +--
 modules/gallery/views/admin_sidebar.html.php       |  43 +--
 modules/gallery/views/admin_theme_options.html.php |   4 +-
 modules/gallery/views/admin_themes.html.php        | 139 ++++----
 modules/recaptcha/views/admin_recaptcha.html.php   |  44 +--
 modules/server_add/views/admin_server_add.html.php |  21 +-
 modules/tag/js/tag.js                              |   4 +-
 modules/tag/views/admin_tags.html.php              |  83 ++---
 modules/user/views/admin_users.html.php            | 159 ++++-----
 modules/watermark/views/admin_watermarks.html.php  |  58 ++--
 themes/admin_wind/css/screen.css                   |  67 +---
 20 files changed, 871 insertions(+), 868 deletions(-)

(limited to 'modules/user')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index c574279c..a700c359 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -31,9 +31,11 @@
  **********************************************************************/
 
 .g-narrow {
+  width: 25%;
 }
 
 .g-wide {
+  width: 100%;
 }
 
 /** *******************************************************************
@@ -107,9 +109,12 @@ form .g-error {
 }
 
 .g-installed {
+  background-color: #eeeeee;
 }
 
 .g-default {
+	background-color: #c5dbec;
+	font-weight: bold;
 }
 
 .g-draggable,
diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 22c60c97..d273be5b 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -1,17 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-akismet">
+<div id="g-admin-akismet" class="g-block">
   <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",
               "akismet_url" => "http://akismet.com")) ?>
   </p>
+  <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!") ?>
+    </div>
+    <? endif ?>
 
-  <? if ($valid_key): ?>
-  <div class="g-module-status g-success">
-    <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
+    <?= $form ?>
   </div>
-  <? endif ?>
-
-  <?= $form ?>
 </div>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 8f719f05..82e071a8 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -34,165 +34,168 @@
   }
 </script>
 
-<div id="g-admin-comments">
+<div id="g-admin-comments" class="g-block">
   <h1> <?= t("Manage Comments") ?> </h1>
 
-  <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu" class="ui-helper-clearfix">
-    <?= $menu ?>
-  </div>
+  <div class="g-block-content">
+    <!-- @todo: Highlight active menu option -->
+    <div id="g-admin-comments-menu" class="ui-helper-clearfix">
+      <?= $menu ?>
+    </div>
 
-  <!-- @todo: Remove after setting active option? -->
-  <h2>
-    <? if ($state == "published"): ?>
-    <?= t("Approved Comments") ?>
-    <? elseif ($state == "unpublished"): ?>
-    <?= t("Comments Awaiting Moderation") ?>
-    <? elseif ($state == "spam"): ?>
-    <?= t("Spam Comments") ?>
-    <? elseif ($state == "deleted"): ?>
-    <?= t("Recently Deleted Comments") ?>
-    <? endif ?>
-  </h2>
+    <!-- @todo: Remove after setting active option? -->
+    <h2>
+      <? if ($state == "published"): ?>
+      <?= t("Approved Comments") ?>
+      <? elseif ($state == "unpublished"): ?>
+      <?= t("Comments Awaiting Moderation") ?>
+      <? elseif ($state == "spam"): ?>
+      <?= t("Spam Comments") ?>
+      <? elseif ($state == "deleted"): ?>
+      <?= t("Recently Deleted Comments") ?>
+      <? endif ?>
+    </h2>
 
-  <? if ($state == "spam"): ?>
-  <div>
-    <? $spam_caught = module::get_var("comment", "spam_caught") ?>
-    <? if ($spam_caught > 0): ?>
-    <p>
-      <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
-             "Gallery has caught %count spam for you since you installed spam filtering.",
-             $spam_caught) ?>
-    </p>
-    <? endif ?>
-    <p>
-      <? if ($counts->spam): ?>
-      <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
-             "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
-             $counts->spam) ?>
-    </p>
-    <p>
-      <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
-        <?= t("Delete all spam") ?>
-      </a>
-      <? else: ?>
-      <?= t("Your spam queue is empty!") ?>
+    <? if ($state == "spam"): ?>
+    <div>
+      <? $spam_caught = module::get_var("comment", "spam_caught") ?>
+      <? if ($spam_caught > 0): ?>
+      <p>
+        <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
+               "Gallery has caught %count spam for you since you installed spam filtering.",
+               $spam_caught) ?>
+      </p>
       <? endif ?>
-    </p>
-  </div>
-  <? endif ?>
+      <p>
+        <? if ($counts->spam): ?>
+        <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
+               "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
+               $counts->spam) ?>
+      </p>
+      <p>
+        <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
+          <?= t("Delete all spam") ?>
+        </a>
+        <? else: ?>
+        <?= t("Your spam queue is empty!") ?>
+        <? endif ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <? if ($state == "deleted"): ?>
-  <div>
-    <p>
-      <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
-    </p>
-  </div>
-  <? endif ?>
+    <? if ($state == "deleted"): ?>
+    <div>
+      <p>
+        <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <table id="g-admin-comments-list">
-    <tr>
-      <th>
-        <?= t("Author") ?>
-      </th>
-      <th>
-        <?= t("Comment") ?>
-      </th>
-      <th>
-        <?= t("Actions") ?>
-      </th>
-    </tr>
-    <? foreach ($comments as $i => $comment): ?>
-    <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
-      <td>
-        <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-               class="g-avatar"
-               alt="<?= html::clean_attribute($comment->author_name()) ?>"
-               width="40"
-               height="40" />
-        </a>
-        <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
-              title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
-      </td>
-      <td>
-        <div class="g-right">
-          <? $item = $comment->item() ?>
-          <div class="g-item g-photo">
-            <a href="<?= $item->url() ?>">
-              <? if ($item->has_thumb()): ?>
-              <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= html::purify($item->title)->for_html_attr() ?>"
-                 <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
-              />
-              <? else: ?>
-              <?= t("No thumbnail") ?>
-              <? endif ?>
-            </a>
+    <table id="g-admin-comments-list">
+      <tr>
+        <th>
+          <?= t("Author") ?>
+        </th>
+        <th>
+          <?= t("Comment") ?>
+        </th>
+        <th>
+          <?= t("Actions") ?>
+        </th>
+      </tr>
+      <? foreach ($comments as $i => $comment): ?>
+      <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+        <td>
+          <a href="#">
+            <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+                 class="g-avatar"
+                 alt="<?= html::clean_attribute($comment->author_name()) ?>"
+                 width="40"
+                 height="40" />
+          </a>
+          <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
+                title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
+        </td>
+        <td>
+          <div class="g-right">
+            <? $item = $comment->item() ?>
+            <div class="g-item g-photo">
+              <a href="<?= $item->url() ?>">
+                <? if ($item->has_thumb()): ?>
+                <img src="<?= $item->thumb_url() ?>"
+                   alt="<?= html::purify($item->title)->for_html_attr() ?>"
+                   <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
+                />
+                <? else: ?>
+                <?= t("No thumbnail") ?>
+                <? endif ?>
+              </a>
+            </div>
           </div>
-        </div>
-        <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(html::purify($comment->text)) ?>
-      </td>
-      <td>
-        <ul class="g-buttonset-vertical">
-        <? if ($comment->state != "unpublished"): ?>
-          <li>
-            <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Unapprove") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "published"): ?>
-          <li>
-            <a href="javascript:set_state('published',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Approve") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "spam"): ?>
-          <li>
-            <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-cancel"></span>
-              <?= t("Spam") ?>
-            </a>
-          </li>
-        <? endif ?>
-          <!--
-          <li>
-            <a href="javascript:reply(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
-              <?= t("Reply") ?>
-            </a>
-          </li>
-          <li>
-            <a href="javascript:Edit(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-pencil"></span>
-              <?= t("Edit") ?>
-            </a>
-          </li>
-          -->
-          <li>
-            <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-trash"></span>
-              <?= t("Delete") ?>
-            </a>
-          </li>
-        </ul>
-      </td>
-    </tr>
-    <? endforeach ?>
-  </table>
+          <p><?= gallery::date($comment->created) ?></p>
+             <?= nl2br(html::purify($comment->text)) ?>
+        </td>
+        <td>
+          <ul class="g-buttonset-vertical">
+          <? if ($comment->state != "unpublished"): ?>
+            <li>
+              <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Unapprove") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "published"): ?>
+            <li>
+              <a href="javascript:set_state('published',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Approve") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "spam"): ?>
+            <li>
+              <a href="javascript:set_state('spam',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-cancel"></span>
+                <?= t("Spam") ?>
+              </a>
+            </li>
+          <? endif ?>
+            <!--
+            <li>
+              <a href="javascript:reply(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
+                <?= t("Reply") ?>
+              </a>
+            </li>
+            <li>
+              <a href="javascript:Edit(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-pencil"></span>
+                <?= t("Edit") ?>
+              </a>
+            </li>
+            -->
+            <li>
+              <a href="javascript:set_state('deleted',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span>
+                <?= t("Delete") ?>
+              </a>
+            </li>
+          </ul>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
 
-  <div class="g-pager">
-    <?= $pager ?>
+    <div class="g-pager">
+      <?= $pager ?>
+    </div>
+    
   </div>
 </div>
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index f75adc60..5d07eb68 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,18 +1,16 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-digibug">
-  <div class="g-admin-digibug-intro">
-    <img id="Digibug-logo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>">
-    <h2> <?= t("Digibug Photo Printing") ?> </h2>
+<div class="g-block">
+  <img src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>" alt="Digibug logo" class="g-right"/>
+  <h1> <?= t("Digibug Photo Printing") ?> </h1>
+  <div class="g-block-content">
     <p>
       <?= t("Turn your photos into a wide variety of prints, gifts and games!") ?>
     </p>
-
     <ul>
       <li class="g-module-status g-success">
         <?= t("You're ready to print photos!") ?>
       </li>
     </ul>
-
     <p>
       <?= t("You don't need an account with Digibug, but if you <a href=\"%signup_url\">register with Digibug</a> and enter your Digibug id in the <a href=\"%advanced_settings_url\">Advanced Settings</a> page you can make money off of your photos!",
           array("signup_url" => "http://www.digibug.com/signup.php",
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index fd8ae63c..e1443aa7 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,94 +1,96 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-g2-import">
+<div id="g-admin-g2-import" class="g-block">
   <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>
 
-  <div id="g-admin-g2-import-notes">
-    <h2> <?= t("Notes") ?> </h2>
-    <p>
-      <?= t("The import process is a work in progress with some known issues:") ?>
-    </p>
-    <ul>
-      <li>
-        <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
-      </li>
-      <li>
-        <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
-      </li>
-      <li>
-        <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
-      </li>
-      <li>
-        <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
-      </li>
-    </ul>
-  </div>
-  <?= $form ?>
-
-  <? if (g2_import::is_initialized()): ?>
-  <div id="g-admin-g2-import-details">
-    <h2> <?= t("Import") ?> </h2>
-    <ul id="g-action-status" class="g-message-block">
-      <li class="g-success">
-        <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
-      </li>
-      <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
-      <li class="g-warning">
-        <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-              array("g2_pixels" => $g2_sizes["thumb"]["size"],
-                    "g3_pixels" => $thumb_size,
-                    "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
-      </li>
-      <? endif ?>
-
-      <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
-      <li class="g-warning">
-        <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-            array("g2_pixels" => $g2_sizes["resize"]["size"],
-                  "g3_pixels" => $resize_size,
-                  "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
-      </li>
-      <? endif ?>
-    </ul>
-
-    <div class="g-info">
+  <div class="g-block-content">
+    <div id="g-admin-g2-import-notes">
+      <h2> <?= t("Notes") ?> </h2>
       <p>
-        <?= t("Your Gallery 2 has the following importable data in it") ?>
+        <?= t("The import process is a work in progress with some known issues:") ?>
       </p>
       <ul>
         <li>
-          <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+          <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
         </li>
         <li>
-          <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+          <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+          <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+          <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
         </li>
-        <li>
-          <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+      </ul>
+    </div>
+    <?= $form ?>
+
+    <? if (g2_import::is_initialized()): ?>
+    <div id="g-admin-g2-import-details">
+      <h2> <?= t("Import") ?> </h2>
+      <ul id="g-action-status" class="g-message-block">
+        <li class="g-success">
+          <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
         </li>
-        <li>
-          <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+        <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
+        <li class="g-warning">
+          <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+                array("g2_pixels" => $g2_sizes["thumb"]["size"],
+                      "g3_pixels" => $thumb_size,
+                      "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
         </li>
-        <li>
-          <?= t2("1 tagged photo/movie/album",
-              "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+        <? endif ?>
+
+        <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
+        <li class="g-warning">
+          <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+              array("g2_pixels" => $g2_sizes["resize"]["size"],
+                    "g3_pixels" => $resize_size,
+                    "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
         </li>
+        <? endif ?>
       </ul>
-    </div>
 
-    <p>
-      <a class="g-button g-dialog-link ui-state-default ui-corner-all"
-         href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
-        <?= t("Begin import!") ?>
-      </a>
-    </p>
+      <div class="g-info">
+        <p>
+          <?= t("Your Gallery 2 has the following importable data in it") ?>
+        </p>
+        <ul>
+          <li>
+            <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+          </li>
+          <li>
+            <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+          </li>
+          <li>
+            <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+          </li>
+          <li>
+            <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+          </li>
+          <li>
+            <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+          </li>
+          <li>
+            <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+          </li>
+          <li>
+            <?= t2("1 tagged photo/movie/album",
+                "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+          </li>
+        </ul>
+      </div>
+
+      <p>
+        <a class="g-button g-dialog-link ui-state-default ui-corner-all"
+           href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
+          <?= t("Begin import!") ?>
+        </a>
+      </p>
+    </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 8af1dd85..ccc631c7 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -112,7 +112,8 @@ class Admin_Languages_Controller extends Admin_Controller {
     $server_link = l10n_client::server_api_key_url();
     $group->input("api_key")
       ->label(empty($api_key)
-              ? 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.",
+              ? 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"))
       ->value($api_key)
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 95d0618c..0f4c0dd8 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -12,26 +12,28 @@
   });
 </script>
 
-<div id="g-admin-graphics">
+<div id="g-admin-graphics" class="g-block ui-helper-clearfix">
   <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>
 
-  <h2> <?= t("Active Toolkit") ?> </h2>
-  <? if ($active == "none"): ?>
-  <?= new View("admin_graphics_none.html") ?>
-  <? else: ?>
-  <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
-  <? endif ?>
-
-  <div class="g-available">
-    <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)) ?>
+  <div class="g-block-content">
+    <h2> <?= t("Active Toolkit") ?> </h2>
+    <? if ($active == "none"): ?>
+    <?= new View("admin_graphics_none.html") ?>
+    <? else: ?>
+    <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
     <? endif ?>
-    <? endforeach ?>
+
+    <div class="g-available">
+      <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)) ?>
+      <? endif ?>
+      <? endforeach ?>
+    </div>
   </div>
 </div>
 
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 74f48b76..311672de 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -1,103 +1,112 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-languages">
-  <h1> <?= t("Languages") ?> </h1>
-  <p>
-    <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
-  </p>
+<script type="text/javascript">
+  var old_default_locale = <?= html::js_string($default_locale) ?>;
 
-  <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
-    <?= access::csrf_form_field() ?>
-    <table>
-      <tr>
-        <th> <?= t("Installed") ?> </th>
-        <th> <?= t("Language") ?> </th>
-        <th> <?= t("Default language") ?> </th>
-      </tr>
-      <? $i = 0 ?>
-      <? foreach ($available_locales as $code => $display_name):  ?>
-      <? if ($i == (count($available_locales)/2)): ?>
-      <table>
-        <tr>
-          <th> <?= t("Installed") ?> </th>
-          <th> <?= t("Language") ?> </th>
-          <th> <?= t("Default language") ?> </th>
-        </tr>
-      <? endif ?>
+  $("input[name='installed_locales[]']").change(function (event) {
+    if (this.checked) {
+      $("input[type='radio'][value='" + this.value + "']").enable();
+    } else {
+      if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
+        $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
+      }
+      $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
+    }
+  });
 
-      <tr class="<?= (isset($installed_locales[$code])) ? "installed" : "" ?><?= ($default_locale == $code) ? " default" : "" ?>">
-        <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
-        <td> <?= $display_name ?> </td>
-        <td>
-        <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
-        </td>
-      </tr>
-      <? $i++ ?>
+  $("g-languages-form").ajaxForm({
+    dataType: "json",
+    success: function(data) {
+      if (data.result == "success") {
+        el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+        el.gallery_dialog();
+        el.trigger('click');
+      }
+    }
+  });
+</script>
 
-      <? endforeach ?>
-    </table>
-    <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
-  </form>
+<div class="g-block">
+  <h1> <?= t("Languages and Translation") ?> </h1>
 
-  <script type="text/javascript">
-    var old_default_locale = <?= html::js_string($default_locale) ?>;
+  <div class="g-block-content">
 
-    $("input[name='installed_locales[]']").change(function (event) {
-      if (this.checked) {
-        $("input[type='radio'][value='" + this.value + "']").enable();
-      } else {
-        if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
-          $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
-        }
-        $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
-      }
-    });
-    
-    $("g-languages-form").ajaxForm({
-      dataType: "json",
-      success: function(data) {
-        if (data.result == "success") {
-          el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
-          el.gallery_dialog();
-          el.trigger('click');
-        }
-      }
-    });
-  </script>
-</div>
-
-<div id="g-translations">
-  <h1> <?= t("Translations") ?> </h1>
-  <p>
-    <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
-  </p>
+    <div id="g-languages" class="g-block">
+      <h2> <?= t("Languages") ?> </h2>
+      <p>
+        <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
+      </p>
 
-  <h3><?= t("Translating Gallery") ?></h3>
+      <div class="g-block-content ui-helper-clearfix">
+        <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
+          <?= access::csrf_form_field() ?>
+          <table class="g-left">
+            <tr>
+              <th> <?= t("Installed") ?> </th>
+              <th> <?= t("Language") ?> </th>
+              <th> <?= t("Default language") ?> </th>
+            </tr>
+            <? $i = 0 ?>
+            <? foreach ($available_locales as $code => $display_name):  ?>
+            <? if ($i == (count($available_locales)/2)): ?>
+            <table>
+              <tr>
+                <th> <?= t("Installed") ?> </th>
+                <th> <?= t("Language") ?> </th>
+                <th> <?= t("Default language") ?> </th>
+              </tr>
+            <? endif ?>
+            <tr class="<?= (isset($installed_locales[$code])) ? "g-installed" : "" ?><?= ($default_locale == $code) ? " g-default" : "" ?>">
+              <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
+              <td> <?= $display_name ?> </td>
+              <td>
+              <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
+              </td>
+            </tr>
+            <? $i++ ?>
+            <? endforeach ?>
+          </table>
+          <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
+        </form>
+      </div>
+    </div>
 
-  <div class="g-block">
-    <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
-       class="g-doc-link ui-state-default ui-corner-all ui-icon ui-icon-help"
-       title="<?= t("Localization documentation")->for_html_attr() ?>">
-      <?= t("Localization documentation") ?>
-    </a>
+    <div id="g-translations" class="g-block">
+      <h2> <?= t("Translations") ?> </h2>
+      <p>
+        <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
+      </p>
 
-    <p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p>
+      <div class="g-block-content">
+        <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
+            class="g-right ui-state-default ui-corner-all ui-icon ui-icon-help"
+            title="<?= t("Localization documentation")->for_html_attr() ?>">
+          <?= t("Localization documentation") ?>
+        </a>
 
-    <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right  target language (currently %default_locale).",
-             array("default_locale" => locales::display_name())) ?></p>
+        <h3><?= t("Translating Gallery") ?></h3>
 
-    <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
+        <p><?= t("Follow these steps to begin translating Gallery.") ?></p>
 
-    <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
-       class="g-button ui-state-default ui-corner-all ui-icon-left">
-      <span class="ui-icon ui-icon-power"></span>
-      <? if (Session::instance()->get("l10n_mode", false)): ?>
-      <?= t("Stop translation mode") ?>
-      <? else: ?>
-      <?= t("Start translation mode") ?>
-      <? endif ?>
-   </a>
-</div>
+        <ul>
+          <li><?= t("Make sure the target language is installed and up to date (check above).") ?></li>
+          <li><?= t("Make sure you have selected the right target language (currently %default_locale).",
+               array("default_locale" => locales::display_name())) ?></li>
+          <li><?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></li>
+        </ul>
+        <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
+           class="g-button ui-state-default ui-corner-all ui-icon-left">
+          <span class="ui-icon ui-icon-power"></span>
+          <? if (Session::instance()->get("l10n_mode", false)): ?>
+          <?= t("Stop translation mode") ?>
+          <? else: ?>
+          <?= t("Start translation mode") ?>
+          <? endif ?>
+        </a>
 
-<h3><?= t("Sharing your translations") ?></h3>
-  <?= $share_translations_form ?>
+        <h3><?= t("Sharing your translations") ?></h3>
+        <?= $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 94582dc8..73a4bef8 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,193 +1,195 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-maintenance">
+<div id="g-admin-maintenance" class="g-block">
   <h1> <?= t("Maintenance Tasks") ?> </h1>
   <p>
     <?= t("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
   </p>
 
-  <div id="g-available-tasks">
-    <h2> <?= t("Available Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Description") ?>
-        </th>
-        <th>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
-        <td class="<?= log::severity_class($task->severity) ?>">
-          <?= $task->name ?>
-        </td>
-        <td>
-          <?= $task->description ?>
-        </td>
-        <td>
-          <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
-            <?= t("run") ?>
-          </a>
-        </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-  </div>
-
-  <? if ($running_tasks->count()): ?>
-  <div id="g-running-tasks">
-    <h2> <?= t("Running Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Last Updated") ?>
-        </th>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Status") ?>
-        </th>
-        <th>
-          <?= t("Info") ?>
-        </th>
-        <th>
-          <?= t("Owner") ?>
-        </th>
-        <th>
-          <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-            <?= t("cancel all") ?></a>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
-        <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
-          <?= gallery::date_time($task->updated) ?>
-        </td>
-        <td>
-          <?= $task->name ?>
-        </td>
-        <td>
-          <? if ($task->done): ?>
-          <? if ($task->state == "cancelled"): ?>
-          <?= t("Cancelled") ?>
-          <? endif ?>
-          <?= t("Close") ?>
-          <? elseif ($task->state == "stalled"): ?>
-          <?= t("Stalled") ?>
-          <? else: ?>
-          <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?>
-          <? endif ?>
-        </td>
-        <td>
-          <?= $task->status ?>
-        </td>
-        <td>
-          <?= html::clean($task->owner()->name) ?>
-        </td>
-        <td>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-            <?= t("cancel") ?>
-          </a>
-          <? if ($task->state == "stalled"): ?>
-          <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
-             href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
-            <?= t("resume") ?>
-          </a>
-          <? endif ?>
-        </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-  </div>
-  <? endif ?>
+  <div class="g-block-content">
+    <div id="g-available-tasks">
+      <h2> <?= t("Available Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Description") ?>
+          </th>
+          <th>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($task_definitions as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
+          <td class="<?= log::severity_class($task->severity) ?>">
+            <?= $task->name ?>
+          </td>
+          <td>
+            <?= $task->description ?>
+          </td>
+          <td>
+            <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
+              class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
+              <?= t("run") ?>
+            </a>
+          </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+    </div>
 
-  <? if ($finished_tasks->count()): ?>
-  <div id="g-finished-tasks">
-    <h2> <?= t("Finished Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Last Updated") ?>
-        </th>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Status") ?>
-        </th>
-        <th>
-          <?= t("Info") ?>
-        </th>
-        <th>
-          <?= t("Owner") ?>
-        </th>
-        <th>
-          <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+    <? if ($running_tasks->count()): ?>
+    <div id="g-running-tasks">
+      <h2> <?= t("Running Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Last Updated") ?>
+          </th>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Status") ?>
+          </th>
+          <th>
+            <?= t("Info") ?>
+          </th>
+          <th>
+            <?= t("Owner") ?>
+          </th>
+          <th>
+            <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
                class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
-        <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
-          <?= gallery::date_time($task->updated) ?>
-        </td>
-        <td>
-          <?= $task->name ?>
-        </td>
-        <td>
-          <? if ($task->state == "success"): ?>
-          <?= t("Success") ?>
-          <? elseif ($task->state == "error"): ?>
-          <?= t("Failed") ?>
-          <? elseif ($task->state == "cancelled"): ?>
-          <?= t("Cancelled") ?>
-          <? endif ?>
-        </td>
-        <td>
-          <?= $task->status ?>
-        </td>
-        <td>
-          <?= html::clean($task->owner()->name) ?>
-        </td>
-        <td>
-          <? if ($task->done): ?>
-          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
-            <?= t("remove") ?>
-          </a>
-          <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
-            <?= t("browse log") ?>
-          </a>
-          <? endif ?>
-          <? else: ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all>
-            <?= t("resume") ?>
-          </a>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
-            <?= t("cancel") ?>
-          </a>
-          <? endif ?>
-          </ul>
-        </td>
-      </tr>
-      <? endforeach ?>
-      <? $i++ ?>
-    </table>
+              <?= t("cancel all") ?></a>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($running_tasks as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
+          <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
+            <?= gallery::date_time($task->updated) ?>
+          </td>
+          <td>
+            <?= $task->name ?>
+          </td>
+          <td>
+            <? if ($task->done): ?>
+            <? if ($task->state == "cancelled"): ?>
+            <?= t("Cancelled") ?>
+            <? endif ?>
+            <?= t("Close") ?>
+            <? elseif ($task->state == "stalled"): ?>
+            <?= t("Stalled") ?>
+            <? else: ?>
+            <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?>
+            <? endif ?>
+          </td>
+          <td>
+            <?= $task->status ?>
+          </td>
+          <td>
+            <?= html::clean($task->owner()->name) ?>
+          </td>
+          <td>
+            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
+               class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
+              <?= t("cancel") ?>
+            </a>
+            <? if ($task->state == "stalled"): ?>
+            <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
+               href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
+              <?= t("resume") ?>
+            </a>
+            <? endif ?>
+          </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+    </div>
+    <? endif ?>
+
+    <? if ($finished_tasks->count()): ?>
+    <div id="g-finished-tasks">
+      <h2> <?= t("Finished Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Last Updated") ?>
+          </th>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Status") ?>
+          </th>
+          <th>
+            <?= t("Info") ?>
+          </th>
+          <th>
+            <?= t("Owner") ?>
+          </th>
+          <th>
+            <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+                 class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
+               <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($finished_tasks as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
+          <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
+            <?= gallery::date_time($task->updated) ?>
+          </td>
+          <td>
+            <?= $task->name ?>
+          </td>
+          <td>
+            <? if ($task->state == "success"): ?>
+            <?= t("Success") ?>
+            <? elseif ($task->state == "error"): ?>
+            <?= t("Failed") ?>
+            <? elseif ($task->state == "cancelled"): ?>
+            <?= t("Cancelled") ?>
+            <? endif ?>
+          </td>
+          <td>
+            <?= $task->status ?>
+          </td>
+          <td>
+            <?= html::clean($task->owner()->name) ?>
+          </td>
+          <td>
+            <? if ($task->done): ?>
+            <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
+              <?= t("remove") ?>
+            </a>
+            <? if ($task->get_log()): ?>
+            <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
+              <?= t("browse log") ?>
+            </a>
+            <? endif ?>
+            <? else: ?>
+            <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all>
+              <?= t("resume") ?>
+            </a>
+            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
+              <?= t("cancel") ?>
+            </a>
+            <? endif ?>
+            </ul>
+          </td>
+        </tr>
+        <? endforeach ?>
+        <? $i++ ?>
+      </table>
+    </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 75f4f0c5..4c4976f8 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -1,32 +1,34 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-modules">
+<div class="g-block ui-helper-clearfix">
   <h1> <?= t("Gallery Modules") ?> </h1>
   <p>
     <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?>
   </p>
 
-  <form method="post" action="<?= url::site("admin/modules/save") ?>">
-    <?= access::csrf_form_field() ?>
-    <table>
-      <tr>
-        <th> <?= t("Installed") ?> </th>
-        <th> <?= t("Name") ?> </th>
-        <th> <?= t("Version") ?> </th>
-        <th> <?= t("Description") ?> </th>
-      </tr>
-      <? $i = 0 ?>
-      <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
-        <? $data = array("name" => $module_name); ?>
-        <? if ($module_info->locked) $data["disabled"] = 1; ?>
-        <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
-        <td> <?= t($module_info->name) ?> </td>
-        <td> <?= $module_info->version ?> </td>
-        <td> <?= t($module_info->description) ?> </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-    <input type="submit" value="<?= t("Update")->for_html_attr() ?>"/>
-  </form>
+  <div class="g-block-content">
+    <form method="post" action="<?= url::site("admin/modules/save") ?>">
+      <?= access::csrf_form_field() ?>
+      <table>
+        <tr>
+          <th> <?= t("Installed") ?> </th>
+          <th> <?= t("Name") ?> </th>
+          <th> <?= t("Version") ?> </th>
+          <th> <?= t("Description") ?> </th>
+        </tr>
+        <? $i = 0 ?>
+        <? foreach ($available as $module_name => $module_info):  ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+          <? $data = array("name" => $module_name); ?>
+          <? if ($module_info->locked) $data["disabled"] = 1; ?>
+          <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
+          <td> <?= t($module_info->name) ?> </td>
+          <td> <?= $module_info->version ?> </td>
+          <td> <?= t($module_info->description) ?> </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+      <input type="submit" value="<?= t("Update")->for_html_attr() ?>" />
+    </form>
+  </div>
 </div>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index b4f339ae..ea950b54 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(function() {
-    $(".g-admin-blocks-list ul").sortable({
+    $(".g-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "g-target",
@@ -11,7 +11,7 @@
           $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-admin-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
             if (data.result == "success") {
               $("ul#g-available-blocks").html(data.available);
               $("ul#g-active-blocks").html(data.active);
@@ -22,25 +22,28 @@
     }).disableSelection();
   });
 </script>
-<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>
-    <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>
-      <ul id="g-available-blocks" class="g-sortable-blocks">
-      <?= $available ?>
-      </ul>
+<div class="g-block">
+  <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>
+
+  <div id="g-admin-blocks" class="g-block-content ui-helper-clearfix" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
+    <div class="g-block g-left">
+      <h3><?= t("Available Blocks") ?></h3>
+      <div class="g-blocks-list g-block-content">
+        <ul id="g-available-blocks" class="g-sortable-blocks">
+        <?= $available ?>
+        </ul>
+      </div>
     </div>
-  </div>
-  <div class="g-admin-blocks-list">
-    <div><h3><?= t("Active Blocks") ?></h3></div>
-    <div>
-      <ul id="g-active-blocks" class="g-sortable-blocks">
-      <?= $active ?>
-      </ul>
+    <div class="g-block g-left">
+      <h3><?= t("Active Blocks") ?></h3>
+      <div class="g-blocks-list g-block-content">
+        <ul id="g-active-blocks" class="g-sortable-blocks">
+        <?= $active ?>
+        </ul>
+      </div>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index e09be728..a4bf1c4e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,6 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-theme-options">
+<div class="g-block">
   <h1> <?= t("Theme Options") ?> </h1>
 
+  <div class="g-block-content">
   <?= $form ?>
+  </div>
 </div>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index f7e77a01..dda18265 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -7,83 +7,88 @@
   }
 </script>
 
-<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>
+<div class="g-block ui-helper-clearfix">
+  <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>
 
-<div id="g-site-theme">
-  <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
-    <h3> <?= $themes[$site]->name ?> </h3>
-    <p>
-      <?= $themes[$site]->description ?>
-    </p>
-  </div>
+  <div class="g-block-content">
+    <div id="g-site-theme">
+      <h2> <?= t("Gallery theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
+        <h3> <?= $themes[$site]->name ?> </h3>
+        <p>
+          <?= $themes[$site]->description ?>
+        </p>
+      </div>
 
-  <h2> <?= t("Available Gallery themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->site) continue ?>
-    <? if ($id == $site) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+      <h2> <?= t("Available Gallery themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->site) continue ?>
+        <? if ($id == $site) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
+
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other site themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
 
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other site themes available.") ?>
-    </p>
-    <? endif ?>
-  </div>
-</div>
+    <div id="g-admin-theme">
+      <h2> <?= t("Admin theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
+        <h3> <?= $themes[$admin]->name ?> </h3>
+        <p>
+          <?= $themes[$admin]->description ?>
+        </p>
+      </div>
 
-<div id="g-admin-theme">
-  <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
-    <h3> <?= $themes[$admin]->name ?> </h3>
-    <p>
-      <?= $themes[$admin]->description ?>
-    </p>
-  </div>
+      <h2> <?= t("Available admin themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->admin) continue ?>
+        <? if ($id == $admin) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
 
-  <h2> <?= t("Available admin themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->admin) continue ?>
-    <? if ($id == $admin) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other admin themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
-
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other admin themes available.") ?>
-    </p>
-    <? endif ?>
+    
   </div>
 </div>
\ No newline at end of file
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 3e964801..a0af3ba8 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-recaptcha">
+<div class="g-block">
   <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.",
@@ -7,27 +7,29 @@
                 "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?>
   </p>
 
-     <?= $form ?>
-</div>
+  <div class="g-block-content">
+    <?= $form ?>
 
-<? if ($public_key && $private_key): ?>
-<div id="g-admin-recaptcha-test" class="g-block">
-  <h2> <?= t("reCAPTCHA Test") ?> </h2>
-  <p>
-    <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
-  </p>
+    <? if ($public_key && $private_key): ?>
+    <div id="g-admin-recaptcha-test">
+      <h2> <?= t("reCAPTCHA Test") ?> </h2>
+      <p>
+        <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
+      </p>
 
-  <div id="g-recaptcha"/>
-  <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
-  <script type="text/javascript">
-    Recaptcha.create("<?= $public_key ?>", "g-recaptcha", {
-      callback: Recaptcha.focus_response_field,
-      lang: "en",
-      custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
-      theme: "white"
-    });
-  </script>
+      <div id="g-recaptcha">
+      <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
+      <script type="text/javascript">
+        Recaptcha.create("<?= $public_key ?>", "g-recaptcha", {
+          callback: Recaptcha.focus_response_field,
+          lang: "en",
+          custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
+          theme: "white"
+        });
+      </script>
+      </div>
+    </div>
+    <? endif ?>
+  
   </div>
 </div>
-<? endif ?>
-
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index e447ee6d..eae767af 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,25 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-server-add-admin">
-  <h2>
-    <?= t("Add From Server Admininstration") ?>
-  </h2>
-  <div id="g-authorized-path">
-    <h3><?= t("Authorized Paths") ?></h3>
+<div class="g-block">
+  <h1> <?= t("Add From Server Admininstration") ?> </h1>
+  <div class="g-block-content">
+    <h2><?= t("Authorized Paths") ?></h2>
     <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>>
       <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li>
     </ul>
-    <ul id="g-path-list">
+    <ul>
       <? foreach ($paths as $id => $path): ?>
       <li class="ui-icon-left">
+        <span class="ui-icon ui-icon-folder-open"></span>
+        <?= html::clean($path) ?>
         <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
            id="icon_<?= $id?>"
-           class="g-remove-dir ui-icon ui-icon-trash">
-          X
-        </a>
-        <?= html::clean($path) ?>
+           class="g-remove-dir"><span class="ui-icon ui-icon-trash">X</span></a>
       </li>
       <? endforeach ?>
     </ul>
+    <?= $form ?>
   </div>
-  <?= $form ?>
 </div>
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 41fa4d41..4ed88e03 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -37,7 +37,7 @@ function editInPlace(element) {
   closeEditInPlaceForms();
 
   // create edit form
-  var tag_id = $(this).attr('id').substr(5);
+  var tag_id = $(this).attr('rel');
   var tag_name = $(this).html();
   var tag_width = $(this).width();
   $(this).parent().data("revert", $(this).parent().html());
@@ -67,7 +67,7 @@ function editInPlace(element) {
     console.log("success");
         if (data.result == "success") {
           closeEditInPlaceForms(); // close form
-          $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname
+          $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname
           window.location.reload();
         } else if (data.result == "error") {
     console.log("error");
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 7771f7fe..67ba4d95 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script>
+<script type="text/javascript">
   var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>;
   $("document").ready(function() {
     // using JS for adding link titles to avoid running t() for each tag
@@ -15,49 +15,50 @@
   var cancel_i18n = <?= html::js_string(t("cancel")->for_html_attr()) ?>;
 </script>
 
-<h2>
-  <?= t("Tag Admin") ?>
-</h2>
-
 <? $tags_per_column = $tags->count()/5 ?>
 <? $column_tag_count = 0 ?>
 
-<table id="g-tag-admin">
-  <caption class="g-understate">
-    <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
-  </caption>
-  <tr>
-    <td>
-      <? foreach ($tags as $i => $tag): ?>
-        <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
-
-        <? if ($i == 0): /* first letter */ ?>
-          <strong><?= html::clean($current_letter) ?></strong>
-          <ul>
-        <? elseif ($last_letter != $current_letter): /* new letter */ ?>
-          <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
-             </td>
-            <td>
-            <? $column_tag_count = 0 ?>
-          <? endif ?>
+<div class="g-block">
+  <h1> <?= t("Tag Admin") ?> </h1>
+  
+  <div class="g-block-content">
+    <table id="g-tag-admin">
+      <caption class="g-understate">
+        <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
+      </caption>
+      <tr>
+        <td>
+          <? foreach ($tags as $i => $tag): ?>
+            <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
 
-          </ul>
-          <strong><?= html::clean($current_letter) ?></strong>
-          <ul>
-        <? endif ?>
+            <? if ($i == 0): /* first letter */ ?>
+              <strong><?= html::clean($current_letter) ?></strong>
+              <ul>
+            <? elseif ($last_letter != $current_letter): /* new letter */ ?>
+              <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
+                 </td>
+                <td>
+                <? $column_tag_count = 0 ?>
+              <? endif ?>
+              </ul>
+              <strong><?= html::clean($current_letter) ?></strong>
+              <ul>
+            <? endif ?>
 
-        <li>
-          <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
-          <span class="g-understate">(<?= $tag->count ?>)</span>
-          <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-             class="g-dialog-link g-delete-link g-button">
-              <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
-        </li>
+                <li>
+                  <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
+                  <span class="g-understate">(<?= $tag->count ?>)</span>
+                  <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
+                      class="g-dialog-link g-delete-link g-button">
+                    <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
+                </li>
 
-        <? $column_tag_count++ ?>
-        <? $last_letter = $current_letter ?>
-      <? endforeach /* $tags */ ?>
-      </ul>
-    </td>
-  </tr>
-</table>
+            <? $column_tag_count++ ?>
+            <? $last_letter = $current_letter ?>
+          <? endforeach /* $tags */ ?>
+          </ul>
+        </td>
+      </tr>
+    </table>
+  </div>
+</div>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 2f8d8673..aae39c8c 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -41,88 +41,93 @@
           });
   }
 </script>
-<div class="g-block">
-  <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new user") ?>
-  </a>
 
-  <h2>
-    <?= t("User Admin") ?>
-  </h2>
+<div class="g-block">
+  <h1> <?= t("Users and Groups") ?> </h1>
 
   <div class="g-block-content">
-    <table id="g-user-admin-list">
-      <tr>
-        <th><?= t("Username") ?></th>
-        <th><?= t("Full name") ?></th>
-        <th><?= t("Email") ?></th>
-        <th><?= t("Last login") ?></th>
-        <th><?= t("Actions") ?></th>
-      </tr>
+    <div class="g-block">
+      <a href="<?= url::site("admin/users/add_user_form") ?>"
+          class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+          title="<?= t("Create a new user")->for_html_attr() ?>">
+        <span class="ui-icon ui-icon-circle-plus"></span>
+        <?= t("Add a new user") ?>
+      </a>
 
-      <? foreach ($users as $i => $user): ?>
-      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
-               alt="<?= html::clean_attribute($user->name) ?>"
-               width="20"
-               height="20" />
-          <?= html::clean($user->name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->full_name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->email) ?>
-        </td>
-        <td>
-          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
-        </td>
-        <td class="g-actions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-              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>
-          <? if (user::active()->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>
-          <? 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>
-          <? endif ?>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-  </div>
-</div>
+      <h2> <?= t("User Admin") ?> </h2>
 
-<div id="g-group-admin" class="g-block ui-helper-clearfix">
-  <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new group") ?>
-  </a>
+      <div class="g-block-content">
+        <table id="g-user-admin-list">
+          <tr>
+            <th><?= t("Username") ?></th>
+            <th><?= t("Full name") ?></th>
+            <th><?= t("Email") ?></th>
+            <th><?= t("Last login") ?></th>
+            <th><?= t("Actions") ?></th>
+          </tr>
 
-  <h2>
-    <?= t("Group Admin") ?>
-  </h2>
+          <? foreach ($users as $i => $user): ?>
+          <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+            <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+              <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+                   title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+                   alt="<?= html::clean_attribute($user->name) ?>"
+                   width="20"
+                   height="20" />
+              <?= html::clean($user->name) ?>
+            </td>
+            <td>
+              <?= html::clean($user->full_name) ?>
+            </td>
+            <td>
+              <?= html::clean($user->email) ?>
+            </td>
+            <td>
+              <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
+            </td>
+            <td class="g-actions">
+              <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+                  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>
+              <? if (user::active()->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>
+              <? 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>
+              <? endif ?>
+            </td>
+          </tr>
+          <? endforeach ?>
+        </table>
+      </div>
+    </div>
 
-  <div class="g-block-content">
-    <ul>
-      <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
-        <?= $v ?>
-      </li>
-      <? endforeach ?>
-    </ul>
-  </div>
+    <div id="g-group-admin" class="g-block ui-helper-clearfix">
+      <a href="<?= url::site("admin/users/add_group_form") ?>"
+          class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+          title="<?= t("Create a new group")->for_html_attr() ?>">
+        <span class="ui-icon ui-icon-circle-plus"></span>
+        <?= t("Add a new group") ?>
+      </a>
+
+      <h2>
+        <?= t("Group Admin") ?>
+      </h2>
+
+      <div class="g-block-content">
+        <ul>
+          <? foreach ($groups as $i => $group): ?>
+          <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+            <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+            <?= $v ?>
+          </li>
+          <? endforeach ?>
+        </ul>
+      </div>
+    </div>
+    </div>
 </div>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index d034066a..af38cb41 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,37 +1,39 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="#g-watermarks">
+<div class="g-block">
   <h1> <?= t("Watermarks") ?> </h1>
   <p>
     <?= t("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
   </p>
 
-  <? if (empty($name)): ?>
-  <a href="<?= url::site("admin/watermarks/form_add") ?>"
-     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>
-  <p>
-    <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
-  </p>
-  <div>
-    <div class="image">
-      <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/>
-      <p>
-        <?= t("Position: %position", array("position" => watermark::position($position))) ?>
-      </p>
-      <p>
-        <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
-      </p>
-    </div>
-    <div class="controls">
-      <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-         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() ?>"
-         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 class="g-block-content">
+    <? if (empty($name)): ?>
+    <a href="<?= url::site("admin/watermarks/form_add") ?>"
+       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>
+    <p>
+      <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
+    </p>
+    <div>
+      <div class="g-photo">
+        <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>" />
+        <p>
+          <?= t("Position: %position", array("position" => watermark::position($position))) ?>
+        </p>
+        <p>
+          <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
+        </p>
+      </div>
+      <div class="controls">
+        <a href="<?= url::site("admin/watermarks/form_edit") ?>"
+           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() ?>"
+           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>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 1d60d392..20593e9c 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -107,11 +107,11 @@ td {
   border: none;
   border-bottom: 1px solid #ccc;
   padding: .5em;
-  vertical-align: top;
+  vertical-align: middle;
 }
 
-#g-admin-maintenance td {
-  vertical-align: middle;
+th {
+  white-space: nowrap;
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -474,14 +474,6 @@ tr.g-warning {
   margin-right: 1em;
 }
 
-#g-user-admin-list {
-  margin-bottom: 1em;
-}
-
-#g-user-admin-list td {
-  vertical-align: bottom;
-}
-
 #g-user-admin-list .admin {
   color: #55f;
   font-weight: bold;
@@ -531,36 +523,19 @@ li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
-#g-admin-advanced-settings tr.setting:hover {
-  background: #ffc;
-}
-
-/* admin/sidebar  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-.g-admin-blocks-list {
-  float: left;
-  height: 300px;
-  margin-left: 20px;
-  width: 30%;
-}
+/* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.g-admin-blocks-list div:last-child {
-  border: .1em solid;
-  height: 100%;
-  overflow-y: auto;
+#g-admin-blocks .g-block {
+  margin-right: 2em;
+  height: 200px;
+  width: 30% !important;
 }
 
-.g-admin-blocks-list ul {
-  height: 98%;
-  margin: .1em .1em;
-  padding: .1em;
-}
-
-.g-admin-blocks-list ul li {
-  background-color: #e8e8e8;
-  font-size: 1em;
-  font-weight: bold;
-  margin: .5em;
-  padding: .3em .8em;
+#g-admin-blocks .g-block li {
+  background: #e7e7e7;
+  /*border: 1px solid #fff;*/
+  margin-bottom: 1em;
+  padding: .4em .8em;
 }
 
 /** *******************************************************************
@@ -797,20 +772,10 @@ li.g-default-group h4, li.g-default-group .g-user {
 }
 
 #g-languages-form table {
-	width: 400px;
-	float: left;
+	width: 40%;
 	margin: 0 3em 1em 0;
 }
 
-#g-languages-form .installed {
-  background-color: #EEEEEE;
-}
-
-#g-languages-form .default {
-	background-color: #C5DBEC;
-	font-weight: bold;
-}
-
 #g-languages-form input {
 	clear: both;
 }
@@ -824,10 +789,6 @@ li.g-default-group h4, li.g-default-group .g-user {
 	padding: .5em;
 }
 
-.g-doc-link {
-  float: right;
-}
-
 /** *******************************************************************
  * 7) Right to left styles
  *********************************************************************/
-- 
cgit v1.2.3


From 098b57bf18112d0a3173dbe28b5ed76782431ff7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 19 Oct 2009 12:53:44 -0700
Subject: Simplify the user interface by moving the password reset
 functionality into the user module Bagging the User_Definition and
 Group_Definition abstract classes and replacing them with interfaces with the
 same names. Make sure all the unit tests work.

---
 modules/gallery/controllers/password.php           | 133 --------------
 modules/gallery/helpers/access.php                 |   4 +-
 modules/gallery/libraries/Identity.php             |  34 +---
 modules/gallery/libraries/drivers/Identity.php     | 196 ++-------------------
 modules/gallery/tests/Albums_Controller_Test.php   |   1 +
 modules/gallery/tests/Photos_Controller_Test.php   |   2 +-
 modules/gallery/views/admin_identity.html.php      |   6 +-
 modules/gallery/views/reset_password.html.php      |  17 --
 modules/user/controllers/password.php              | 133 ++++++++++++++
 modules/user/helpers/group.php                     |   4 +-
 modules/user/helpers/user.php                      |  15 +-
 .../user/libraries/drivers/Identity/Gallery.php    |  99 ++---------
 modules/user/models/group.php                      |   2 +-
 modules/user/models/user.php                       |   2 +-
 modules/user/views/admin_users.html.php            |   2 +-
 modules/user/views/reset_password.html.php         |  17 ++
 16 files changed, 206 insertions(+), 461 deletions(-)
 delete mode 100644 modules/gallery/controllers/password.php
 delete mode 100644 modules/gallery/views/reset_password.html.php
 create mode 100644 modules/user/controllers/password.php
 create mode 100644 modules/user/views/reset_password.html.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/password.php b/modules/gallery/controllers/password.php
deleted file mode 100644
index ce6d67b1..00000000
--- a/modules/gallery/controllers/password.php
+++ /dev/null
@@ -1,133 +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 Password_Controller extends Controller {
-  public function reset() {
-    if (request::method() == "post") {
-      // @todo separate the post from get parts of this function
-      access::verify_csrf();
-      $this->_send_reset();
-    } else {
-      print $this->_reset_form();
-    }
-  }
-
-  public function do_reset() {
-    if (request::method() == "post") {
-      $this->_change_password();
-    } else {
-      $user = Identity::lookup_user_by_hash(Input::instance()->get("key"));
-      if (!empty($user)) {
-        print $this->_new_password_form($user->hash);
-      } else {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-    }
-  }
-
-  private function _send_reset() {
-    $form = $this->_reset_form();
-
-    $valid = $form->validate();
-    if ($valid) {
-      $user = Identity::lookup_user_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
-        $form->reset->inputs["name"]->add_error("no_email", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $user->hash = md5(rand());
-      $user->save();
-      $message = new View("reset_password.html");
-      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
-      $message->user = $user;
-
-      Sendmail::factory()
-        ->to($user->email)
-        ->subject(t("Password Reset Request"))
-        ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
-        ->message($message->render())
-        ->send();
-
-      log::success(
-        "user",
-        t("Password reset email sent for user %name", array("name" => $user->name)));
-    } else {
-      // Don't include the username here until you're sure that it's XSS safe
-      log::warning(
-        "user", "Password reset email requested for bogus user");
-    }
-
-    message::success(t("Password reset email sent"));
-    print json_encode(
-      array("result" => "success"));
-  }
-
-  private function _reset_form() {
-    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
-    $group = $form->group("reset")->label(t("Reset Password"));
-    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
-    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
-    $group->submit("")->value(t("Reset"));
-
-    return $form;
-  }
-
-  private function _new_password_form($hash=null) {
-    $template = new Theme_View("page.html", "reset");
-
-    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
-    $group = $form->group("reset")->label(t("Change Password"));
-    $hidden = $group->hidden("hash");
-    if (!empty($hash)) {
-      $hidden->value($hash);
-    }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->inputs["password2"]->error_messages(
-      "mistyped", t("The password and the confirm password must match"));
-    $group->submit("")->value(t("Update"));
-
-    $template->content = $form;
-    return $template;
-  }
-
-  private function _change_password() {
-    $view = $this->_new_password_form();
-    if ($view->content->validate()) {
-      $user = Identity::lookup_user_by_hash(Input::instance()->get("key"));
-      if (empty($user)) {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-
-      $user->password = $view->content->reset->password->value;
-      $user->hash = null;
-      $user->save();
-      message::success(t("Password reset successfully"));
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $view;
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 21f4de81..fba161e3 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -197,8 +197,8 @@ class access_Core {
    * @param  Item_Model  $item
    * @param  boolean     $value
    */
-  private static function _set(Group_Model $group, $perm_name, $album, $value) {
-    if (get_class($group) != "Group_Model") {
+  private static function _set(Group_Definition $group, $perm_name, $album, $value) {
+    if (!($group instanceof Group_Definition)) {
       throw new Exception("@todo PERMISSIONS_ONLY_WORK_ON_GROUPS");
     }
     if (!$album->loaded) {
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 9e5f0bb5..e77fd2d2 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -133,37 +133,17 @@ class Identity_Core {
   }
 
   /**
-   * @see Identity_Driver::hash_password.
-   */
-  static function hash_password($password) {
-    return self::instance()->driver->hash_password($password);
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Definition  the user object, or null if the id was invalid.
+   * @see Identity_Driver::lookup_user.
    */
   static function lookup_user($id) {
-    return self::instance()->driver->lookup_user_by_field("id", $id);
+    return self::instance()->driver->lookup_user($id);
   }
 
   /**
-   * Look up a user by name.
-   * @param integer      $name the user name
-   * @return User_Definition  the user object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_user_by_name.
    */
   static function lookup_user_by_name($name) {
-    return self::instance()->driver->lookup_user_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by hash.
-   * @param string       $name the user name
-   * @return User_Definition  the user object, or null if the name was invalid.
-   */
-  static function lookup_user_by_hash($hash) {
-    return self::instance()->driver->lookup_user_by_field("hash", $hash);
+    return self::instance()->driver->lookup_user_by_name($name);
   }
 
   /**
@@ -188,12 +168,10 @@ class Identity_Core {
   }
 
   /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Definition  the group object, or null if the name was invalid.
+   * @see Identity_Driver::lookup_group_by_name.
    */
   static function lookup_group_by_name($name) {
-    return self::instance()->driver->lookup_group_by_field("name", $name);
+    return self::instance()->driver->lookup_group_by_name($name);
   }
 
   /**
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index a9e1a75b..6ab001cb 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -45,19 +45,18 @@ interface Identity_Driver {
   public function is_correct_password($user, $password);
 
   /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
+   * Look up a user by id.
+   * @param integer     id
+   * @return User_Definition the user object, or null if the name was invalid.
    */
-  public function hash_password($password);
+  public function lookup_user($id);
 
   /**
-   * Look up a user by by search the specified field.
-   * @param string      search field
-   * @param string      search value
-   * @return User_Definition the user object, or null if the name was invalid.
+   * Look up a user by name.
+   * @param string      name
+  * @return User_Definition the user object, or null if the name was invalid.
    */
-  public function lookup_user_by_field($field, $value);
+  public function lookup_user_by_name($name);
 
   /**
    * Create a new group.
@@ -90,181 +89,6 @@ interface Identity_Driver {
 
 } // End Identity Driver Definition
 
-/**
- * User Data wrapper
- */
-abstract class User_Definition {
-  protected $user;
-  public function __get($column) {
-    switch ($column) {
-    case "id":
-    case "name":
-    case "full_name":
-    case "password":
-    case "login_count":
-    case "last_login":
-    case "email":
-    case "admin":
-    case "guest":
-    case "hash":
-    case "url":
-    case "locale":
-    case "groups":
-    case "hashed_password":
-      return $this->user->$column;
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  public function __set($column, $value) {
-    switch ($column) {
-    case "id":
-    case "groups":
-      throw new Exception("@todo READ ONLY FIELD: $column");
-      break;
-    case "name":
-    case "full_name":
-    case "hashed_password":
-    case "password":
-    case "login_count":
-    case "last_login":
-    case "email":
-    case "admin":
-    case "guest":
-    case "hash":
-    case "url":
-    case "locale":
-      $this->user->$column = $value;
-      break;
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  public function __isset($column) {
-    return isset($this->user->$column);
-  }
-
-  public function __unset($column) {
-    switch ($column) {
-    case "id":
-    case "groups":
-      throw new Exception("@todo READ ONLY FIELD: $column");
-      break;
-    case "name":
-    case "full_name":
-    case "password":
-    case "login_count":
-    case "last_login":
-    case "email":
-    case "admin":
-    case "guest":
-    case "hash":
-    case "url":
-    case "locale":
-    case "hashed_password":
-      unset($this->user->$column);
-      break;
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  /**
-   * Return a url to the user's avatar image.
-   * @param integer $size the target size of the image (default 80px)
-   * @return string a url
-   */
-  abstract public function avatar_url($size=80, $default=null);
-
-  /**
-   * Return the best version of the user's name.  Either their specified full name, or fall back
-   * to the user name.
-   * @return string
-   */
-  abstract public function display_name();
-
-  /**
-   * Return the internal user object without the wrapper.
-   * This method is used by implementing classes to access the internal user object.
-   * Consider it pseudo private and only declared public as PHP as not internal or friend modifier
-   */
-  public function _uncloaked() {
-    return $this->user;
-  }
-
-  abstract public function save();
-  abstract public function delete();
-}
-
-/**
- * Group Data wrapper
- */
-abstract class Group_Definition {
-  protected $group;
-
-  public function __get($column) {
-    switch ($column) {
-    case "id":
-    case "name":
-    case "special":
-    case "users":
-      return $this->group->$column;
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  public function __set($column, $value) {
-    switch ($column) {
-    case "id":
-    case "users":
-      throw new Exception("@todo READ ONLY FIELD: $column");
-      break;
-    case "name":
-    case "special":
-      $this->group->$column = $value;
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  public function __isset($column) {
-    return isset($this->group->$column);
-  }
-
-  public function __unset($column) {
-    switch ($column) {
-    case "id":
-    case "users":
-      throw new Exception("@todo READ ONLY FIELD: $column");
-      break;
-    case "name":
-    case "special":
-      unset($this->group->$column);
-    default:
-      throw new Exception("@todo UNSUPPORTED FIELD: $column");
-      break;
-    }
-  }
-
-  /**
-   * Return the internal group object without the wrapper.
-   * This method is used by implementing classes to access the internal group object.
-   * Consider it pseudo private and only declared public as PHP as not internal or friend modifier
-   */
-  public function _uncloaked() {
-    return $this->group;
-  }
+interface Group_Definition {}
 
-  abstract public function save();
-  abstract public function delete();
-  abstract public function add($user);
-  abstract public function remove($user);
-}
+interface User_Definition {}
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index 046cb5ad..fa46d924 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -43,6 +43,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["column"] = "weight";
     $_POST["direction"] = "ASC";
     $_POST["csrf"] = access::csrf_token();
+    $_POST["slug"] = "new_name";
     $_POST["_method"] = "put";
     access::allow(Identity::everybody(), "edit", $root);
 
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index cdb4ae4f..59c3f78a 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", Session::active_user(), "slug");
+      "test", "test", Session::active_user()->id, "slug");
     $orig_name = $photo->name;
 
     $_POST["filename"] = "test.jpeg";
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index dcf1dbc1..1405cacb 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -15,11 +15,11 @@
           height:165,
           modal: true,
           overlay: {
-	    backgroundColor: '#000',
-	    opacity: 0.5
+            backgroundColor: '#000',
+            opacity: 0.5
           },
           buttons: {
-	    "Continue": function() {
+            "Continue": function() {
               $("##g-dialog form").submit();
             },
             Cancel: function() {
diff --git a/modules/gallery/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
deleted file mode 100644
index 92ca4917..00000000
--- a/modules/gallery/views/reset_password.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<html>
-  <head>
-    <title><?= t("Password Reset Request") ?> </title>
-  </head>
-  <body>
-    <h2><?= t("Password Reset Request") ?> </h2>
-    <p>
-      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
-    </p>
-    <p>
-  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
-        array("site_url" => html::mark_clean(url::base(false, "http")),
-              "confirm_url" => $confirm_url)) ?>
-    </p>
-  </body>
-</html>
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
new file mode 100644
index 00000000..a8f1c5ca
--- /dev/null
+++ b/modules/user/controllers/password.php
@@ -0,0 +1,133 @@
+<?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 Password_Controller extends Controller {
+  public function reset() {
+    if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
+      $this->_send_reset();
+    } else {
+      print $this->_reset_form();
+    }
+  }
+
+  public function do_reset() {
+    if (request::method() == "post") {
+      $this->_change_password();
+    } else {
+      $user = user::lookup_user_by_field("hash", Input::instance()->get("key"));
+      if (!empty($user)) {
+        print $this->_new_password_form($user->hash);
+      } else {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+    }
+  }
+
+  private function _send_reset() {
+    $form = $this->_reset_form();
+
+    $valid = $form->validate();
+    if ($valid) {
+      $user = Identity::lookup_user_by_name($form->reset->inputs["name"]->value);
+      if (!$user->loaded || empty($user->email)) {
+        $form->reset->inputs["name"]->add_error("no_email", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $user->hash = md5(rand());
+      $user->save();
+      $message = new View("reset_password.html");
+      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
+      $message->user = $user;
+
+      Sendmail::factory()
+        ->to($user->email)
+        ->subject(t("Password Reset Request"))
+        ->header("Mime-Version", "1.0")
+        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->message($message->render())
+        ->send();
+
+      log::success(
+        "user",
+        t("Password reset email sent for user %name", array("name" => $user->name)));
+    } else {
+      // Don't include the username here until you're sure that it's XSS safe
+      log::warning(
+        "user", "Password reset email requested for bogus user");
+    }
+
+    message::success(t("Password reset email sent"));
+    print json_encode(
+      array("result" => "success"));
+  }
+
+  private function _reset_form() {
+    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
+    $group = $form->group("reset")->label(t("Reset Password"));
+    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
+    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
+    $group->submit("")->value(t("Reset"));
+
+    return $form;
+  }
+
+  private function _new_password_form($hash=null) {
+    $template = new Theme_View("page.html", "reset");
+
+    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
+    $group = $form->group("reset")->label(t("Change Password"));
+    $hidden = $group->hidden("hash");
+    if (!empty($hash)) {
+      $hidden->value($hash);
+    }
+    $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules("required|length[1,40]");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->inputs["password2"]->error_messages(
+      "mistyped", t("The password and the confirm password must match"));
+    $group->submit("")->value(t("Update"));
+
+    $template->content = $form;
+    return $template;
+  }
+
+  private function _change_password() {
+    $view = $this->_new_password_form();
+    if ($view->content->validate()) {
+      $user = user::lookup_user_by_field("hash", Input::instance()->get("key"));
+      if (empty($user)) {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+
+      $user->password = $view->content->reset->password->value;
+      $user->hash = null;
+      $user->save();
+      message::success(t("Password reset successfully"));
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $view;
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index cf5c050f..8ad52564 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -42,14 +42,14 @@ class group_Core {
    * @see Identity_Driver::everbody.
    */
   static function everybody() {
-    return Identity::instance()->everybody();
+    return model_cache::get("group", 1);
   }
 
   /**
    * @see Identity_Driver::registered_users.
    */
   static function registered_users() {
-    return Identity::instance()->everybody();
+    return model_cache::get("group", 2);
   }
 
   /**
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index fa7b320f..5ef2b726 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -25,14 +25,21 @@
  */
 class user_Core {
   /**
-   * @see Identity_Driver::guest.
+   * Return the guest user.
+   *
+   * @return User_Model the user object
    */
   static function guest() {
     return model_cache::get("user", 1);
   }
 
   /**
-   * @see Identity_Driver::create_user.
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Definition the user object
    */
   static function create($name, $full_name, $password) {
     $user = ORM::factory("user")->where("name", $name)->find();
@@ -53,7 +60,9 @@ class user_Core {
   }
 
   /**
-   * @see Identity_Driver::hash_password.
+   * Hash the password to the internal value
+   * @param string   $password the user password
+   * @param string   The hashed equivalent
    */
   static function hash_password($password) {
     require_once(MODPATH . "user/lib/PasswordHash.php");
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 77db11a3..f405b710 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -25,14 +25,14 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @see Identity_Driver::guest.
    */
   public function guest() {
-    return new Gallery_User(user::guest());
+    return user::guest();
   }
 
   /**
    * @see Identity_Driver::create_user.
    */
   public function create_user($name, $full_name, $password) {
-    return new Gallery_User(user::create($name, $full_name, $password));
+    return user::create($name, $full_name, $password);
   }
 
   /**
@@ -67,122 +67,55 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * @see Identity_Driver::hash_password.
+   * @see Identity_Driver::lookup_user.
    */
-  public function hash_password($password) {
-    return user::hash_password($password);
+  public function lookup_user($id) {
+    return user::lookup_by_field("id", $id);
   }
 
   /**
-   * @see Identity_Driver::lookup_user_by_field.
+   * @see Identity_Driver::lookup_user_by_name.
    */
-  public function lookup_user_by_field($field_name, $value) {
-    return new Gallery_User(user::lookup_by_field($field_name, $value));
+  public function lookup_user_by_name($name) {
+    return user::lookup_by_field("name", $name);
   }
 
   /**
    * @see Identity_Driver::create_group.
    */
   public function create_group($name) {
-    return new Gallery_Group(group::create($name));
+    return group::create($name);
   }
 
   /**
    * @see Identity_Driver::everybody.
    */
   public function everybody() {
-    return new Gallery_Group(group::everybody());
+    return group::everybody();
   }
 
   /**
    * @see Identity_Driver::registered_users.
    */
   public function registered_users() {
-    return new Gallery_Group(group::registered_users());
+    return group::registered_users();
   }
 
   /**
-   * @see Identity_Driver::lookup_group_by_field.
+   * @see Identity_Driver::lookup_group_by_name.
    */
-  public function lookup_group_by_field($field_name, $value) {
-    return new Gallery_Group(group::lookup_by_field($field_name, $value));
+  static function lookup_group_by_name($name) {
+    return group::lookup_by_field("name", $name);
   }
 
   /**
    * @see Identity_Driver::get_user_list.
    */
   public function get_user_list($ids) {
-    $results = ORM::factory("user")
+    return ORM::factory("user")
       ->in("id", ids)
       ->find_all()
-      ->as_array();;
-    $users = array();
-    foreach ($results as $user) {
-      $users[] = new Gallery_User($user);
-    }
-    return $users;
+      ->as_array();
   }
 } // End Identity Gallery Driver
 
-/**
- * User Data wrapper
- */
-class Gallery_User extends User_Definition {
-  /*
-   *  Not for general user, allows the back-end to easily create the interface object
-   */
-  function __construct($user) {
-    $this->user = $user;
-  }
-
-  /**
-   * @see User_Definition::avatar_url
-   */
-  public function avatar_url($size=80, $default=null) {
-    return $this->user->avatar_url($size, $default);
-  }
-
-  /**
-   * @see User_Definition::display_name
-   */
-  public function display_name() {
-    return $this->user->display_name();
-  }
-
-  public function save() {
-    $this->user->save();
-  }
-
-  public function delete() {
-    $this->user->delete();
-  }
-
-}
-
-/**
- * Group Data wrapper
- */
-class Gallery_Group extends Group_Definition {
-  /*
-   *  Not for general user, allows the back-end to easily create the interface object
-   */
-  function __construct($group) {
-    $this->group = $group;
-  }
-
-  public function save() {
-    $this->group->save();
-  }
-
-  public function delete() {
-    $this->group->delete();
-  }
-
-  public function add($user) {
-    $this->group->add($user->_uncloaked());
-  }
-
-  public function remove($user) {
-    $this->group->remove($user->_uncloaked());
-  }
-}
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 8af78012..4432fc69 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Group_Model extends ORM {
+class Group_Model extends ORM implements Group_Definition {
   protected $has_and_belongs_to_many = array("users");
 
   var $rules = array(
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index d99603b2..c51fc720 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -17,7 +17,7 @@
  * 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_Model extends ORM {
+class User_Model extends ORM implements User_Definition {
   protected $has_and_belongs_to_many = array("groups");
 
   var $rules = array(
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 7c54d93d..ee8d413c 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -91,7 +91,7 @@
                   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>
-              <? if (user::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>
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
new file mode 100644
index 00000000..92ca4917
--- /dev/null
+++ b/modules/user/views/reset_password.html.php
@@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Password Reset Request") ?> </title>
+  </head>
+  <body>
+    <h2><?= t("Password Reset Request") ?> </h2>
+    <p>
+      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
+    </p>
+    <p>
+  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
+        array("site_url" => html::mark_clean(url::base(false, "http")),
+              "confirm_url" => $confirm_url)) ?>
+    </p>
+  </body>
+</html>
-- 
cgit v1.2.3


From 7f9441c33da07b215efcb51668434b3957559fd3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 20 Oct 2009 16:32:22 -0700
Subject: Changes to Identity interface to allow for multiple Identity
 providers.  What I've tested to this point, is you can install a new
 provider, switch to it, login as administrator, uninstall the default user
 module, reinstall the user module, switch back to the user module and login.

---
 modules/gallery/controllers/admin_identity.php     | 24 +++++-
 modules/gallery/helpers/gallery_event.php          |  2 +-
 modules/gallery/libraries/Identity.php             | 37 ++++++++--
 modules/gallery/libraries/drivers/Identity.php     | 10 +++
 modules/user/helpers/user.php                      | 85 ++++++++++++++++++++++
 modules/user/helpers/user_installer.php            | 74 +------------------
 .../user/libraries/drivers/Identity/Gallery.php    | 14 ++++
 7 files changed, 164 insertions(+), 82 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index dd1cfb4b..9d756a5c 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -21,7 +21,7 @@ class Admin_Identity_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_identity.html");
-    $view->content->available = Identity::active();
+    $view->content->available = Identity::providers();
     $view->content->active = module::get_var("gallery", "identity_provider", "user");
     print $view;
   }
@@ -39,18 +39,36 @@ class Admin_Identity_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $active_provider = module::get_var("gallery", "identity_provider", "user");
-    $providers = Identity::active();
+    $providers = Identity::providers();
 
     $new_provider = $this->input->post("provider");
 
     if ($new_provider != $active_provider) {
-      module::event("identity_change", $new_provider);
+
+      module::event("pre_identity_change", $active_provider, $new_provider);
+
+      Identity::deactivate();
+
+      // Switch authentication
+      module::set_var("gallery", "identity_provider", $new_provider);
+      Identity::reset();
+
+      Identity::activate();
 
       // @todo this type of collation is questionable from an i18n perspective
       message::success(t("Changed to %description",
                          array("description" => $providers->$new_provider)));
+
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        // We don't care if there was a problem destroying the session.
+      }
+      url::redirect(item::root()->abs_url());
     }
 
+    message::info(t("The selected provider \"%description\" is already active.",
+                    array("description" => $providers->$new_provider)));
     url::redirect("admin/identity");
   }
 }
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 84b84f7d..95be4813 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -191,7 +191,7 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage Sidebar"))
                         ->url(url::site("admin/sidebar"))));
-    if (count(Identity::active()) > 1) {
+    if (count(Identity::providers()) > 1) {
       $menu
         ->append(Menu::factory("submenu")
                  ->id("identity_menu")
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index e77fd2d2..3fcb6756 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -39,13 +39,24 @@ class Identity_Core {
    * @param   string  configuration
    * @return  Identity_Core
    */
-  static function & instance($config="default") {
-   if (!isset(Identity::$instance)) {
+  static function & instance() {
+   if (!isset(self::$instance)) {
       // Create a new instance
-      Identity::$instance = new Identity($config);
+      self::$instance = new Identity();
     }
 
-    return Identity::$instance;
+    return self::$instance;
+  }
+
+  /**
+   * Returns a singleton instance of Identity.
+   * There can only be one Identity driver configured at a given point
+   *
+   * @param   string  configuration
+   * @return  Identity_Core
+   */
+  static function reset() {
+    self::$instance = new Identity();
   }
 
   /**
@@ -83,11 +94,11 @@ class Identity_Core {
   }
 
   /**
-   * Return a list of installed and activated Identity Drivers.
+   * Return a list of installed Identity Drivers.
    *
    * @return boolean true if the driver supports updates; false if read only
    */
-  static function active() {
+  static function providers() {
     if (empty(self::$active)) {
       $drivers = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
       foreach (module::active() as $module) {
@@ -102,6 +113,20 @@ class Identity_Core {
     return self::$active;
   }
 
+  /**
+   * @see Identity_Driver::activate.
+   */
+  static function activate() {
+    self::instance()->driver->activate();
+  }
+
+  /**
+   * @see Identity_Driver::deactivate.
+   */
+  static function deactivate() {
+    self::instance()->driver->deactivate();
+  }
+
   /**
    * Determine if if the current driver supports updates.
    *
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 6ab001cb..2fc4d349 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -18,6 +18,16 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 interface Identity_Driver {
+  /**
+   * Initialize the provider so it is ready to use
+   */
+  public function activate();
+
+  /**
+   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
+   */
+  public function deactivate();
+
   /**
    * Return the guest user.
    *
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 5ef2b726..446b602d 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -24,6 +24,91 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_Core {
+  /**
+   * Initialize the provider so it is ready to use
+   */
+  public function activate() {
+    $db = Database::instance();
+    $db->query("CREATE TABLE IF NOT EXISTS {users} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` varchar(32) NOT NULL,
+                 `full_name` varchar(255) NOT NULL,
+                 `password` varchar(64) NOT NULL,
+                 `login_count` int(10) unsigned NOT NULL DEFAULT 0,
+                 `last_login` int(10) unsigned NOT NULL DEFAULT 0,
+                 `email` varchar(64) default NULL,
+                 `admin` BOOLEAN default 0,
+                 `guest` BOOLEAN default 0,
+                 `hash` char(32) default NULL,
+                 `url` varchar(255) default NULL,
+                 `locale` char(10) default NULL,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`hash`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` char(64) default NULL,
+                 `special` BOOLEAN default 0,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
+                 `group_id` int(9) NOT NULL,
+                 `user_id` int(9) NOT NULL,
+                 PRIMARY KEY (`group_id`, `user_id`),
+                 UNIQUE KEY(`user_id`, `group_id`))
+               DEFAULT CHARSET=utf8;");
+
+    $everybody = group::create("Everybody");
+    $everybody->special = true;
+    $everybody->save();
+
+    $registered = group::create("Registered Users");
+    $registered->special = true;
+    $registered->save();
+
+    $guest = user::create("guest", "Guest User", "");
+    $guest->guest = true;
+    $guest->remove($registered);
+    $guest->save();
+
+    $admin = user::create("admin", "Gallery Administrator", "admin");
+    $admin->admin = true;
+    $admin->save();
+
+    // Let the admin own everything
+    $db->update("items", array("owner_id" => $admin->id), array("owner_id" => "IS NULL"));
+
+    $root = ORM::factory("item", 1);
+    access::allow($everybody, "view", $root);
+    access::allow($everybody, "view_full", $root);
+
+    access::allow($registered, "view", $root);
+    access::allow($registered, "view_full", $root);
+  }
+
+  /**
+   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
+   */
+  public function deactivate() {
+    // Delete all users and groups so that we give other modules an opportunity to clean up
+    foreach (ORM::factory("user")->find_all() as $user) {
+      $user->delete();
+    }
+
+    foreach (ORM::factory("group")->find_all() as $group) {
+      $group->delete();
+    }
+
+    $db = Database::instance();
+    $db->query("DROP TABLE IF EXISTS {users};");
+    $db->query("DROP TABLE IF EXISTS {groups};");
+    $db->query("DROP TABLE IF EXISTS {groups_users};");
+  }
+
   /**
    * Return the guest user.
    *
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 8ef4f13d..d7ad1e89 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -19,87 +19,17 @@
  */
 class user_installer {
   static function install() {
-    $db = Database::instance();
-    $db->query("CREATE TABLE IF NOT EXISTS {users} (
-                 `id` int(9) NOT NULL auto_increment,
-                 `name` varchar(32) NOT NULL,
-                 `full_name` varchar(255) NOT NULL,
-                 `password` varchar(64) NOT NULL,
-                 `login_count` int(10) unsigned NOT NULL DEFAULT 0,
-                 `last_login` int(10) unsigned NOT NULL DEFAULT 0,
-                 `email` varchar(64) default NULL,
-                 `admin` BOOLEAN default 0,
-                 `guest` BOOLEAN default 0,
-                 `hash` char(32) default NULL,
-                 `url` varchar(255) default NULL,
-                 `locale` char(10) default NULL,
-                 PRIMARY KEY (`id`),
-                 UNIQUE KEY(`hash`),
-                 UNIQUE KEY(`name`))
-               DEFAULT CHARSET=utf8;");
-
-    $db->query("CREATE TABLE IF NOT EXISTS {groups} (
-                 `id` int(9) NOT NULL auto_increment,
-                 `name` char(64) default NULL,
-                 `special` BOOLEAN default 0,
-                 PRIMARY KEY (`id`),
-                 UNIQUE KEY(`name`))
-               DEFAULT CHARSET=utf8;");
-
-    $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
-                 `group_id` int(9) NOT NULL,
-                 `user_id` int(9) NOT NULL,
-                 PRIMARY KEY (`group_id`, `user_id`),
-                 UNIQUE KEY(`user_id`, `group_id`))
-               DEFAULT CHARSET=utf8;");
-
-    $everybody = group::create("Everybody");
-    $everybody->special = true;
-    $everybody->save();
-
-    $registered = group::create("Registered Users");
-    $registered->special = true;
-    $registered->save();
-
-    $guest = user::create("guest", "Guest User", "");
-    $guest->guest = true;
-    $guest->remove($registered);
-    $guest->save();
-
-    $admin = user::create("admin", "Gallery Administrator", "admin");
-    $admin->admin = true;
-    $admin->save();
-
-    // Let the admin own everything
-    $db->update("items", array("owner_id" => $admin->id), array("owner_id" => "IS NULL"));
+    user::activate();
     module::set_version("user", 1);
-
-    $root = ORM::factory("item", 1);
-    access::allow($everybody, "view", $root);
-    access::allow($everybody, "view_full", $root);
-
-    access::allow($registered, "view", $root);
-    access::allow($registered, "view_full", $root);
   }
 
   static function uninstall() {
-    // Delete all users and groups so that we give other modules an opportunity to clean up
-    foreach (ORM::factory("user")->find_all() as $user) {
-      $user->delete();
-    }
-
-    foreach (ORM::factory("group")->find_all() as $group) {
-      $group->delete();
-    }
+    user::deactivate();
 
     try {
       Session::instance()->destroy();
     } catch (Exception $e) {
       // We don't care if there was a problem destroying the session.
     }
-    $db = Database::instance();
-    $db->query("DROP TABLE IF EXISTS {users};");
-    $db->query("DROP TABLE IF EXISTS {groups};");
-    $db->query("DROP TABLE IF EXISTS {groups_users};");
   }
 }
\ No newline at end of file
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index f405b710..f4b4d8a7 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -21,6 +21,20 @@
  * Based on the Cache_Sqlite_Driver developed by the Kohana Team
  */
 class Identity_Gallery_Driver implements Identity_Driver {
+  /**
+   * @see Identity_Driver::activate.
+   */
+  public function activate() {
+    user::activate();
+  }
+
+  /**
+   * @see Identity_Driver::deactivate.
+   */
+  public function deactivate() {
+    user::deactivate();
+  }
+
   /**
    * @see Identity_Driver::guest.
    */
-- 
cgit v1.2.3


From 3ece1a01f25270939b3c12f754d555d6ac54d375 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 20 Oct 2009 17:01:19 -0700
Subject: Add a groups api method on the Identity provider and change
 access_Core::_get_all_groups() to use this to get the defined groups.

---
 modules/gallery/helpers/access.php                  |  7 ++++---
 modules/gallery/libraries/Identity.php              | 11 +++++++++--
 modules/gallery/libraries/drivers/Identity.php      |  5 +++++
 modules/user/libraries/drivers/Identity/Gallery.php |  8 ++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index fba161e3..4e7491e3 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -419,10 +419,11 @@ class access_Core {
    * @return ORM_Iterator
    */
   private static function _get_all_groups() {
-    // When we build the gallery package, it's possible that the user module is not installed yet.
+    // When we build the gallery package, it's possible that there is no identity provider installed yet.
     // This is ok at packaging time, so work around it.
-    if (module::is_active("user")) {
-      return ORM::factory("group")->find_all();
+    $config = module::get_var("gallery", "identity_provider");
+    if (!empty($config)) {
+      return Identity::groups();
     } else {
       return array();
     }
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 3fcb6756..3ef13a6d 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -65,11 +65,11 @@ class Identity_Core {
    * @return  void
    */
   public function __construct() {
-    $name = $config = module::get_var("gallery", "identity_provider", "user");
+    $config = module::get_var("gallery", "identity_provider", "user");
 
     // Test the config group name
     if (($this->config = Kohana::config("identity.".$config)) === NULL) {
-      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
+      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $config");
     }
 
     // Set driver name
@@ -205,4 +205,11 @@ class Identity_Core {
   static function get_user_list($ids) {
     return self::instance()->driver->get_user_list($ids);
   }
+
+  /**
+   * @see Identity_Driver::groups.
+   */
+  static function groups() {
+    return self::instance()->driver->groups();
+  }
 } // End Identity
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 2fc4d349..b77eb6be 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -97,6 +97,11 @@ interface Identity_Driver {
    */
   public function get_user_list($ids);
 
+  /**
+   * List the groups defined in the Identity Provider
+   */
+  static function groups();
+
 } // End Identity Driver Definition
 
 interface Group_Definition {}
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index f4b4d8a7..8e6e204d 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -131,5 +131,13 @@ class Identity_Gallery_Driver implements Identity_Driver {
       ->find_all()
       ->as_array();
   }
+
+  /**
+   * @see Identity_Driver::groups.
+   */
+  static function groups() {
+    return ORM::factory("group")->find_all();
+  }
+
 } // End Identity Gallery Driver
 
-- 
cgit v1.2.3


From b28c758d4a98c9e877fb81f7b88f9c8597de74b6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 20 Oct 2009 17:21:33 -0700
Subject: Add lookup_group Identity provider API and change the permissions
 controller to use it to get the group it is modifying

---
 modules/gallery/controllers/permissions.php         | 6 +++---
 modules/gallery/libraries/Identity.php              | 7 +++++++
 modules/gallery/libraries/drivers/Identity.php      | 7 +++++++
 modules/user/libraries/drivers/Identity/Gallery.php | 6 +++---
 4 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 7a06c3d3..58c5b816 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -51,13 +51,13 @@ class Permissions_Controller extends Controller {
   function change($command, $group_id, $perm_id, $item_id) {
     access::verify_csrf();
 
-    $group = ORM::factory("group", $group_id);
+    $group = Identity::lookup_group($group_id);
     $perm = ORM::factory("permission", $perm_id);
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
 
-    if ($group->loaded && $perm->loaded && $item->loaded) {
+    if (!empty($group) && $perm->loaded && $item->loaded) {
       switch($command) {
       case "allow":
         access::allow($group, $perm->name, $item);
@@ -84,7 +84,7 @@ class Permissions_Controller extends Controller {
   private function _get_form($item) {
     $view = new View("permissions_form.html");
     $view->item = $item;
-    $view->groups = ORM::factory("group")->find_all();
+    $view->groups = Identity::groups();
     $view->permissions = ORM::factory("permission")->find_all();
     return $view;
   }
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index 3ef13a6d..1dd5d23b 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -192,6 +192,13 @@ class Identity_Core {
     return self::instance()->driver->everybody();
   }
 
+  /**
+   * @see Identity_Driver::lookup_group.
+   */
+  static function lookup_group($id) {
+    return self::instance()->driver->lookup_group($id);
+  }
+
   /**
    * @see Identity_Driver::lookup_group_by_name.
    */
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index b77eb6be..5b35d49b 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -97,6 +97,13 @@ interface Identity_Driver {
    */
   public function get_user_list($ids);
 
+  /**
+   * Look up a group by id.
+   * @param integer     id
+   * @return Group_Definition the user object, or null if the name was invalid.
+   */
+  static function lookup_group($id);
+
   /**
    * List the groups defined in the Identity Provider
    */
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 8e6e204d..17327c17 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -116,10 +116,10 @@ class Identity_Gallery_Driver implements Identity_Driver {
   }
 
   /**
-   * @see Identity_Driver::lookup_group_by_name.
+   * @see Identity_Driver::lookup_group.
    */
-  static function lookup_group_by_name($name) {
-    return group::lookup_by_field("name", $name);
+  static function lookup_group($id) {
+    return group::lookup_by_field("id", $id);
   }
 
   /**
-- 
cgit v1.2.3


From b49b2130729fee34b61873f20bf7822f120bc163 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 20 Oct 2009 20:29:28 -0700
Subject: Only show the user/group administration screen if the active idenity
 provider is the user module.

---
 modules/user/helpers/user_event.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 00ccbb29..7916047f 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,15 +20,18 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $user_group_menu = Menu::factory("link")
-      ->id("users_groups")
-      ->label(t("Users/Groups"))
-      ->url(url::site("admin/users"));
-    $identity_menu = $menu->get("identity_menu");
-    if (empty($identity_menu)) {
-      $menu->add_after("appearance_menu", $user_group_menu);
-    }else {
-      $identity_menu->append($user_group_menu);
+    $config = module::get_var("gallery", "identity_provider", "user");
+    if ($config == "user") {
+      $user_group_menu = Menu::factory("link")
+        ->id("users_groups")
+        ->label(t("Users/Groups"))
+        ->url(url::site("admin/users"));
+      $identity_menu = $menu->get("identity_menu");
+      if (empty($identity_menu)) {
+        $menu->add_after("appearance_menu", $user_group_menu);
+      }else {
+        $identity_menu->append($user_group_menu);
+      }
     }
     return $menu;
   }
-- 
cgit v1.2.3


From c5f89967f05fd42f606b51763df94d0860aba398 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 21 Oct 2009 08:20:41 -0700
Subject: When activating the user module set all items to be owned by the
 administrator user.

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

(limited to 'modules/user')

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 446b602d..ec4f56ae 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -80,7 +80,7 @@ class user_Core {
     $admin->save();
 
     // Let the admin own everything
-    $db->update("items", array("owner_id" => $admin->id), array("owner_id" => "IS NULL"));
+    $db->query("update {items} set owner_id = {$admin->id}");
 
     $root = ORM::factory("item", 1);
     access::allow($everybody, "view", $root);
-- 
cgit v1.2.3


From f04177f138df71e6317073b12b754a1c32d0c523 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 21 Oct 2009 11:49:42 -0700
Subject: re-add the lookup_group_by_name API Method.

---
 modules/gallery/libraries/Identity.php              |  7 +++++++
 modules/gallery/libraries/drivers/Identity.php      | 11 +++++++++--
 modules/user/libraries/drivers/Identity/Gallery.php | 13 ++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index bfc523f4..1dd5d23b 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -199,6 +199,13 @@ class Identity_Core {
     return self::instance()->driver->lookup_group($id);
   }
 
+  /**
+   * @see Identity_Driver::lookup_group_by_name.
+   */
+  static function lookup_group_by_name($name) {
+    return self::instance()->driver->lookup_group_by_name($name);
+  }
+
   /**
    * @see Identity_Driver::get_user_list.
    */
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 5b35d49b..39b2a9c7 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -102,12 +102,19 @@ interface Identity_Driver {
    * @param integer     id
    * @return Group_Definition the user object, or null if the name was invalid.
    */
-  static function lookup_group($id);
+  public function lookup_group($id);
+
+  /**
+   * Look up the group by name.
+   * @param string     $name the name of the group to locate
+   * @return Group_Definition
+   */
+  public function lookup_group_by_name($name);
 
   /**
    * List the groups defined in the Identity Provider
    */
-  static function groups();
+  public function groups();
 
 } // End Identity Driver Definition
 
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 17327c17..36f37543 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -118,16 +118,23 @@ class Identity_Gallery_Driver implements Identity_Driver {
   /**
    * @see Identity_Driver::lookup_group.
    */
-  static function lookup_group($id) {
+  public function lookup_group($id) {
     return group::lookup_by_field("id", $id);
   }
 
+  /**
+   * @see Identity_Driver::lookup_group_by_name.
+   */
+  public function lookup_group_by_name($name) {
+    return group::lookup_by_field("name", $name);
+  }
+
   /**
    * @see Identity_Driver::get_user_list.
    */
   public function get_user_list($ids) {
     return ORM::factory("user")
-      ->in("id", ids)
+      ->in("id", $ids)
       ->find_all()
       ->as_array();
   }
@@ -135,7 +142,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
   /**
    * @see Identity_Driver::groups.
    */
-  static function groups() {
+  public function groups() {
     return ORM::factory("group")->find_all();
   }
 
-- 
cgit v1.2.3


From 21383dddc372c26e1de30c0d17d1e308428ce033 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 21 Oct 2009 11:52:55 -0700
Subject: Make sure we set the active identity provider when the user module is
 installed.  This is mostly for the unit_tests as when the gallery3 installer
 is used, the user module is activated by default.

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

(limited to 'modules/user')

diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index d7ad1e89..1410f1ef 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -20,6 +20,7 @@
 class user_installer {
   static function install() {
     user::activate();
+    module::set_var("gallery", "identity_provider", "user");
     module::set_version("user", 1);
   }
 
-- 
cgit v1.2.3


From 3c936d661a088fb43b47eb5b208958180e8f65eb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 22 Oct 2009 13:09:20 -0700
Subject: Change the name of identity library from Identity to
 IdentityProvider. Create a helper class called identity to simplify call the
 Identity Provider. Move the contents of MY_Session.php to the new helper
 class and remove the MY_Session class

---
 modules/akismet/tests/Akismet_Helper_Test.php      |   2 +-
 modules/comment/controllers/comments.php           |   8 +-
 modules/comment/helpers/comment.php                |   2 +-
 modules/comment/models/comment.php                 |   2 +-
 modules/comment/tests/Comment_Event_Test.php       |   2 +-
 modules/comment/tests/Comment_Helper_Test.php      |   4 +-
 modules/comment/tests/Comment_Model_Test.php       |   8 +-
 modules/digibug/controllers/digibug.php            |   2 +-
 modules/digibug/tests/Digibug_Controller_Test.php  |   4 +-
 modules/g2_import/helpers/g2_import.php            |  16 +-
 modules/gallery/controllers/admin.php              |   2 +-
 modules/gallery/controllers/admin_identity.php     |  10 +-
 modules/gallery/controllers/albums.php             |   4 +-
 modules/gallery/controllers/l10n_client.php        |   4 +-
 modules/gallery/controllers/login.php              |   8 +-
 modules/gallery/controllers/logout.php             |   2 +-
 modules/gallery/controllers/permissions.php        |   6 +-
 modules/gallery/controllers/upgrader.php           |   4 +-
 modules/gallery/controllers/welcome_message.php    |   4 +-
 modules/gallery/helpers/access.php                 |   4 +-
 modules/gallery/helpers/gallery.php                |   2 +-
 modules/gallery/helpers/gallery_event.php          |  10 +-
 modules/gallery/helpers/gallery_installer.php      |   2 +-
 modules/gallery/helpers/gallery_theme.php          |   2 +-
 modules/gallery/helpers/identity.php               | 225 +++++++++++++++++++++
 modules/gallery/helpers/item.php                   |   4 +-
 modules/gallery/helpers/locales.php                |   2 +-
 modules/gallery/helpers/log.php                    |   2 +-
 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             | 222 --------------------
 modules/gallery/libraries/IdentityProvider.php     | 200 ++++++++++++++++++
 modules/gallery/libraries/MY_Session.php           |  93 ---------
 modules/gallery/libraries/Theme_View.php           |   6 +-
 modules/gallery/libraries/drivers/Identity.php     | 123 -----------
 .../gallery/libraries/drivers/IdentityProvider.php | 123 +++++++++++
 modules/gallery/models/item.php                    |   2 +-
 modules/gallery/models/log.php                     |   2 +-
 modules/gallery/models/task.php                    |   2 +-
 modules/gallery/tests/Access_Helper_Test.php       | 144 ++++++-------
 modules/gallery/tests/Albums_Controller_Test.php   |   4 +-
 modules/gallery/tests/Item_Helper_Test.php         |   6 +-
 modules/gallery/tests/Photos_Controller_Test.php   |   6 +-
 modules/gallery/views/kohana_error_page.php        |   2 +-
 modules/gallery/views/login.html.php               |   2 +-
 modules/gallery/views/login_ajax.html.php          |   2 +-
 modules/notification/helpers/notification.php      |  10 +-
 .../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/password.php              |   2 +-
 modules/user/controllers/users.php                 |   4 +-
 modules/user/helpers/group.php                     |  18 +-
 .../user/libraries/drivers/Identity/Gallery.php    | 150 --------------
 .../libraries/drivers/IdentityProvider/Gallery.php | 150 ++++++++++++++
 modules/user/views/admin_users.html.php            |   2 +-
 62 files changed, 885 insertions(+), 769 deletions(-)
 create mode 100644 modules/gallery/helpers/identity.php
 delete mode 100644 modules/gallery/libraries/Identity.php
 create mode 100644 modules/gallery/libraries/IdentityProvider.php
 delete mode 100644 modules/gallery/libraries/MY_Session.php
 delete mode 100644 modules/gallery/libraries/drivers/Identity.php
 create mode 100644 modules/gallery/libraries/drivers/IdentityProvider.php
 delete mode 100644 modules/user/libraries/drivers/Identity/Gallery.php
 create mode 100644 modules/user/libraries/drivers/IdentityProvider/Gallery.php

(limited to 'modules/user')

diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index 6788e7a3..745b455c 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -26,7 +26,7 @@ class Akismet_Helper_Test extends Unit_Test_Case {
 
     $root = ORM::factory("item", 1);
     $this->_comment = comment::create(
-      $root, Identity::guest(), "This is a comment",
+      $root, identity::guest(), "This is a comment",
       "John Doe", "john@gallery2.org", "http://gallery2.org");
     foreach ($this->_comment->list_fields("comments") as $name => $field) {
       if (strpos($name, "server_") === 0) {
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index c0658cc1..09b9c607 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 (Session::active_user()->guest && !$form->add_comment->inputs["name"]->value) {
+      if (identity::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, Session::active_user(),
+        $item, identity::active_user(),
         $form->add_comment->text->value,
         $form->add_comment->inputs["name"]->value,
         $form->add_comment->email->value,
         $form->add_comment->url->value);
 
-      $active = Session::active_user();
+      $active = identity::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 (!Session::active_user()->admin) {
+    if (!identity::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 e741266d..53d58afa 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 = Session::active_user();
+    $active = identity::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/models/comment.php b/modules/comment/models/comment.php
index 5e29e778..bb9b8833 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -23,7 +23,7 @@ class Comment_Model extends ORM {
   }
 
   function author() {
-    return Identity::lookup_user($this->author_id);
+    return identity::lookup_user($this->author_id);
   }
 
   function author_name() {
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index eb301893..f650cabf 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -22,7 +22,7 @@ class Comment_Event_Test extends Unit_Test_Case {
     $rand = rand();
     $album = album::create(ORM::factory("item", 1), "test_$rand", "test_$rand");
     $comment = comment::create(
-      $album, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $album, identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $album->delete();
 
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index e8ab7c79..c635c3b7 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -48,7 +48,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $comment = comment::create(
-      $root, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $root, identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $this->assert_equal("name_$rand", $comment->author_name());
     $this->assert_equal("email_$rand", $comment->author_email());
@@ -77,7 +77,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function create_comment_for_user_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
-    $admin = Identity::lookup_user(2);
+    $admin = identity::lookup_user(2);
     $comment = comment::create(
       $root, $admin, "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index 84532a96..de19648d 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -22,17 +22,17 @@ class Comment_Model_Test extends Unit_Test_Case {
   public function cant_view_comments_for_unviewable_items_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), rand(), rand());
-    $comment = comment::create($album, Identity::guest(), "text", "name", "email", "url");
-    Session::set_active_user(Identity::guest());
+    $comment = comment::create($album, identity::guest(), "text", "name", "email", "url");
+    identity::set_active_user(identity::guest());
 
     // We can see the comment when permissions are granted on the album
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
-    access::deny(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index 8ea83601..1bb2691b 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -23,7 +23,7 @@ class Digibug_Controller extends Controller {
     $item = ORM::factory("item", $id);
     access::required("view", $item);
 
-    if (access::group_can(Identity::everybody(), "view_full", $item)) {
+    if (access::group_can(identity::everybody(), "view_full", $item)) {
       $full_url = $item->file_url(true);
       $thumb_url = $item->thumb_url(true);
     } else {
diff --git a/modules/digibug/tests/Digibug_Controller_Test.php b/modules/digibug/tests/Digibug_Controller_Test.php
index 19f57972..a56d58bb 100644
--- a/modules/digibug/tests/Digibug_Controller_Test.php
+++ b/modules/digibug/tests/Digibug_Controller_Test.php
@@ -35,8 +35,8 @@ class Digibug_Controller_Test extends Unit_Test_Case {
 
     $root = ORM::factory("item", 1);
     $this->_album = album::create($root,  rand(), "test album");
-    access::deny(Identity::everybody(), "view_full", $this->_album);
-    access::deny(Identity::registered_users(), "view_full", $this->_album);
+    access::deny(identity::everybody(), "view_full", $this->_album);
+    access::deny(identity::registered_users(), "view_full", $this->_album);
 
     $rand = rand();
     $this->_item = photo::create($this->_album, MODPATH . "gallery/tests/test.jpg", "$rand.jpg",
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index d24aab93..f55e7f32 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -230,16 +230,16 @@ class g2_import_Core {
     switch ($g2_group->getGroupType()) {
     case GROUP_NORMAL:
       try {
-        $group = Identity::create_group($g2_group->getGroupName());
+        $group = identity::create_group($g2_group->getGroupName());
       } catch (Exception $e) {
         // @todo For now we assume this is a "duplicate group" exception
-        $group = Identity::lookup_user_by_name($g2_group->getGroupname());
+        $group = identity::lookup_user_by_name($g2_group->getGroupname());
       }
       $message = t("Group '%name' was imported", array("name" => $g2_group->getGroupname()));
       break;
 
     case GROUP_ALL_USERS:
-      $group = Identity::registered_users();
+      $group = identity::registered_users();
       $message = t("Group 'Registered' was converted to '%name'", array("name" => $group->name));
       break;
 
@@ -248,7 +248,7 @@ class g2_import_Core {
       break;  // This is not a group in G3
 
     case GROUP_EVERYBODY:
-      $group = Identity::everybody();
+      $group = identity::everybody();
       $message = t("Group 'Everybody' was converted to '%name'", array("name" => $group->name));
       break;
     }
@@ -270,7 +270,7 @@ class g2_import_Core {
     }
 
     if (g2(GalleryCoreApi::isAnonymousUser($g2_user_id))) {
-      self::set_map($g2_user_id, Identity::guest()->id);
+      self::set_map($g2_user_id, identity::guest()->id);
       return t("Skipping Anonymous User");
     }
 
@@ -285,11 +285,11 @@ class g2_import_Core {
     $g2_groups = g2(GalleryCoreApi::fetchGroupsForUser($g2_user->getId()));
 
     try {
-      $user = Identity::create_user($g2_user->getUsername(), $g2_user->getfullname(), "");
+      $user = identity::create_user($g2_user->getUsername(), $g2_user->getfullname(), "");
       $message = t("Created user: '%name'.", array("name" => $user->name));
     } catch (Exception $e) {
       // @todo For now we assume this is a "duplicate user" exception
-      $user = Identity::lookup_user_by_name($g2_user->getUsername());
+      $user = identity::lookup_user_by_name($g2_user->getUsername());
       $message = t("Loaded existing user: '%name'.", array("name" => $user->name));
     }
 
@@ -301,7 +301,7 @@ class g2_import_Core {
         $user->admin = true;
         $message .= t("\n\tAdded 'admin' flag to user");
       } else {
-        $group = Identity::lookup_group(self::map($g2_group_id));
+        $group = identity::lookup_group(self::map($g2_group_id));
         $user->add($group);
         $message .= t("\n\tAdded user to group '%group'.", array("group" => $group->name));
       }
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 24eebe7d..98cac557 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 (!(Session::active_user()->admin)) {
+    if (!(identity::active_user()->admin)) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index 9d756a5c..d06132ff 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -21,7 +21,7 @@ class Admin_Identity_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_identity.html");
-    $view->content->available = Identity::providers();
+    $view->content->available = identity::providers();
     $view->content->active = module::get_var("gallery", "identity_provider", "user");
     print $view;
   }
@@ -39,7 +39,7 @@ class Admin_Identity_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $active_provider = module::get_var("gallery", "identity_provider", "user");
-    $providers = Identity::providers();
+    $providers = identity::providers();
 
     $new_provider = $this->input->post("provider");
 
@@ -47,13 +47,13 @@ class Admin_Identity_Controller extends Admin_Controller {
 
       module::event("pre_identity_change", $active_provider, $new_provider);
 
-      Identity::deactivate();
+      identity::deactivate();
 
       // Switch authentication
       module::set_var("gallery", "identity_provider", $new_provider);
-      Identity::reset();
+      identity::reset();
 
-      Identity::activate();
+      identity::activate();
 
       // @todo this type of collation is questionable from an i18n perspective
       message::success(t("Changed to %description",
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index fabf67ce..24ceb0c9 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -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"),
-        Session::active_user()->id,
+        identity::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"),
-        Session::active_user()->id);
+        identity::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 2ab73102..6db67d3b 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 (!Session::active_user()->admin) {
+    if (!identity::active_user()->admin) {
       access::forbidden();
     }
 
@@ -85,7 +85,7 @@ class L10n_Client_Controller extends Controller {
 
   public function toggle_l10n_mode() {
     access::verify_csrf();
-    if (!Session::active_user()->admin) {
+    if (!identity::active_user()->admin) {
       access::forbidden();
     }
 
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 4c83d647..86e2b0a4 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -58,8 +58,8 @@ class Login_Controller extends Controller {
     $form = login::get_login_form($url);
     $valid = $form->validate();
     if ($valid) {
-      $user = Identity::lookup_user_by_name($form->login->inputs["name"]->value);
-      if (empty($user) || !Identity::is_correct_password($user, $form->login->password->value)) {
+      $user = identity::lookup_user_by_name($form->login->inputs["name"]->value);
+      if (empty($user) || !identity::is_correct_password($user, $form->login->password->value)) {
         log::warning(
           "user",
           t("Failed login for %name",
@@ -70,12 +70,12 @@ class Login_Controller extends Controller {
     }
 
     if ($valid) {
-      if (Identity::is_writable()) {
+      if (identity::is_writable()) {
         $user->login_count += 1;
         $user->last_login = time();
         $user->save();
       }
-      Session::set_active_user($user);
+      identity::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 058860fa..1b0364fd 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -19,7 +19,7 @@
  */
 class Logout_Controller extends Controller {
   public function index() {
-    $user = Session::active_user();
+    $user = identity::active_user();
     if (!$user->guest) {
       try {
         Session::instance()->destroy();
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 58c5b816..99943fbb 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -51,7 +51,7 @@ class Permissions_Controller extends Controller {
   function change($command, $group_id, $perm_id, $item_id) {
     access::verify_csrf();
 
-    $group = Identity::lookup_group($group_id);
+    $group = identity::lookup_group($group_id);
     $perm = ORM::factory("permission", $perm_id);
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
@@ -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(Session::active_user(), "edit", $item)) {
+        if (!access::user_can(identity::active_user(), "edit", $item)) {
           access::allow($group, $perm->name, $item);
         }
       }
@@ -84,7 +84,7 @@ class Permissions_Controller extends Controller {
   private function _get_form($item) {
     $view = new View("permissions_form.html");
     $view->item = $item;
-    $view->groups = Identity::groups();
+    $view->groups = identity::groups();
     $view->permissions = ORM::factory("permission")->find_all();
     return $view;
   }
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index e0c5d340..1aa607ef 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 = Session::active_user()->admin || $session->get("can_upgrade");
+    $view->can_upgrade = identity::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 (!Session::active_user()->admin && !Session::instance()->get("can_upgrade", false)) {
+    } else if (!identity::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 cfdc3976..af0d6997 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 (!Session::active_user()->admin) {
+    if (!identity::active_user()->admin) {
       url::redirect(item::root()->abs_url());
     }
 
     $v = new View("welcome_message.html");
-    $v->user = Session::active_user();
+    $v->user = identity::active_user();
     print $v;
   }
 }
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 4e7491e3..a3abbe2e 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(Session::active_user(), $perm_name, $item);
+    return self::user_can(identity::active_user(), $perm_name, $item);
   }
 
   /**
@@ -423,7 +423,7 @@ class access_Core {
     // This is ok at packaging time, so work around it.
     $config = module::get_var("gallery", "identity_provider");
     if (!empty($config)) {
-      return Identity::groups();
+      return identity::groups();
     } else {
       return array();
     }
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 18bb2609..84f8a7fb 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) && !Session::active_user()->admin) {
+    if (Router::$controller != "login" && !empty($maintenance_mode) && !identity::active_user()->admin) {
       Router::$controller = "maintenance";
       Router::$controller_path = MODPATH . "gallery/controllers/maintenance.php";
       Router::$method = "index";
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 95be4813..b6afa2c8 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,11 +23,7 @@ class gallery_event_Core {
    * Initialization.
    */
   static function gallery_ready() {
-    // Call Identity::instance() now to force the load of the user interface classes.
-    // 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();
-    Session::load_user();
+    identity::load_user();
     locales::set_request_locale();
   }
 
@@ -139,7 +135,7 @@ class gallery_event_Core {
         }
       }
 
-      if (Session::active_user()->admin) {
+      if (identity::active_user()->admin) {
         $menu->append($admin_menu = Menu::factory("submenu")
                 ->id("admin_menu")
                 ->label(t("Admin")));
@@ -191,7 +187,7 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage Sidebar"))
                         ->url(url::site("admin/sidebar"))));
-    if (count(Identity::providers()) > 1) {
+    if (count(identity::providers()) > 1) {
       $menu
         ->append(Menu::factory("submenu")
                  ->id("identity_menu")
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 10e796fd..9c19eaed 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -317,7 +317,7 @@ class gallery_installer {
     }
 
     if ($version == 7) {
-      $groups = Identity::groups();
+      $groups = identity::groups();
       $permissions = ORM::factory("permission")->find_all();
       foreach($groups as $group) {
         foreach($permissions as $permission) {
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d21cb124..5f3eb2a9 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 = Session::active_user();
+      $view->user = identity::active_user();
       return $view->render();
     }
   }
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
new file mode 100644
index 00000000..cf84c8a9
--- /dev/null
+++ b/modules/gallery/helpers/identity.php
@@ -0,0 +1,225 @@
+<?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 identity_Core {
+  protected static $available;
+
+  /**
+   * Return a list of installed Identity Drivers.
+   *
+   * @return boolean true if the driver supports updates; false if read only
+   */
+  static function providers() {
+    if (empty(self::$available)) {
+      $drivers = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+      foreach (module::available() as $module_name => $module) {
+        if (file_exists(MODPATH . "{$module_name}/config/identity.php")) {
+          $drivers->$module_name = $module->description;
+        }
+      }
+      self::$available = $drivers;
+    }
+    return self::$available;
+  }
+
+  /**
+   * Make sure that we have a session and group_ids cached in the session.
+   */
+  static function load_user() {
+    //try {
+      // Call IdentityProvider::instance() now to force the load of the user interface classes.
+      // We are about to load the active user from the session and which needs the user definition
+      // class, which can't be reached by Kohana's heiracrchical lookup.
+      IdentityProvider::instance();
+
+      $session = Session::instance();
+      if (!($user = $session->get("user"))) {
+        self::set_active_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 = IdentityProvider::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);
+      }
+      //} catch (Exception $e) {
+      //try {
+      //Session::instance()->destroy();
+      //} catch (Exception $e) {
+        // We don't care if there was a problem destroying the session.
+      //}
+      //url::redirect(item::root()->abs_url());
+      //}
+  }
+
+  /**
+   * 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));
+  }
+
+  /**
+   * 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 = 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 = 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();
+  }
+
+  /**
+   * Determine if if the current driver supports updates.
+   *
+   * @return boolean true if the driver supports updates; false if read only
+   */
+  static function is_writable() {
+    return IdentityProvider::instance()->is_writable();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::activate.
+   */
+  static function activate() {
+    IdentityProvider::instance()->activate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::deactivate.
+   */
+  static function deactivate() {
+    IdentityProvider::instance()->deactivate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::guest.
+   */
+  static function guest() {
+    return IdentityProvider::instance()->guest();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_user.
+   */
+  static function create_user($name, $full_name, $password) {
+    return IdentityProvider::instance()->create_user($name, $full_name, $password);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::is_correct_password.
+   */
+  static function is_correct_password($user, $password) {
+    return IdentityProvider::instance()->is_correct_password($user, $password);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user.
+   */
+  static function lookup_user($id) {
+    return IdentityProvider::instance()->lookup_user($id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user_by_name.
+   */
+  static function lookup_user_by_name($name) {
+    return IdentityProvider::instance()->lookup_user_by_name($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_group.
+   */
+  static function create_group($name) {
+    return IdentityProvider::instance()->create_group($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::everybody.
+   */
+  static function everybody() {
+    return IdentityProvider::instance()->everybody();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::registered_users.
+   */
+  static function registered_users() {
+    return IdentityProvider::instance()->everybody();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group.
+   */
+  static function lookup_group($id) {
+    return IdentityProvider::instance()->lookup_group($id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group_by_name.
+   */
+  static function lookup_group_by_name($name) {
+    return IdentityProvider::instance()->lookup_group_by_name($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::get_user_list.
+   */
+  static function get_user_list($ids) {
+    return IdentityProvider::instance()->get_user_list($ids);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::groups.
+   */
+  static function groups() {
+    return IdentityProvider::instance()->groups();
+  }
+}
\ No newline at end of file
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 3d36a324..b3b6d0bb 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 (!Session::active_user()->admin) {
-      foreach (Session::group_ids_for_active_user() as $id) {
+    if (!identity::active_user()->admin) {
+      foreach (identity::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 f80fce03..c2a606cd 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 = Session::active_user()->locale;
+      $locale = identity::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 d1b34e3a..184b0b97 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 = Session::active_user()->id;
+    $log->user_id = identity::active_user()->id;
     $log->save();
   }
 
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 9541f20e..6dac0803 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 : Session::active_user()->id;
+    $movie->owner_id = $owner_id ? $owner_id : identity::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 193293e8..01cf5278 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 : Session::active_user()->id;
+    $photo->owner_id = $owner_id ? $owner_id : identity::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 06b29fda..2b090776 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 (!Session::active_user()->admin) {
+    if (!identity::active_user()->admin) {
       return;
     }
     $buf = array();
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index f84fd10e..dac5f9d3 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 = Session::active_user()->id;
+    $task->owner_id = identity::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 74a08c77..6eedec0d 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 (Session::active_user()->admin) {
+    if (identity::active_user()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
     $this->sidebar = "";
     $this->set_global("theme", $this);
-    $this->set_global("user", Session::active_user());
+    $this->set_global("user", identity::active_user());
   }
 
   public function admin_menu() {
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
deleted file mode 100644
index 1dd5d23b..00000000
--- a/modules/gallery/libraries/Identity.php
+++ /dev/null
@@ -1,222 +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.
- */
-
-/**
- * Provides a driver-based interface for managing users and groups.
- */
-class Identity_Core {
-  protected static $instance;
-
-  protected static $active;
-
-  // Configuration
-  protected $config;
-
-  // Driver object
-  protected $driver;
-
-  /**
-   * Returns a singleton instance of Identity.
-   * There can only be one Identity driver configured at a given point
-   *
-   * @param   string  configuration
-   * @return  Identity_Core
-   */
-  static function & instance() {
-   if (!isset(self::$instance)) {
-      // Create a new instance
-      self::$instance = new Identity();
-    }
-
-    return self::$instance;
-  }
-
-  /**
-   * Returns a singleton instance of Identity.
-   * There can only be one Identity driver configured at a given point
-   *
-   * @param   string  configuration
-   * @return  Identity_Core
-   */
-  static function reset() {
-    self::$instance = new Identity();
-  }
-
-  /**
-   * Loads the configured driver and validates it.
-   *
-   * @return  void
-   */
-  public function __construct() {
-    $config = module::get_var("gallery", "identity_provider", "user");
-
-    // Test the config group name
-    if (($this->config = Kohana::config("identity.".$config)) === NULL) {
-      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $config");
-    }
-
-    // Set driver name
-    $driver = "Identity_".ucfirst($this->config["driver"])."_Driver";
-
-    // Load the driver
-    if ( ! Kohana::auto_load($driver)) {
-      throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
-                                 get_class($this));
-    }
-
-    // Initialize the driver
-    $this->driver = new $driver($this->config["params"]);
-
-    // Validate the driver
-    if ( !($this->driver instanceof Identity_Driver)) {
-      throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
-                                 get_class($this), "Identity_Driver");
-    }
-
-    Kohana::log("debug", "Identity Library initialized");
-  }
-
-  /**
-   * Return a list of installed Identity Drivers.
-   *
-   * @return boolean true if the driver supports updates; false if read only
-   */
-  static function providers() {
-    if (empty(self::$active)) {
-      $drivers = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-      foreach (module::active() as $module) {
-        $module_name = $module->name;
-        if (file_exists(MODPATH . "{$module->name}/config/identity.php") &&
-            ($info = module::info($module_name))) {
-          $drivers->$module_name = $info->description;
-        }
-      }
-      self::$active = $drivers;
-    }
-    return self::$active;
-  }
-
-  /**
-   * @see Identity_Driver::activate.
-   */
-  static function activate() {
-    self::instance()->driver->activate();
-  }
-
-  /**
-   * @see Identity_Driver::deactivate.
-   */
-  static function deactivate() {
-    self::instance()->driver->deactivate();
-  }
-
-  /**
-   * Determine if if the current driver supports updates.
-   *
-   * @return boolean true if the driver supports updates; false if read only
-   */
-  static function is_writable() {
-    return !empty(self::instance()->config["allow_updates"]);
-  }
-
-  /**
-   * @see Identity_Driver::guest.
-   */
-  static function guest() {
-    return self::instance()->driver->guest();
-  }
-
-  /**
-   * @see Identity_Driver::create_user.
-   */
-  static function create_user($name, $full_name, $password) {
-    return self::instance()->driver->create_user($name, $full_name, $password);
-  }
-
-  /**
-   * @see Identity_Driver::is_correct_password.
-   */
-  static function is_correct_password($user, $password) {
-    return self::instance()->driver->is_correct_password($user, $password);
-  }
-
-  /**
-   * @see Identity_Driver::lookup_user.
-   */
-  static function lookup_user($id) {
-    return self::instance()->driver->lookup_user($id);
-  }
-
-  /**
-   * @see Identity_Driver::lookup_user_by_name.
-   */
-  static function lookup_user_by_name($name) {
-    return self::instance()->driver->lookup_user_by_name($name);
-  }
-
-  /**
-   * @see Identity_Driver::create_group.
-   */
-  static function create_group($name) {
-    return self::instance()->driver->create_group($name);
-  }
-
-  /**
-   * @see Identity_Driver::everybody.
-   */
-  static function everybody() {
-    return self::instance()->driver->everybody();
-  }
-
-  /**
-   * @see Identity_Driver::registered_users.
-   */
-  static function registered_users() {
-    return self::instance()->driver->everybody();
-  }
-
-  /**
-   * @see Identity_Driver::lookup_group.
-   */
-  static function lookup_group($id) {
-    return self::instance()->driver->lookup_group($id);
-  }
-
-  /**
-   * @see Identity_Driver::lookup_group_by_name.
-   */
-  static function lookup_group_by_name($name) {
-    return self::instance()->driver->lookup_group_by_name($name);
-  }
-
-  /**
-   * @see Identity_Driver::get_user_list.
-   */
-  static function get_user_list($ids) {
-    return self::instance()->driver->get_user_list($ids);
-  }
-
-  /**
-   * @see Identity_Driver::groups.
-   */
-  static function groups() {
-    return self::instance()->driver->groups();
-  }
-} // End Identity
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
new file mode 100644
index 00000000..512f28eb
--- /dev/null
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -0,0 +1,200 @@
+<?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.
+ */
+
+/**
+ * Provides a driver-based interface for managing users and groups.
+ */
+class IdentityProvider_Core {
+  protected static $instance;
+
+  // Configuration
+  protected $config;
+
+  // Driver object
+  protected $driver;
+
+  /**
+   * Returns a singleton instance of Identity.
+   * There can only be one Identity driver configured at a given point
+   *
+   * @param   string  configuration
+   * @return  Identity_Core
+   */
+  static function & instance() {
+   if (!isset(self::$instance)) {
+      // Create a new instance
+      self::$instance = new IdentityProvider();
+    }
+
+    return self::$instance;
+  }
+
+  /**
+   * Returns a singleton instance of Identity.
+   * There can only be one Identity driver configured at a given point
+   *
+   * @param   string  configuration
+   * @return  Identity_Core
+   */
+  static function reset() {
+    self::$instance = new IdentityProvider();
+  }
+
+  /**
+   * Loads the configured driver and validates it.
+   *
+   * @return  void
+   */
+  public function __construct() {
+    $config = module::get_var("gallery", "identity_provider", "user");
+
+    // Test the config group name
+    if (($this->config = Kohana::config("identity.".$config)) === NULL) {
+      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $config");
+    }
+
+    // Set driver name
+    $driver = "IdentityProvider_".ucfirst($this->config["driver"])."_Driver";
+
+    // Load the driver
+    if ( ! Kohana::auto_load($driver)) {
+      throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
+                                 get_class($this));
+    }
+
+    // Initialize the driver
+    $this->driver = new $driver($this->config["params"]);
+
+    // Validate the driver
+    if ( !($this->driver instanceof IdentityProvider_Driver)) {
+      throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
+                                 get_class($this), "IdentityProvider_Driver");
+    }
+
+    Kohana::log("debug", "Identity Library initialized");
+  }
+
+  /**
+   * Determine if if the current driver supports updates.
+   *
+   * @return boolean true if the driver supports updates; false if read only
+   */
+  public function is_writable() {
+    return !empty($this->config["allow_updates"]);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::activate.
+   */
+  public function activate() {
+    $this->driver->activate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::deactivate.
+   */
+  public function deactivate() {
+    $this->driver->deactivate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::guest.
+   */
+  public function guest() {
+    return $this->driver->guest();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_user.
+   */
+  public function create_user($name, $full_name, $password) {
+    return $this->driver->create_user($name, $full_name, $password);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::is_correct_password.
+   */
+  public function is_correct_password($user, $password) {
+    return $this->driver->is_correct_password($user, $password);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user.
+   */
+  public function lookup_user($id) {
+    return $this->driver->lookup_user($id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user_by_name.
+   */
+  public function lookup_user_by_name($name) {
+    return $this->driver->lookup_user_by_name($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_group.
+   */
+  public function create_group($name) {
+    return $this->driver->create_group($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::everybody.
+   */
+  public function everybody() {
+    return $this->driver->everybody();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::registered_users.
+   */
+  public function registered_users() {
+    return $this->driver->everybody();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group.
+   */
+  public function lookup_group($id) {
+    return $this->driver->lookup_group($id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group_by_name.
+   */
+  public function lookup_group_by_name($name) {
+    return $this->driver->lookup_group_by_name($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::get_user_list.
+   */
+  public function get_user_list($ids) {
+    return $this->driver->get_user_list($ids);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::groups.
+   */
+  public function groups() {
+    return $this->driver->groups();
+  }
+} // End Identity
diff --git a/modules/gallery/libraries/MY_Session.php b/modules/gallery/libraries/MY_Session.php
deleted file mode 100644
index 1a3ae801..00000000
--- a/modules/gallery/libraries/MY_Session.php
+++ /dev/null
@@ -1,93 +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 Session extends Session_Core {
-  /**
-   * Make sure that we have a session and group_ids cached in the session.
-   */
-  static function load_user() {
-    try {
-      $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);
-      }
-    } catch (Exception $e) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        // We don't care if there was a problem destroying the session.
-      }
-      url::redirect(item::root()->abs_url());
-    }
-  }
-
-  /**
-   * 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 2fdc7531..68ec325f 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 (Session::active_user()->admin) {
+    if (identity::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", Session::active_user());
+    $this->set_global("user", identity::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) && Session::active_user()->admin) {
+    if (empty($sidebar) && identity::active_user()->admin) {
       $sidebar = new View("no_sidebar.html");
     }
     return $sidebar;
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
deleted file mode 100644
index 39b2a9c7..00000000
--- a/modules/gallery/libraries/drivers/Identity.php
+++ /dev/null
@@ -1,123 +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.
- */
-interface Identity_Driver {
-  /**
-   * Initialize the provider so it is ready to use
-   */
-  public function activate();
-
-  /**
-   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
-   */
-  public function deactivate();
-
-  /**
-   * Return the guest user.
-   *
-   * @return User_Definition the user object
-   */
-  public function guest();
-
-  /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Definition the user object
-   */
-  public function create_user($name, $full_name, $password);
-
-  /**
-   * Is the password provided correct?
-   *
-   * @param user User_Definition the user object
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
-   */
-  public function is_correct_password($user, $password);
-
-  /**
-   * Look up a user by id.
-   * @param integer     id
-   * @return User_Definition the user object, or null if the name was invalid.
-   */
-  public function lookup_user($id);
-
-  /**
-   * Look up a user by name.
-   * @param string      name
-  * @return User_Definition the user object, or null if the name was invalid.
-   */
-  public function lookup_user_by_name($name);
-
-  /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Definition the group object
-   */
-  public function create_group($name);
-
-  /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Definition the group object
-   */
-  public function everybody();
-
-  /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Definition the group object
-   */
-  public function registered_users();
-
-  /**
-   * List the users
-   * @param array      array of ids to return the user objects for
-   * @return array     the user list.
-   */
-  public function get_user_list($ids);
-
-  /**
-   * Look up a group by id.
-   * @param integer     id
-   * @return Group_Definition the user object, or null if the name was invalid.
-   */
-  public function lookup_group($id);
-
-  /**
-   * Look up the group by name.
-   * @param string     $name the name of the group to locate
-   * @return Group_Definition
-   */
-  public function lookup_group_by_name($name);
-
-  /**
-   * List the groups defined in the Identity Provider
-   */
-  public function groups();
-
-} // End Identity Driver Definition
-
-interface Group_Definition {}
-
-interface User_Definition {}
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
new file mode 100644
index 00000000..8a578d1b
--- /dev/null
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -0,0 +1,123 @@
+<?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.
+ */
+interface IdentityProvider_Driver {
+  /**
+   * Initialize the provider so it is ready to use
+   */
+  public function activate();
+
+  /**
+   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
+   */
+  public function deactivate();
+
+  /**
+   * Return the guest user.
+   *
+   * @return User_Definition the user object
+   */
+  public function guest();
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Definition the user object
+   */
+  public function create_user($name, $full_name, $password);
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User_Definition the user object
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  public function is_correct_password($user, $password);
+
+  /**
+   * Look up a user by id.
+   * @param integer     id
+   * @return User_Definition the user object, or null if the name was invalid.
+   */
+  public function lookup_user($id);
+
+  /**
+   * Look up a user by name.
+   * @param string      name
+  * @return User_Definition the user object, or null if the name was invalid.
+   */
+  public function lookup_user_by_name($name);
+
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Definition the group object
+   */
+  public function create_group($name);
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Definition the group object
+   */
+  public function everybody();
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Definition the group object
+   */
+  public function registered_users();
+
+  /**
+   * List the users
+   * @param array      array of ids to return the user objects for
+   * @return array     the user list.
+   */
+  public function get_user_list($ids);
+
+  /**
+   * Look up a group by id.
+   * @param integer     id
+   * @return Group_Definition the user object, or null if the name was invalid.
+   */
+  public function lookup_group($id);
+
+  /**
+   * Look up the group by name.
+   * @param string     $name the name of the group to locate
+   * @return Group_Definition
+   */
+  public function lookup_group_by_name($name);
+
+  /**
+   * List the groups defined in the Identity Provider
+   */
+  public function groups();
+
+} // End Identity Driver Definition
+
+interface Group_Definition {}
+
+interface User_Definition {}
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index ba44709f..db89c6df 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -333,7 +333,7 @@ class Item_Model extends ORM_MPTT {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return Identity::lookup_user($this->owner_id);
+        return identity::lookup_user($this->owner_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index 1d639857..4f6b8c4b 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -26,7 +26,7 @@ class Log_Model extends ORM {
       // This relationship depends on an outside module, which may not be present so handle
       // failures gracefully.
       try {
-        return Identity::lookup_user($this->user_id);
+        return identity::lookup_user($this->user_id);
       } catch (Exception $e) {
         return null;
       }
diff --git a/modules/gallery/models/task.php b/modules/gallery/models/task.php
index 548e5f9c..f40be492 100644
--- a/modules/gallery/models/task.php
+++ b/modules/gallery/models/task.php
@@ -46,7 +46,7 @@ class Task_Model extends ORM {
   }
 
   public function owner() {
-    return Identity::lookup_user($this->owner_id);
+    return identity::lookup_user($this->owner_id);
   }
 
   /**
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index dac431a7..e9e5cb26 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -22,7 +22,7 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function teardown() {
     try {
-      $group = Identity::lookup_group_by_name("access_test");
+      $group = identity::lookup_group_by_name("access_test");
       if (!empty($group)) {
         $group->delete();
       }
@@ -33,7 +33,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     } catch (Exception $e) { }
 
     try {
-      $user = Identity::lookup_user_by_name("access_test");
+      $user = identity::lookup_user_by_name("access_test");
       if (!empty($user)) {
         $user->delete();
       }
@@ -41,16 +41,16 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     // Reset some permissions that we mangle below
     $root = ORM::factory("item", 1);
-    access::allow(Identity::everybody(), "view", $root);
+    access::allow(identity::everybody(), "view", $root);
   }
 
   public function setup() {
-    Session::set_active_user(Identity::guest());
+    identity::set_active_user(identity::guest());
   }
 
   public function groups_and_permissions_are_bound_to_columns_test() {
     access::register_permission("access_test", "Access Test");
-    $group = Identity::create_group("access_test");
+    $group = identity::create_group("access_test");
 
     // We have a new column for this perm / group combo
     $fields = Database::instance()->list_fields("access_caches");
@@ -65,17 +65,17 @@ class Access_Helper_Test extends Unit_Test_Case {
   }
 
   public function user_can_access_test() {
-    $access_test = Identity::create_group("access_test");
+    $access_test = identity::create_group("access_test");
 
     $root = ORM::factory("item", 1);
     access::allow($access_test, "view", $root);
 
     $item = album::create($root,  rand(), "test album");
 
-    access::deny(Identity::everybody(), "view", $item);
-    access::deny(Identity::registered_users(), "view", $item);
+    access::deny(identity::everybody(), "view", $item);
+    access::deny(identity::registered_users(), "view", $item);
 
-    $user = Identity::create_user("access_test", "Access Test", "");
+    $user = identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
@@ -89,10 +89,10 @@ class Access_Helper_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
     $item = album::create($root,  rand(), "test album");
 
-    access::deny(Identity::everybody(), "view", $item);
-    access::deny(Identity::registered_users(), "view", $item);
+    access::deny(identity::everybody(), "view", $item);
+    access::deny(identity::registered_users(), "view", $item);
 
-    $user = Identity::create_user("access_test", "Access Test", "");
+    $user = identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
@@ -121,11 +121,11 @@ class Access_Helper_Test extends Unit_Test_Case {
     $root = ORM::factory("item", 1);
 
     $album = album::create($root, rand(), "test album");
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
 
     $photo = photo::create($album, MODPATH . "gallery/images/gallery.png", "", "");
 
-    $this->assert_true($photo->__get("view_" . Identity::everybody()->id));
+    $this->assert_true($photo->__get("view_" . identity::everybody()->id));
   }
 
   public function can_allow_deny_and_reset_intent_test() {
@@ -134,23 +134,23 @@ class Access_Helper_Test extends Unit_Test_Case {
     $intent = ORM::factory("access_intent")->where("item_id", $album)->find();
 
     // Allow
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
     $this->assert_same(access::ALLOW, $intent->reload()->view_1);
 
     // Deny
-    access::deny(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $album);
     $this->assert_same(
       access::DENY,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
     $this->assert_same(
       access::ALLOW,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
 
-    access::reset(Identity::everybody(), "view", $album);
+    access::reset(identity::everybody(), "view", $album);
     $this->assert_same(
       null,
       ORM::factory("access_intent")->where("item_id", $album)->find()->view_1);
@@ -158,7 +158,7 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function cant_reset_root_item_test() {
     try {
-      access::reset(Identity::everybody(), "view", ORM::factory("item", 1));
+      access::reset(identity::everybody(), "view", ORM::factory("item", 1));
     } catch (Exception $e) {
       return;
     }
@@ -167,17 +167,17 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function can_view_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(Identity::everybody(), "view", $root);
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $root));
+    access::allow(identity::everybody(), "view", $root);
+    $this->assert_true(access::group_can(identity::everybody(), "view", $root));
   }
 
   public function can_always_fails_on_unloaded_items_test() {
     $root = ORM::factory("item", 1);
-    access::allow(Identity::everybody(), "view", $root);
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $root));
+    access::allow(identity::everybody(), "view", $root);
+    $this->assert_true(access::group_can(identity::everybody(), "view", $root));
 
     $bogus = ORM::factory("item", -1);
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $bogus));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $bogus));
   }
 
   public function cant_view_child_of_hidden_parent_test() {
@@ -185,21 +185,21 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = album::create($root, rand(), "test album");
 
     $root->reload();
-    access::deny(Identity::everybody(), "view", $root);
-    access::reset(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $root);
+    access::reset(identity::everybody(), "view", $album);
 
     $album->reload();
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $album));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $album));
   }
 
   public function view_permissions_propagate_down_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
 
-    access::allow(Identity::everybody(), "view", $root);
-    access::reset(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $root);
+    access::reset(identity::everybody(), "view", $album);
     $album->reload();
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $album));
+    $this->assert_true(access::group_can(identity::everybody(), "view", $album));
   }
 
   public function can_toggle_view_permissions_propagate_down_test() {
@@ -214,18 +214,18 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album3->reload();
     $album4->reload();
 
-    access::allow(Identity::everybody(), "view", $root);
-    access::deny(Identity::everybody(), "view", $album1);
-    access::reset(Identity::everybody(), "view", $album2);
-    access::reset(Identity::everybody(), "view", $album3);
-    access::reset(Identity::everybody(), "view", $album4);
+    access::allow(identity::everybody(), "view", $root);
+    access::deny(identity::everybody(), "view", $album1);
+    access::reset(identity::everybody(), "view", $album2);
+    access::reset(identity::everybody(), "view", $album3);
+    access::reset(identity::everybody(), "view", $album4);
 
     $album4->reload();
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $album4));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $album4));
 
-    access::allow(Identity::everybody(), "view", $album1);
+    access::allow(identity::everybody(), "view", $album1);
     $album4->reload();
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $album4));
+    $this->assert_true(access::group_can(identity::everybody(), "view", $album4));
   }
 
   public function revoked_view_permissions_cant_be_allowed_lower_down_test() {
@@ -234,29 +234,29 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album2 = album::create($album1, rand(), "test album");
 
     $root->reload();
-    access::deny(Identity::everybody(), "view", $root);
-    access::allow(Identity::everybody(), "view", $album2);
+    access::deny(identity::everybody(), "view", $root);
+    access::allow(identity::everybody(), "view", $album2);
 
     $album1->reload();
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $album1));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $album1));
 
     $album2->reload();
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $album2));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $album2));
   }
 
   public function can_edit_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(Identity::everybody(), "edit", $root);
-    $this->assert_true(access::group_can(Identity::everybody(), "edit", $root));
+    access::allow(identity::everybody(), "edit", $root);
+    $this->assert_true(access::group_can(identity::everybody(), "edit", $root));
   }
 
   public function non_view_permissions_propagate_down_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), "test album");
 
-    access::allow(Identity::everybody(), "edit", $root);
-    access::reset(Identity::everybody(), "edit", $album);
-    $this->assert_true(access::group_can(Identity::everybody(), "edit", $album));
+    access::allow(identity::everybody(), "edit", $root);
+    access::reset(identity::everybody(), "edit", $album);
+    $this->assert_true(access::group_can(identity::everybody(), "edit", $album));
   }
 
   public function non_view_permissions_can_be_revoked_lower_down_test() {
@@ -276,36 +276,36 @@ class Access_Helper_Test extends Unit_Test_Case {
     $outer->reload();
     $inner->reload();
 
-    access::allow(Identity::everybody(), "edit", $root);
-    access::deny(Identity::everybody(), "edit", $outer);
-    access::allow(Identity::everybody(), "edit", $inner);
+    access::allow(identity::everybody(), "edit", $root);
+    access::deny(identity::everybody(), "edit", $outer);
+    access::allow(identity::everybody(), "edit", $inner);
 
     // Outer album is not editable, inner one is.
-    $this->assert_false(access::group_can(Identity::everybody(), "edit", $outer_photo));
-    $this->assert_true(access::group_can(Identity::everybody(), "edit", $inner_photo));
+    $this->assert_false(access::group_can(identity::everybody(), "edit", $outer_photo));
+    $this->assert_true(access::group_can(identity::everybody(), "edit", $inner_photo));
   }
 
   public function i_can_edit_test() {
     // Create a new user that belongs to no groups
-    $user = Identity::create_user("access_test", "Access Test", "");
+    $user = identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
     $user->save();
-    Session::set_active_user($user);
+    identity::set_active_user($user);
 
     // This user can't edit anything
     $root = ORM::factory("item", 1);
     $this->assert_false(access::can("edit", $root));
 
     // Now add them to a group that has edit permission
-    $group = Identity::create_group("access_test");
+    $group = identity::create_group("access_test");
     $group->add($user);
     $group->save();
     access::allow($group, "edit", $root);
 
-    $user = Identity::lookup_user($user->id);  // reload() does not flush related columns
-    Session::set_active_user($user);
+    $user = identity::lookup_user($user->id);  // reload() does not flush related columns
+    identity::set_active_user($user);
 
     // And verify that the user can edit.
     $this->assert_true(access::can("edit", $root));
@@ -317,16 +317,16 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
 
-    access::deny(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
 
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
 
-    access::deny(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
 
-    access::reset(Identity::everybody(), "view", $album);
+    access::reset(identity::everybody(), "view", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
   }
 
@@ -338,44 +338,44 @@ class Access_Helper_Test extends Unit_Test_Case {
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::deny(Identity::everybody(), "view_full", $album);
+    access::deny(identity::everybody(), "view_full", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::allow(Identity::everybody(), "view_full", $album);
+    access::allow(identity::everybody(), "view_full", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::deny(Identity::everybody(), "view_full", $album);
+    access::deny(identity::everybody(), "view_full", $album);
     $this->assert_true(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
 
-    access::reset(Identity::everybody(), "view_full", $album);
+    access::reset(identity::everybody(), "view_full", $album);
     $this->assert_false(file_exists($album->file_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->resize_path() . "/.htaccess"));
     $this->assert_false(file_exists($album->thumb_path() . "/.htaccess"));
   }
 
   public function moved_items_inherit_new_permissions_test() {
-    Session::set_active_user(Identity::lookup_user_by_name("admin"));
+    identity::set_active_user(identity::lookup_user_by_name("admin"));
 
     $root = ORM::factory("item", 1);
     $public_album = album::create($root, rand(), "public album");
     $public_photo = photo::create($public_album, MODPATH . "gallery/images/gallery.png", "", "");
-    access::allow(Identity::everybody(), "view", $public_album);
+    access::allow(identity::everybody(), "view", $public_album);
 
     $root->reload();  // Account for MPTT changes
 
     $private_album = album::create($root, rand(), "private album");
-    access::deny(Identity::everybody(), "view", $private_album);
+    access::deny(identity::everybody(), "view", $private_album);
     $private_photo = photo::create($private_album, MODPATH . "gallery/images/gallery.png", "", "");
 
     // Make sure that we now have a public photo and private photo.
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $public_photo));
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $private_photo));
+    $this->assert_true(access::group_can(identity::everybody(), "view", $public_photo));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $private_photo));
 
     // Swap the photos
     item::move($public_photo, $private_album);
@@ -391,7 +391,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     $public_photo->reload();
 
     // Make sure that the public_photo is now private, and the private_photo is now public.
-    $this->assert_false(access::group_can(Identity::everybody(), "view", $public_photo));
-    $this->assert_true(access::group_can(Identity::everybody(), "view", $private_photo));
+    $this->assert_false(access::group_can(identity::everybody(), "view", $public_photo));
+    $this->assert_true(access::group_can(identity::everybody(), "view", $private_photo));
   }
 }
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index fa46d924..b85b5258 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -45,7 +45,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["csrf"] = access::csrf_token();
     $_POST["slug"] = "new_name";
     $_POST["_method"] = "put";
-    access::allow(Identity::everybody(), "edit", $root);
+    access::allow(identity::everybody(), "edit", $root);
 
     ob_start();
     $controller->_update($this->_album);
@@ -69,7 +69,7 @@ class Albums_Controller_Test extends Unit_Test_Case {
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
-    access::allow(Identity::everybody(), "edit", $root);
+    access::allow(identity::everybody(), "edit", $root);
 
     try {
       $controller->_update($this->_album);
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index fc01db91..a364423a 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -23,16 +23,16 @@ 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);
-    Session::set_active_user(Identity::guest());
+    identity::set_active_user(identity::guest());
 
     // We can see the item when permissions are granted
-    access::allow(Identity::everybody(), "view", $album);
+    access::allow(identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
       ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
 
     // We can't see the item when permissions are denied
-    access::deny(Identity::everybody(), "view", $album);
+    access::deny(identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
       ORM::factory("item")->viewable()->where("id", $item->id)->count_all());
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index 59c3f78a..2e5d7fe3 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", Session::active_user()->id, "slug");
+      "test", "test", identity::active_user()->id, "slug");
     $orig_name = $photo->name;
 
     $_POST["filename"] = "test.jpeg";
@@ -40,7 +40,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $_POST["description"] = "new description";
     $_POST["slug"] = "new-slug";
     $_POST["csrf"] = access::csrf_token();
-    access::allow(Identity::everybody(), "edit", $root);
+    access::allow(identity::everybody(), "edit", $root);
 
     ob_start();
     $controller->_update($photo);
@@ -64,7 +64,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
-    access::allow(Identity::everybody(), "edit", $root);
+    access::allow(identity::everybody(), "edit", $root);
 
     try {
       $controller->_update($photo);
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index 0256fabb..0d8801e5 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 = Session::active_user(); } catch (Exception $e) { } ?>
+    <? try { $user = identity::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/login.html.php b/modules/gallery/views/login.html.php
index 6695d564..961f44fa 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -8,7 +8,7 @@
   </li>
   <? else: ?>
   <li class="first">
-    <? if (Identity::is_writable()): ?>
+    <? 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() .
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index 6ed40571..a9a9ef11 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -36,7 +36,7 @@
     <li id="g-login-form">
       <?= $form ?>
     </li>
-    <? if (Identity::is_writable()): ?>
+    <? if (identity::is_writable()): ?>
     <li>
       <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
     </li>
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 080f154b..9a40b0b9 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 = Session::active_user();
+      $user = identity::active_user();
     }
 
     return ORM::factory("subscription")
@@ -31,7 +31,7 @@ class notification {
 
   static function is_watching($item, $user=null) {
     if (empty($user)) {
-      $user = Session::active_user();
+      $user = identity::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 = Session::active_user();
+        $user = identity::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 = Session::active_user();
+        $user = identity::active_user();
       }
 
       $subscription = ORM::factory("subscription")
@@ -81,7 +81,7 @@ class notification {
     if (empty($subscriber_ids)) {
       return array();
     }
-    $users = Identity::get_user_list($subscriber_ids);
+    $users = identity::get_user_list($subscriber_ids);
 
     $subscribers = array();
     foreach ($users as $user) {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index f0530cd9..3a369155 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 (!Session::active_user()->guest) {
+    if (!identity::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 8b14cfa9..f9da9a16 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 (!Session::active_user()->admin) {
-      foreach (Session::group_ids_for_active_user() as $id) {
+    if (!identity::active_user()->admin) {
+      foreach (identity::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 428065f6..53a3d091 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 != Session::active_user()->id) {
+    if (!$task->loaded || $task->owner_id != identity::active_user()->id) {
       access::forbidden();
     }
 
@@ -207,7 +207,7 @@ class Server_Add_Controller extends Admin_Controller {
         $task->set("mode", "done");
       }
 
-      $owner_id = Session::active_user()->id;
+      $owner_id = identity::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 8f8b0016..1d883a71 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 && Session::active_user()->admin && $item->is_album() && !empty($paths) &&
+    if ($item && identity::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 44681d36..9da8969a 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 (Session::active_user()->admin) {
+    if (identity::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 258de843..8b96ebd2 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 == Session::active_user()->id || $id == user::guest()->id) {
+    if ($id == identity::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 != Session::active_user()->id) {
+      if ($user->id != identity::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 == Session::active_user()->id) {
+    if ($user->id == identity::active_user()->id) {
       $form->edit_user->admin->disabled(1);
     }
     print $form;
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index a8f1c5ca..6bef1a17 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -46,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = Identity::lookup_user_by_name($form->reset->inputs["name"]->value);
+      $user = identity::lookup_user_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 0ccf3e2a..dee54f63 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 != Session::active_user()->id) {
+    if ($user->guest || $user->id != identity::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 != Session::active_user()->id) {
+    if ($user->guest || $user->id != identity::active_user()->id) {
       access::forbidden();
     }
 
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 8ad52564..567b2ee4 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -25,7 +25,10 @@
  */
 class group_Core {
   /**
-   * @see Identity_Driver::create.
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Definition the group object
    */
   static function create($name) {
     $group = ORM::factory("group")->where("name", $name)->find();
@@ -39,14 +42,18 @@ class group_Core {
   }
 
   /**
-   * @see Identity_Driver::everbody.
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Definition the group object
    */
   static function everybody() {
     return model_cache::get("group", 1);
   }
 
   /**
-   * @see Identity_Driver::registered_users.
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Definition the group object
    */
   static function registered_users() {
     return model_cache::get("group", 2);
@@ -71,7 +78,10 @@ class group_Core {
   }
 
   /**
-   * @see Identity_Driver::get_group_list.
+   * Search the groups by the field and value.
+   * @param string      $field_name column to look up the user by
+   * @param string      $value value to match
+   * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_field($field_name, $value) {
     try {
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
deleted file mode 100644
index 36f37543..00000000
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ /dev/null
@@ -1,150 +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.
- */
-/*
- * Based on the Cache_Sqlite_Driver developed by the Kohana Team
- */
-class Identity_Gallery_Driver implements Identity_Driver {
-  /**
-   * @see Identity_Driver::activate.
-   */
-  public function activate() {
-    user::activate();
-  }
-
-  /**
-   * @see Identity_Driver::deactivate.
-   */
-  public function deactivate() {
-    user::deactivate();
-  }
-
-  /**
-   * @see Identity_Driver::guest.
-   */
-  public function guest() {
-    return user::guest();
-  }
-
-  /**
-   * @see Identity_Driver::create_user.
-   */
-  public function create_user($name, $full_name, $password) {
-    return user::create($name, $full_name, $password);
-  }
-
-  /**
-   * @see Identity_Driver::is_correct_password.
-   */
-  public function is_correct_password($user, $password) {
-    $valid = $user->password;
-
-    // Try phpass first, since that's what we generate.
-    if (strlen($valid) == 34) {
-      require_once(MODPATH . "user/lib/PasswordHash.php");
-      $hashGenerator = new PasswordHash(10, true);
-      return $hashGenerator->CheckPassword($password, $valid);
-    }
-
-    $salt = substr($valid, 0, 4);
-    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
-    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
-    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
-          : ($salt . md5($salt . $sanitizedPassword));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * @see Identity_Driver::lookup_user.
-   */
-  public function lookup_user($id) {
-    return user::lookup_by_field("id", $id);
-  }
-
-  /**
-   * @see Identity_Driver::lookup_user_by_name.
-   */
-  public function lookup_user_by_name($name) {
-    return user::lookup_by_field("name", $name);
-  }
-
-  /**
-   * @see Identity_Driver::create_group.
-   */
-  public function create_group($name) {
-    return group::create($name);
-  }
-
-  /**
-   * @see Identity_Driver::everybody.
-   */
-  public function everybody() {
-    return group::everybody();
-  }
-
-  /**
-   * @see Identity_Driver::registered_users.
-   */
-  public function registered_users() {
-    return group::registered_users();
-  }
-
-  /**
-   * @see Identity_Driver::lookup_group.
-   */
-  public function lookup_group($id) {
-    return group::lookup_by_field("id", $id);
-  }
-
-  /**
-   * @see Identity_Driver::lookup_group_by_name.
-   */
-  public function lookup_group_by_name($name) {
-    return group::lookup_by_field("name", $name);
-  }
-
-  /**
-   * @see Identity_Driver::get_user_list.
-   */
-  public function get_user_list($ids) {
-    return ORM::factory("user")
-      ->in("id", $ids)
-      ->find_all()
-      ->as_array();
-  }
-
-  /**
-   * @see Identity_Driver::groups.
-   */
-  public function groups() {
-    return ORM::factory("group")->find_all();
-  }
-
-} // End Identity Gallery Driver
-
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
new file mode 100644
index 00000000..5941abb7
--- /dev/null
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -0,0 +1,150 @@
+<?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.
+ */
+/*
+ * Based on the Cache_Sqlite_Driver developed by the Kohana Team
+ */
+class Identity_Gallery_Driver implements IdentityProvider_Driver {
+  /**
+   * @see IdentityProvider_Driver::activate.
+   */
+  public function activate() {
+    user::activate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::deactivate.
+   */
+  public function deactivate() {
+    user::deactivate();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::guest.
+   */
+  public function guest() {
+    return user::guest();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_user.
+   */
+  public function create_user($name, $full_name, $password) {
+    return user::create($name, $full_name, $password);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::is_correct_password.
+   */
+  public function is_correct_password($user, $password) {
+    $valid = $user->password;
+
+    // Try phpass first, since that's what we generate.
+    if (strlen($valid) == 34) {
+      require_once(MODPATH . "user/lib/PasswordHash.php");
+      $hashGenerator = new PasswordHash(10, true);
+      return $hashGenerator->CheckPassword($password, $valid);
+    }
+
+    $salt = substr($valid, 0, 4);
+    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
+    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
+    $sanitizedPassword = html::specialchars($password, false);
+    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
+          : ($salt . md5($salt . $sanitizedPassword));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user.
+   */
+  public function lookup_user($id) {
+    return user::lookup_by_field("id", $id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_user_by_name.
+   */
+  public function lookup_user_by_name($name) {
+    return user::lookup_by_field("name", $name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::create_group.
+   */
+  public function create_group($name) {
+    return group::create($name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::everybody.
+   */
+  public function everybody() {
+    return group::everybody();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::registered_users.
+   */
+  public function registered_users() {
+    return group::registered_users();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group.
+   */
+  public function lookup_group($id) {
+    return group::lookup_by_field("id", $id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::lookup_group_by_name.
+   */
+  public function lookup_group_by_name($name) {
+    return group::lookup_by_field("name", $name);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::get_user_list.
+   */
+  public function get_user_list($ids) {
+    return ORM::factory("user")
+      ->in("id", $ids)
+      ->find_all()
+      ->as_array();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::groups.
+   */
+  public function groups() {
+    return ORM::factory("group")->find_all();
+  }
+
+} // End Identity Gallery Driver
+
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index ee8d413c..fed92c5e 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -91,7 +91,7 @@
                   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>
-              <? if (Session::active_user()->id != $user->id && !$user->guest): ?>
+              <? 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>
-- 
cgit v1.2.3


From 6b51de49c5c6a4030505ff1f979e3e14da06c457 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 22 Oct 2009 13:28:23 -0700
Subject: Change the modifier on activate and deactivate methods to static as
 they are in a helper class.

---
 modules/gallery/tests/No_Direct_Access_Test.php    | 77 ----------------------
 .../gallery/tests/No_Direct_ORM_Access_Test.php    | 77 ++++++++++++++++++++++
 modules/user/helpers/user.php                      |  4 +-
 3 files changed, 79 insertions(+), 79 deletions(-)
 delete mode 100644 modules/gallery/tests/No_Direct_Access_Test.php
 create mode 100644 modules/gallery/tests/No_Direct_ORM_Access_Test.php

(limited to 'modules/user')

diff --git a/modules/gallery/tests/No_Direct_Access_Test.php b/modules/gallery/tests/No_Direct_Access_Test.php
deleted file mode 100644
index c6d8df95..00000000
--- a/modules/gallery/tests/No_Direct_Access_Test.php
+++ /dev/null
@@ -1,77 +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.
- */
-require_once("Gallery_Filters.php");
-
-class No_Direct_Access_Test extends Unit_Test_Case {
-  public function no_access_to_users_table_test() {
-    $dir = new UserModuleFilterIterator(
-      new PhpCodeFilterIterator(
-        new GalleryCodeFilterIterator(
-          new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator(DOCROOT)))));
-    $errors = array();
-    foreach ($dir as $file) {
-      //if (basename(dirname($file)) == "helpers") {
-      $file_as_string = file_get_contents($file);
-      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
-          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
-            $errors[] = "$file($l) => $line";
-          }
-        }
-      }
-      $file_as_string = null;
-    }
-    if ($errors) {
-      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
-    }
-  }
-
-  public function no_access_to_groups_table_test() {
-    $dir = new UserModuleFilterIterator(
-      new PhpCodeFilterIterator(
-        new GalleryCodeFilterIterator(
-          new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator(DOCROOT)))));
-    $errors = array();
-    foreach ($dir as $file) {
-      $file_as_string = file_get_contents($file);
-      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
-          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
-            $errors[] = "$file($l) => $line";
-          }
-        }
-      }
-      $file_as_string = null;
-    }
-    if ($errors) {
-      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
-    }
-  }
-
-}
-
-class UserModuleFilterIterator extends FilterIterator {
-  public function accept() {
-    $path_name = $this->getInnerIterator()->getPathName();
-    return strpos($path_name, "/modules/user") === false;
-  }
-}
diff --git a/modules/gallery/tests/No_Direct_ORM_Access_Test.php b/modules/gallery/tests/No_Direct_ORM_Access_Test.php
new file mode 100644
index 00000000..c6d8df95
--- /dev/null
+++ b/modules/gallery/tests/No_Direct_ORM_Access_Test.php
@@ -0,0 +1,77 @@
+<?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.
+ */
+require_once("Gallery_Filters.php");
+
+class No_Direct_Access_Test extends Unit_Test_Case {
+  public function no_access_to_users_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      //if (basename(dirname($file)) == "helpers") {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
+    }
+  }
+
+  public function no_access_to_groups_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
+    }
+  }
+
+}
+
+class UserModuleFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return strpos($path_name, "/modules/user") === false;
+  }
+}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index ec4f56ae..5f154313 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -27,7 +27,7 @@ class user_Core {
   /**
    * Initialize the provider so it is ready to use
    */
-  public function activate() {
+  static function activate() {
     $db = Database::instance();
     $db->query("CREATE TABLE IF NOT EXISTS {users} (
                  `id` int(9) NOT NULL auto_increment,
@@ -93,7 +93,7 @@ class user_Core {
   /**
    * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
    */
-  public function deactivate() {
+  static function deactivate() {
     // Delete all users and groups so that we give other modules an opportunity to clean up
     foreach (ORM::factory("user")->find_all() as $user) {
       $user->delete();
-- 
cgit v1.2.3


From 36adc11f058404c78bf0d804d8fe5be6cfa6f515 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 22 Oct 2009 13:30:32 -0700
Subject: move the direct orm test to the users module.

---
 .../gallery/tests/No_Direct_ORM_Access_Test.php    | 77 ----------------------
 modules/user/tests/No_Direct_ORM_Access_Test.php   | 77 ++++++++++++++++++++++
 2 files changed, 77 insertions(+), 77 deletions(-)
 delete mode 100644 modules/gallery/tests/No_Direct_ORM_Access_Test.php
 create mode 100644 modules/user/tests/No_Direct_ORM_Access_Test.php

(limited to 'modules/user')

diff --git a/modules/gallery/tests/No_Direct_ORM_Access_Test.php b/modules/gallery/tests/No_Direct_ORM_Access_Test.php
deleted file mode 100644
index 440321fa..00000000
--- a/modules/gallery/tests/No_Direct_ORM_Access_Test.php
+++ /dev/null
@@ -1,77 +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.
- */
-require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
-
-class No_Direct_ORM_Access_Test extends Unit_Test_Case {
-  public function no_access_to_users_table_test() {
-    $dir = new UserModuleFilterIterator(
-      new PhpCodeFilterIterator(
-        new GalleryCodeFilterIterator(
-          new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator(DOCROOT)))));
-    $errors = array();
-    foreach ($dir as $file) {
-      //if (basename(dirname($file)) == "helpers") {
-      $file_as_string = file_get_contents($file);
-      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
-          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
-            $errors[] = "$file($l) => $line";
-          }
-        }
-      }
-      $file_as_string = null;
-    }
-    if ($errors) {
-      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
-    }
-  }
-
-  public function no_access_to_groups_table_test() {
-    $dir = new UserModuleFilterIterator(
-      new PhpCodeFilterIterator(
-        new GalleryCodeFilterIterator(
-          new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator(DOCROOT)))));
-    $errors = array();
-    foreach ($dir as $file) {
-      $file_as_string = file_get_contents($file);
-      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
-          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
-            $errors[] = "$file($l) => $line";
-          }
-        }
-      }
-      $file_as_string = null;
-    }
-    if ($errors) {
-      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
-    }
-  }
-
-}
-
-class UserModuleFilterIterator extends FilterIterator {
-  public function accept() {
-    $path_name = $this->getInnerIterator()->getPathName();
-    return strpos($path_name, "/modules/user") === false;
-  }
-}
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
new file mode 100644
index 00000000..440321fa
--- /dev/null
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -0,0 +1,77 @@
+<?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.
+ */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
+class No_Direct_ORM_Access_Test extends Unit_Test_Case {
+  public function no_access_to_users_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      //if (basename(dirname($file)) == "helpers") {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
+    }
+  }
+
+  public function no_access_to_groups_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
+    }
+  }
+
+}
+
+class UserModuleFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return strpos($path_name, "/modules/user") === false;
+  }
+}
-- 
cgit v1.2.3


From b74b131e25ca0ddb42d2545a5d0ea2d796452f1d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 22 Oct 2009 22:29:56 -0700
Subject: Change Identity adminstration to use the uninstall/install methods
 when changing providers.

---
 modules/gallery/controllers/admin_identity.php     | 19 +++--
 modules/gallery/helpers/identity.php               | 34 ++++-----
 modules/gallery/helpers/module.php                 |  4 +-
 modules/gallery/libraries/IdentityProvider.php     | 26 ++-----
 .../gallery/libraries/drivers/IdentityProvider.php | 10 ---
 modules/gallery/views/admin_identity.html.php      |  4 +-
 .../gallery/views/admin_identity_confirm.html.php  |  2 +-
 modules/user/helpers/user.php                      | 85 ----------------------
 modules/user/helpers/user_installer.php            | 76 +++++++++++++++++--
 .../libraries/drivers/IdentityProvider/Gallery.php | 16 +---
 10 files changed, 110 insertions(+), 166 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index d06132ff..0521a0f8 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -47,23 +47,26 @@ class Admin_Identity_Controller extends Admin_Controller {
 
       module::event("pre_identity_change", $active_provider, $new_provider);
 
-      identity::deactivate();
+      module::deactivate($active_provider);
+      module::uninstall($active_provider);
+
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        // We don't care if there was a problem destroying the session.
+      }
 
       // Switch authentication
-      module::set_var("gallery", "identity_provider", $new_provider);
       identity::reset();
+      module::set_var("gallery", "identity_provider", $new_provider);
 
-      identity::activate();
+      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)));
 
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        // We don't care if there was a problem destroying the session.
-      }
       url::redirect(item::root()->abs_url());
     }
 
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index cf84c8a9..d0cba8e7 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -39,6 +39,16 @@ class identity_Core {
     return self::$available;
   }
 
+  /**
+   * Frees the current instance of the identity provider so the next call to instance will reload
+   *
+   * @param   string  configuration
+   * @return  Identity_Core
+   */
+  static function reset() {
+    IdentityProvider::reset();
+  }
+
   /**
    * Make sure that we have a session and group_ids cached in the session.
    */
@@ -71,12 +81,12 @@ class identity_Core {
         $session->set("group_ids", $ids);
       }
       //} catch (Exception $e) {
-      //try {
-      //Session::instance()->destroy();
-      //} catch (Exception $e) {
+      //  try {
+      //   Session::instance()->destroy();
+        //  } catch (Exception $e) {
         // We don't care if there was a problem destroying the session.
-      //}
-      //url::redirect(item::root()->abs_url());
+      // }
+      // url::redirect(item::root()->abs_url());
       //}
   }
 
@@ -125,20 +135,6 @@ class identity_Core {
     return IdentityProvider::instance()->is_writable();
   }
 
-  /**
-   * @see IdentityProvider_Driver::activate.
-   */
-  static function activate() {
-    IdentityProvider::instance()->activate();
-  }
-
-  /**
-   * @see IdentityProvider_Driver::deactivate.
-   */
-  static function deactivate() {
-    IdentityProvider::instance()->deactivate();
-  }
-
   /**
    * @see IdentityProvider_Driver::guest.
    */
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 1d77e63d..9d41cd51 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -130,6 +130,8 @@ class module_Core {
     array_unshift($kohana_modules, MODPATH . $module_name);
     Kohana::config_set("core.modules",  $kohana_modules);
 
+    // Rebuild the include path so the module installer can benefit from auto loading
+    Kohana::include_paths(true);
     $installer_class = "{$module_name}_installer";
     if (method_exists($installer_class, "install")) {
       call_user_func_array(array($installer_class, "install"), array());
@@ -154,7 +156,7 @@ class module_Core {
    */
   static function upgrade($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, MODPATH . $module_name);
+    $kohana_modules = array_unshift($kohana_modules, MODPATH . $module_name);
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $version_before = module::get_version($module_name);
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 512f28eb..38718d4b 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -38,7 +38,7 @@ class IdentityProvider_Core {
    * @return  Identity_Core
    */
   static function & instance() {
-   if (!isset(self::$instance)) {
+   if (empty(self::$instance)) {
       // Create a new instance
       self::$instance = new IdentityProvider();
     }
@@ -47,14 +47,14 @@ class IdentityProvider_Core {
   }
 
   /**
-   * Returns a singleton instance of Identity.
-   * There can only be one Identity driver configured at a given point
+   * Frees the current instance of the identity provider so the next call to instance will reload
    *
    * @param   string  configuration
    * @return  Identity_Core
    */
   static function reset() {
-    self::$instance = new IdentityProvider();
+    self::$instance = null;
+    Kohana::config_clear("identity");
   }
 
   /**
@@ -66,12 +66,12 @@ class IdentityProvider_Core {
     $config = module::get_var("gallery", "identity_provider", "user");
 
     // Test the config group name
-    if (($this->config = Kohana::config("identity.".$config)) === NULL) {
+    if (($this->config = Kohana::config("identity." . $config)) === NULL) {
       throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $config");
     }
 
     // Set driver name
-    $driver = "IdentityProvider_".ucfirst($this->config["driver"])."_Driver";
+    $driver = "IdentityProvider_" . ucfirst($this->config["driver"])  ."_Driver";
 
     // Load the driver
     if ( ! Kohana::auto_load($driver)) {
@@ -100,20 +100,6 @@ class IdentityProvider_Core {
     return !empty($this->config["allow_updates"]);
   }
 
-  /**
-   * @see IdentityProvider_Driver::activate.
-   */
-  public function activate() {
-    $this->driver->activate();
-  }
-
-  /**
-   * @see IdentityProvider_Driver::deactivate.
-   */
-  public function deactivate() {
-    $this->driver->deactivate();
-  }
-
   /**
    * @see IdentityProvider_Driver::guest.
    */
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index 8a578d1b..5bb41dcc 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -18,16 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 interface IdentityProvider_Driver {
-  /**
-   * Initialize the provider so it is ready to use
-   */
-  public function activate();
-
-  /**
-   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
-   */
-  public function deactivate();
-
   /**
    * Return the guest user.
    *
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index 1405cacb..358860cf 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -10,7 +10,7 @@
         $("#g-dialog").html(data);
         $("#g-dialog").dialog({
           bgiframe: true,
-          title: "<?= t("Confirm Change Identity Provider") ?>",
+          title: <?= t("Confirm identity provider change")->for_js() ?>,
           resizable: false,
           height:165,
           modal: true,
@@ -34,7 +34,7 @@
 
 </script>
 <div id="g-modules">
-  <h1> <?= t("Gallery Identity Management") ?> </h1>
+  <h1> <?= t("Manage Identity Providers") ?> </h1>
   <p>
     <?= t("Choose a different user/group management provider.") ?>
   </p>
diff --git a/modules/gallery/views/admin_identity_confirm.html.php b/modules/gallery/views/admin_identity_confirm.html.php
index e14525b5..54aae9c8 100644
--- a/modules/gallery/views/admin_identity_confirm.html.php
+++ b/modules/gallery/views/admin_identity_confirm.html.php
@@ -4,7 +4,7 @@
   <?= form::hidden("provider", $new_provider) ?>
 
   <p><span class="ui-icon ui-icon-alert" style="float: left; margin:0 7px 20px 0;"></span>
-  <?= t("Do you really want to switch Identity providers? Continuing will delete all existing users.") ?>
+  <?= t("Are you sure you want to change your Identity Provider? Continuing will delete all existing users.") ?>
   </p>
 </form>
 
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 5f154313..5ef2b726 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -24,91 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_Core {
-  /**
-   * Initialize the provider so it is ready to use
-   */
-  static function activate() {
-    $db = Database::instance();
-    $db->query("CREATE TABLE IF NOT EXISTS {users} (
-                 `id` int(9) NOT NULL auto_increment,
-                 `name` varchar(32) NOT NULL,
-                 `full_name` varchar(255) NOT NULL,
-                 `password` varchar(64) NOT NULL,
-                 `login_count` int(10) unsigned NOT NULL DEFAULT 0,
-                 `last_login` int(10) unsigned NOT NULL DEFAULT 0,
-                 `email` varchar(64) default NULL,
-                 `admin` BOOLEAN default 0,
-                 `guest` BOOLEAN default 0,
-                 `hash` char(32) default NULL,
-                 `url` varchar(255) default NULL,
-                 `locale` char(10) default NULL,
-                 PRIMARY KEY (`id`),
-                 UNIQUE KEY(`hash`),
-                 UNIQUE KEY(`name`))
-               DEFAULT CHARSET=utf8;");
-
-    $db->query("CREATE TABLE IF NOT EXISTS {groups} (
-                 `id` int(9) NOT NULL auto_increment,
-                 `name` char(64) default NULL,
-                 `special` BOOLEAN default 0,
-                 PRIMARY KEY (`id`),
-                 UNIQUE KEY(`name`))
-               DEFAULT CHARSET=utf8;");
-
-    $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
-                 `group_id` int(9) NOT NULL,
-                 `user_id` int(9) NOT NULL,
-                 PRIMARY KEY (`group_id`, `user_id`),
-                 UNIQUE KEY(`user_id`, `group_id`))
-               DEFAULT CHARSET=utf8;");
-
-    $everybody = group::create("Everybody");
-    $everybody->special = true;
-    $everybody->save();
-
-    $registered = group::create("Registered Users");
-    $registered->special = true;
-    $registered->save();
-
-    $guest = user::create("guest", "Guest User", "");
-    $guest->guest = true;
-    $guest->remove($registered);
-    $guest->save();
-
-    $admin = user::create("admin", "Gallery Administrator", "admin");
-    $admin->admin = true;
-    $admin->save();
-
-    // Let the admin own everything
-    $db->query("update {items} set owner_id = {$admin->id}");
-
-    $root = ORM::factory("item", 1);
-    access::allow($everybody, "view", $root);
-    access::allow($everybody, "view_full", $root);
-
-    access::allow($registered, "view", $root);
-    access::allow($registered, "view_full", $root);
-  }
-
-  /**
-   * Cleanup up this provider so it is unavailable for use and won't conflict with the current driver
-   */
-  static function deactivate() {
-    // Delete all users and groups so that we give other modules an opportunity to clean up
-    foreach (ORM::factory("user")->find_all() as $user) {
-      $user->delete();
-    }
-
-    foreach (ORM::factory("group")->find_all() as $group) {
-      $group->delete();
-    }
-
-    $db = Database::instance();
-    $db->query("DROP TABLE IF EXISTS {users};");
-    $db->query("DROP TABLE IF EXISTS {groups};");
-    $db->query("DROP TABLE IF EXISTS {groups_users};");
-  }
-
   /**
    * Return the guest user.
    *
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 1410f1ef..36c617a8 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -19,18 +19,84 @@
  */
 class user_installer {
   static function install() {
+    $db = Database::instance();
+    $db->query("CREATE TABLE IF NOT EXISTS {users} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` varchar(32) NOT NULL,
+                 `full_name` varchar(255) NOT NULL,
+                 `password` varchar(64) NOT NULL,
+                 `login_count` int(10) unsigned NOT NULL DEFAULT 0,
+                 `last_login` int(10) unsigned NOT NULL DEFAULT 0,
+                 `email` varchar(64) default NULL,
+                 `admin` BOOLEAN default 0,
+                 `guest` BOOLEAN default 0,
+                 `hash` char(32) default NULL,
+                 `url` varchar(255) default NULL,
+                 `locale` char(10) default NULL,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`hash`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` char(64) default NULL,
+                 `special` BOOLEAN default 0,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
+                 `group_id` int(9) NOT NULL,
+                 `user_id` int(9) NOT NULL,
+                 PRIMARY KEY (`group_id`, `user_id`),
+                 UNIQUE KEY(`user_id`, `group_id`))
+               DEFAULT CHARSET=utf8;");
+
+    $everybody = group::create("Everybody");
+    $everybody->special = true;
+    $everybody->save();
+
+    $registered = group::create("Registered Users");
+    $registered->special = true;
+    $registered->save();
+
+    $guest = user::create("guest", "Guest User", "");
+    $guest->guest = true;
+    $guest->remove($registered);
+    $guest->save();
+
+    $admin = user::create("admin", "Gallery Administrator", "admin");
+    $admin->admin = true;
+    $admin->save();
+
+    // Let the admin own everything
+    $db->query("update {items} set owner_id = {$admin->id}");
+
+    $root = ORM::factory("item", 1);
+    access::allow($everybody, "view", $root);
+    access::allow($everybody, "view_full", $root);
+
+    access::allow($registered, "view", $root);
+    access::allow($registered, "view_full", $root);
     user::activate();
     module::set_var("gallery", "identity_provider", "user");
     module::set_version("user", 1);
   }
 
   static function uninstall() {
-    user::deactivate();
+    // Delete all users and groups so that we give other modules an opportunity to clean up
+    foreach (ORM::factory("user")->find_all() as $user) {
+      $user->delete();
+    }
 
-    try {
-      Session::instance()->destroy();
-    } catch (Exception $e) {
-      // We don't care if there was a problem destroying the session.
+    foreach (ORM::factory("group")->find_all() as $group) {
+      $group->delete();
     }
+
+    $db = Database::instance();
+    $db->query("DROP TABLE IF EXISTS {users};");
+    $db->query("DROP TABLE IF EXISTS {groups};");
+    $db->query("DROP TABLE IF EXISTS {groups_users};");
   }
 }
\ No newline at end of file
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 5941abb7..026f04e9 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -20,21 +20,7 @@
 /*
  * Based on the Cache_Sqlite_Driver developed by the Kohana Team
  */
-class Identity_Gallery_Driver implements IdentityProvider_Driver {
-  /**
-   * @see IdentityProvider_Driver::activate.
-   */
-  public function activate() {
-    user::activate();
-  }
-
-  /**
-   * @see IdentityProvider_Driver::deactivate.
-   */
-  public function deactivate() {
-    user::deactivate();
-  }
-
+class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::guest.
    */
-- 
cgit v1.2.3


From 923a322ef57fec97fdf5cbb2a0fd5efd67668911 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 06:09:24 -0700
Subject: Change the Admin_Identity_Controller to not destroy the session until
 after the new provider is installed.

---
 modules/gallery/controllers/admin_identity.php | 11 +++++------
 modules/user/helpers/user_installer.php        |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index 0521a0f8..dcc3edcb 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -50,12 +50,6 @@ class Admin_Identity_Controller extends Admin_Controller {
       module::deactivate($active_provider);
       module::uninstall($active_provider);
 
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        // We don't care if there was a problem destroying the session.
-      }
-
       // Switch authentication
       identity::reset();
       module::set_var("gallery", "identity_provider", $new_provider);
@@ -67,6 +61,11 @@ class Admin_Identity_Controller extends Admin_Controller {
       message::success(t("Changed to %description",
                          array("description" => $providers->$new_provider)));
 
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        // We don't care if there was a problem destroying the session.
+      }
       url::redirect(item::root()->abs_url());
     }
 
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 36c617a8..520f580c 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -79,7 +79,6 @@ class user_installer {
 
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
-    user::activate();
     module::set_var("gallery", "identity_provider", "user");
     module::set_version("user", 1);
   }
-- 
cgit v1.2.3


From 9297325c2797d74aa9516e340d45d425bda85b3b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 06:52:08 -0700
Subject: Minor changes to more closely align this branch with master

---
 modules/gallery/helpers/locales.php | 34 +++++++++++++++++-----------------
 modules/user/helpers/user_event.php | 22 ++++++++++------------
 themes/admin_wind/css/screen.css    |  3 +--
 3 files changed, 28 insertions(+), 31 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index c2a606cd..2de029ff 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -136,23 +136,6 @@ class locales_Core {
     return in_array($language, array("he", "fa", "ar"));
   }
 
-  static function set_request_locale() {
-    // 1. Check the session specific preference (cookie)
-    $locale = self::cookie_locale();
-    // 2. Check the user's preference
-    if (!$locale) {
-      $locale = identity::active_user()->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.
@@ -237,6 +220,23 @@ class locales_Core {
     return array(null, 0);
   }
 
+  static function set_request_locale() {
+    // 1. Check the session specific preference (cookie)
+    $locale = self::cookie_locale();
+    // 2. Check the user's preference
+    if (!$locale) {
+      $locale = identity::active_user()->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);
+    }
+  }
+
   static function cookie_locale() {
     $cookie_data = Input::instance()->cookie("g_locale");
     $locale = null;
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 7916047f..a4a6e5da 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,19 +20,17 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $config = module::get_var("gallery", "identity_provider", "user");
-    if ($config == "user") {
-      $user_group_menu = Menu::factory("link")
-        ->id("users_groups")
-        ->label(t("Users/Groups"))
-        ->url(url::site("admin/users"));
-      $identity_menu = $menu->get("identity_menu");
-      if (empty($identity_menu)) {
-        $menu->add_after("appearance_menu", $user_group_menu);
-      }else {
-        $identity_menu->append($user_group_menu);
-      }
+    $user_group_menu = Menu::factory("link")
+      ->id("users_groups")
+      ->label(t("Users/Groups"))
+      ->url(url::site("admin/users"));
+    $identity_menu = $menu->get("identity_menu");
+    if (empty($identity_menu)) {
+      $menu->add_after("appearance_menu", $user_group_menu);
+    }else {
+      $identity_menu->append($user_group_menu);
     }
+
     return $menu;
   }
 }
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 65a2f43b..a889545b 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -418,8 +418,7 @@ li.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.g-default-group h4, li.g-default-group .g-user,
-li.g-group-disable h4, li.g-group-disable .g-user {
+li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
-- 
cgit v1.2.3


From b3e175006cc3be2c1793797e726095520ba16d9c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 07:48:07 -0700
Subject: Move the filters that the File_Structure_Test use into a seperate
 file so other tests. can use them.  Add a No_Direct_ORM_Access_Test to find
 all places that the user or group table are accessed outside of the user
 module.  This test will fail at this point, as it in preparation for the
 IdentityProvider refactor.

---
 modules/gallery/tests/File_Structure_Test.php    | 32 +---------
 modules/gallery/tests/Gallery_Filters.php        | 48 +++++++++++++++
 modules/user/tests/No_Direct_ORM_Access_Test.php | 77 ++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 30 deletions(-)
 create mode 100644 modules/gallery/tests/Gallery_Filters.php
 create mode 100644 modules/user/tests/No_Direct_ORM_Access_Test.php

(limited to 'modules/user')

diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 9018f4c6..ff9ff1a1 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -17,6 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
 class File_Structure_Test extends Unit_Test_Case {
   public function no_trailing_closing_php_tag_test() {
     $dir = new GalleryCodeFilterIterator(
@@ -261,33 +263,3 @@ class File_Structure_Test extends Unit_Test_Case {
     }
   }
 }
-
-class PhpCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    $path_name = $this->getInnerIterator()->getPathName();
-    return substr($path_name, -4) == ".php";
-  }
-}
-
-class GalleryCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    // Skip anything that we didn"t write
-    $path_name = $this->getInnerIterator()->getPathName();
-    return !(
-      strpos($path_name, ".svn") ||
-      strpos($path_name, DOCROOT . "test") !== false ||
-      strpos($path_name, DOCROOT . "var") !== false ||
-      strpos($path_name, MODPATH . "forge") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
-      strpos($path_name, MODPATH . "unit_test") !== false ||
-      strpos($path_name, MODPATH . "exif/lib") !== false ||
-      strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
-      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
-      strpos($path_name, SYSPATH) !== false ||
-      strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
-      substr($path_name, -1, 1) == "~");
-  }
-}
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
new file mode 100644
index 00000000..d1bc2cfa
--- /dev/null
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -0,0 +1,48 @@
+<?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 PhpCodeFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return substr($path_name, -4) == ".php";
+  }
+}
+
+class GalleryCodeFilterIterator extends FilterIterator {
+  public function accept() {
+    // Skip anything that we didn"t write
+    $path_name = $this->getInnerIterator()->getPathName();
+    return !(
+      strpos($path_name, ".svn") ||
+      strpos($path_name, DOCROOT . "test") !== false ||
+      strpos($path_name, DOCROOT . "var") !== false ||
+      strpos($path_name, MODPATH . "forge") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
+      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
+      strpos($path_name, MODPATH . "unit_test") !== false ||
+      strpos($path_name, MODPATH . "exif/lib") !== false ||
+      strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
+      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
+      strpos($path_name, SYSPATH) !== false ||
+      strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
+      substr($path_name, -1, 1) == "~");
+  }
+}
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
new file mode 100644
index 00000000..440321fa
--- /dev/null
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -0,0 +1,77 @@
+<?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.
+ */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
+class No_Direct_ORM_Access_Test extends Unit_Test_Case {
+  public function no_access_to_users_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      //if (basename(dirname($file)) == "helpers") {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
+    }
+  }
+
+  public function no_access_to_groups_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
+    }
+  }
+
+}
+
+class UserModuleFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return strpos($path_name, "/modules/user") === false;
+  }
+}
-- 
cgit v1.2.3


From e3d6920cd9fdec948ebd5d2954260c67c6aff145 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 08:36:49 -0700
Subject: synchronize with the master branch

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

(limited to 'modules/user')

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index fed92c5e..b64f93b1 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -2,7 +2,7 @@
 <script type="text/javascript">
   var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
   $(document).ready(function(){
-    $("#g-user-admin-list .g-draggable").draggable({
+    $("#g-user-admin-list .core-info").draggable({
       helper: "clone"
     });
     $("#g-group-admin .g-group").droppable({
@@ -20,7 +20,6 @@
     });
     $("#group-1").droppable("destroy");
     $("#group-2").droppable("destroy");
-    $(".g-group-disable").droppable("destroy");
   });
 
   var reload_group = function(group_id) {
-- 
cgit v1.2.3


From 2e998664d57bcaf38e8d1dc19606768bd6f557a3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 09:23:02 -0700
Subject: move controllers and views to the user module to make the Identity
 Provider refactor smaller

---
 modules/gallery/controllers/password.php      | 133 ------------
 modules/gallery/helpers/group.php             | 120 -----------
 modules/gallery/helpers/user.php              | 279 --------------------------
 modules/gallery/views/reset_password.html.php |  17 --
 modules/user/controllers/password.php         | 133 ++++++++++++
 modules/user/helpers/group.php                | 120 +++++++++++
 modules/user/helpers/user.php                 | 279 ++++++++++++++++++++++++++
 modules/user/views/reset_password.html.php    |  17 ++
 8 files changed, 549 insertions(+), 549 deletions(-)
 delete mode 100644 modules/gallery/controllers/password.php
 delete mode 100644 modules/gallery/helpers/group.php
 delete mode 100644 modules/gallery/helpers/user.php
 delete mode 100644 modules/gallery/views/reset_password.html.php
 create mode 100644 modules/user/controllers/password.php
 create mode 100644 modules/user/helpers/group.php
 create mode 100644 modules/user/helpers/user.php
 create mode 100644 modules/user/views/reset_password.html.php

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/password.php b/modules/gallery/controllers/password.php
deleted file mode 100644
index e8b08960..00000000
--- a/modules/gallery/controllers/password.php
+++ /dev/null
@@ -1,133 +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 Password_Controller extends Controller {
-  public function reset() {
-    if (request::method() == "post") {
-      // @todo separate the post from get parts of this function
-      access::verify_csrf();
-      $this->_send_reset();
-    } else {
-      print $this->_reset_form();
-    }
-  }
-
-  public function do_reset() {
-    if (request::method() == "post") {
-      $this->_change_password();
-    } else {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
-      if (!empty($user)) {
-        print $this->_new_password_form($user->hash);
-      } else {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-    }
-  }
-
-  private function _send_reset() {
-    $form = $this->_reset_form();
-
-    $valid = $form->validate();
-    if ($valid) {
-      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
-      if (!$user->loaded || empty($user->email)) {
-        $form->reset->inputs["name"]->add_error("no_email", 1);
-        $valid = false;
-      }
-    }
-
-    if ($valid) {
-      $user->hash = md5(rand());
-      $user->save();
-      $message = new View("reset_password.html");
-      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
-      $message->user = $user;
-
-      Sendmail::factory()
-        ->to($user->email)
-        ->subject(t("Password Reset Request"))
-        ->header("Mime-Version", "1.0")
-        ->header("Content-type", "text/html; charset=iso-8859-1")
-        ->message($message->render())
-        ->send();
-
-      log::success(
-        "user",
-        t("Password reset email sent for user %name", array("name" => $user->name)));
-    } else {
-      // Don't include the username here until you're sure that it's XSS safe
-      log::warning(
-        "user", "Password reset email requested for bogus user");
-    }
-
-    message::success(t("Password reset email sent"));
-    print json_encode(
-      array("result" => "success"));
-  }
-
-  private function _reset_form() {
-    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
-    $group = $form->group("reset")->label(t("Reset Password"));
-    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
-    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
-    $group->submit("")->value(t("Reset"));
-
-    return $form;
-  }
-
-  private function _new_password_form($hash=null) {
-    $template = new Theme_View("page.html", "reset");
-
-    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
-    $group = $form->group("reset")->label(t("Change Password"));
-    $hidden = $group->hidden("hash");
-    if (!empty($hash)) {
-      $hidden->value($hash);
-    }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
-    $group->inputs["password2"]->error_messages(
-      "mistyped", t("The password and the confirm password must match"));
-    $group->submit("")->value(t("Update"));
-
-    $template->content = $form;
-    return $template;
-  }
-
-  private function _change_password() {
-    $view = $this->_new_password_form();
-    if ($view->content->validate()) {
-      $user = user::lookup_by_hash(Input::instance()->get("key"));
-      if (empty($user)) {
-        throw new Exception("@todo FORBIDDEN", 503);
-      }
-
-      $user->password = $view->content->reset->password->value;
-      $user->hash = null;
-      $user->save();
-      message::success(t("Password reset successfully"));
-      url::redirect(item::root()->abs_url());
-    } else {
-      print $view;
-    }
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/helpers/group.php b/modules/gallery/helpers/group.php
deleted file mode 100644
index 1702fb87..00000000
--- a/modules/gallery/helpers/group.php
+++ /dev/null
@@ -1,120 +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.
- */
-
-/**
- * This is the API for handling groups.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class group_Core {
-  /**
-   * Create a new group.
-   *
-   * @param string  $name
-   * @return Group_Model
-   */
-  static function create($name) {
-    $group = ORM::factory("group")->where("name", $name)->find();
-    if ($group->loaded) {
-      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
-    }
-
-    $group->name = $name;
-    $group->save();
-
-    return $group;
-  }
-
-  /**
-   * The group of all possible visitors.  This includes the guest user.
-   *
-   * @return Group_Model
-   */
-  static function everybody() {
-    return model_cache::get("group", 1);
-  }
-
-  /**
-   * The group of all logged-in visitors.  This does not include guest users.
-   *
-   * @return Group_Model
-   */
-  static function registered_users() {
-    return model_cache::get("group", 2);
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    return self::_lookup_group_by_field("id", $id);
-  }
-
-  /**
-   * Look up a group by name.
-   * @param integer      $id the group name
-   * @return Group_Model  the group object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    return self::_lookup_group_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return Group_Model  the user object, or null if the name was invalid.
-   */
-  private static function _lookup_group_by_field($field_name, $value) {
-    try {
-      $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded) {
-        return $user;
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * List the users
-   * @param mixed      filters (@see Database.php
-   * @return array     the group list.
-   */
-  static function get_group_list($filter=array()) {
-    $group = ORM::factory("group");
-
-    foreach($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $group->in($args[0], $args[1]);
-        break;
-      default:
-        $group->$method($args);
-      }
-    }
-    return $group->find_all();
-  }
-}
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
deleted file mode 100644
index e7e75d64..00000000
--- a/modules/gallery/helpers/user.php
+++ /dev/null
@@ -1,279 +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.
- */
-
-/**
- * This is the API for handling users.
- *
- * 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-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;
-  }
-
-  /**
-   * 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 = user::guest());
-    }
-
-    // The installer cannot set a user into the session, so it just sets an id which we should
-    // upconvert into a user.
-    if ($user === 2) {
-      $user = model_cache::get("user", 2);
-      user::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);
-    }
-  }
-
-  /**
-   * Return the array of group ids this user belongs to
-   *
-   * @return array
-   */
-  static function group_ids() {
-    return Session::instance()->get("group_ids", array(1));
-  }
-
-  /**
-   * 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 = user::guest();
-    }
-    return $user;
-  }
-
-  /**
-   * Return the guest user.
-   *
-   * @todo consider caching
-   *
-   * @return User_Model
-   */
-  static function guest() {
-    return model_cache::get("user", 1);
-  }
-
-  /**
-   * 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();
-  }
-
-  /**
-   * Create a new user.
-   *
-   * @param string  $name
-   * @param string  $full_name
-   * @param string  $password
-   * @return User_Model
-   */
-  static function create($name, $full_name, $password) {
-    $user = ORM::factory("user")->where("name", $name)->find();
-    if ($user->loaded) {
-      throw new Exception("@todo USER_ALREADY_EXISTS $name");
-    }
-
-    $user->name = $name;
-    $user->full_name = $full_name;
-    $user->password = $password;
-
-    // Required groups
-    $user->add(group::everybody());
-    $user->add(group::registered_users());
-
-    $user->save();
-    return $user;
-  }
-
-  /**
-   * Is the password provided correct?
-   *
-   * @param user User Model
-   * @param string $password a plaintext password
-   * @return boolean true if the password is correct
-   */
-  static function is_correct_password($user, $password) {
-    $valid = $user->password;
-
-    // Try phpass first, since that's what we generate.
-    if (strlen($valid) == 34) {
-      require_once(MODPATH . "user/lib/PasswordHash.php");
-      $hashGenerator = new PasswordHash(10, true);
-      return $hashGenerator->CheckPassword($password, $valid);
-    }
-
-    $salt = substr($valid, 0, 4);
-    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
-    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
-    $sanitizedPassword = html::specialchars($password, false);
-    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
-          : ($salt . md5($salt . $sanitizedPassword));
-    if (!strcmp($guess, $valid)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Create the hashed passwords.
-   * @param string $password a plaintext password
-   * @return string hashed password
-   */
-  static function hash_password($password) {
-    require_once(MODPATH . "user/lib/PasswordHash.php");
-    $hashGenerator = new PasswordHash(10, true);
-    return $hashGenerator->HashPassword($password);
-  }
-
-  /**
-   * Log in as a given user.
-   * @param object $user the user object.
-   */
-  static function login($user) {
-    $user->login_count += 1;
-    $user->last_login = time();
-    $user->save();
-
-    user::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 = user::active();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-  }
-
-  /**
-   * Look up a user by id.
-   * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
-   */
-  static function lookup($id) {
-    return self::_lookup_user_by_field("id", $id);
-  }
-
-  /**
-   * Look up a user by name.
-   * @param integer      $name the user name
-   * @return User_Model  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_name($name) {
-    return self::_lookup_user_by_field("name", $name);
-  }
-
-  /**
-   * Look up a user by hash.
-   * @param integer      $hash the user hash value
-   * @return User_Model  the user object, or null if the name was invalid.
-   */
-  static function lookup_by_hash($hash) {
-    return self::_lookup_user_by_field("hash", $hash);
-  }
-
-  /**
-   * List the users
-   * @param mixed      filters (@see Database.php
-   * @return array     the user list.
-   */
-  static function get_user_list($filter=array()) {
-    $user = ORM::factory("user");
-
-    foreach($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $user->in($args[0], $args[1]);
-        break;
-      default:
-        $user->$method($args);
-      }
-    }
-    return $user->find_all();
-  }
-
-  /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return User_Core  the user object, or null if the name was invalid.
-   */
-  private static function _lookup_user_by_field($field_name, $value) {
-    try {
-      $user = model_cache::get("user", $value, $field_name);
-      if ($user->loaded) {
-        return $user;
-      }
-    } catch (Exception $e) {
-      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
-      }
-    }
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/modules/gallery/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
deleted file mode 100644
index 92ca4917..00000000
--- a/modules/gallery/views/reset_password.html.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<html>
-  <head>
-    <title><?= t("Password Reset Request") ?> </title>
-  </head>
-  <body>
-    <h2><?= t("Password Reset Request") ?> </h2>
-    <p>
-      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
-    </p>
-    <p>
-  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
-        array("site_url" => html::mark_clean(url::base(false, "http")),
-              "confirm_url" => $confirm_url)) ?>
-    </p>
-  </body>
-</html>
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
new file mode 100644
index 00000000..e8b08960
--- /dev/null
+++ b/modules/user/controllers/password.php
@@ -0,0 +1,133 @@
+<?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 Password_Controller extends Controller {
+  public function reset() {
+    if (request::method() == "post") {
+      // @todo separate the post from get parts of this function
+      access::verify_csrf();
+      $this->_send_reset();
+    } else {
+      print $this->_reset_form();
+    }
+  }
+
+  public function do_reset() {
+    if (request::method() == "post") {
+      $this->_change_password();
+    } else {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (!empty($user)) {
+        print $this->_new_password_form($user->hash);
+      } else {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+    }
+  }
+
+  private function _send_reset() {
+    $form = $this->_reset_form();
+
+    $valid = $form->validate();
+    if ($valid) {
+      $user = user::lockup_by_name($form->reset->inputs["name"]->value);
+      if (!$user->loaded || empty($user->email)) {
+        $form->reset->inputs["name"]->add_error("no_email", 1);
+        $valid = false;
+      }
+    }
+
+    if ($valid) {
+      $user->hash = md5(rand());
+      $user->save();
+      $message = new View("reset_password.html");
+      $message->confirm_url = url::abs_site("password/do_reset?key=$user->hash");
+      $message->user = $user;
+
+      Sendmail::factory()
+        ->to($user->email)
+        ->subject(t("Password Reset Request"))
+        ->header("Mime-Version", "1.0")
+        ->header("Content-type", "text/html; charset=iso-8859-1")
+        ->message($message->render())
+        ->send();
+
+      log::success(
+        "user",
+        t("Password reset email sent for user %name", array("name" => $user->name)));
+    } else {
+      // Don't include the username here until you're sure that it's XSS safe
+      log::warning(
+        "user", "Password reset email requested for bogus user");
+    }
+
+    message::success(t("Password reset email sent"));
+    print json_encode(
+      array("result" => "success"));
+  }
+
+  private function _reset_form() {
+    $form = new Forge(url::current(true), "", "post", array("id" => "g-reset-form"));
+    $group = $form->group("reset")->label(t("Reset Password"));
+    $group->input("name")->label(t("Username"))->id("g-name")->class(null)->rules("required");
+    $group->inputs["name"]->error_messages("no_email", t("No email, unable to reset password"));
+    $group->submit("")->value(t("Reset"));
+
+    return $form;
+  }
+
+  private function _new_password_form($hash=null) {
+    $template = new Theme_View("page.html", "reset");
+
+    $form = new Forge("password/do_reset", "", "post", array("id" => "g-change-password-form"));
+    $group = $form->group("reset")->label(t("Change Password"));
+    $hidden = $group->hidden("hash");
+    if (!empty($hash)) {
+      $hidden->value($hash);
+    }
+    $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules("required|length[1,40]");
+    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+      ->matches($group->password);
+    $group->inputs["password2"]->error_messages(
+      "mistyped", t("The password and the confirm password must match"));
+    $group->submit("")->value(t("Update"));
+
+    $template->content = $form;
+    return $template;
+  }
+
+  private function _change_password() {
+    $view = $this->_new_password_form();
+    if ($view->content->validate()) {
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
+      if (empty($user)) {
+        throw new Exception("@todo FORBIDDEN", 503);
+      }
+
+      $user->password = $view->content->reset->password->value;
+      $user->hash = null;
+      $user->save();
+      message::success(t("Password reset successfully"));
+      url::redirect(item::root()->abs_url());
+    } else {
+      print $view;
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
new file mode 100644
index 00000000..1702fb87
--- /dev/null
+++ b/modules/user/helpers/group.php
@@ -0,0 +1,120 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling groups.
+ *
+ * Note: by design, this class does not do any permission checking.
+ */
+class group_Core {
+  /**
+   * Create a new group.
+   *
+   * @param string  $name
+   * @return Group_Model
+   */
+  static function create($name) {
+    $group = ORM::factory("group")->where("name", $name)->find();
+    if ($group->loaded) {
+      throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
+    }
+
+    $group->name = $name;
+    $group->save();
+
+    return $group;
+  }
+
+  /**
+   * The group of all possible visitors.  This includes the guest user.
+   *
+   * @return Group_Model
+   */
+  static function everybody() {
+    return model_cache::get("group", 1);
+  }
+
+  /**
+   * The group of all logged-in visitors.  This does not include guest users.
+   *
+   * @return Group_Model
+   */
+  static function registered_users() {
+    return model_cache::get("group", 2);
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return self::_lookup_group_by_field("id", $id);
+  }
+
+  /**
+   * Look up a group by name.
+   * @param integer      $id the group name
+   * @return Group_Model  the group object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return self::_lookup_group_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return Group_Model  the user object, or null if the name was invalid.
+   */
+  private static function _lookup_group_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("group", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the group list.
+   */
+  static function get_group_list($filter=array()) {
+    $group = ORM::factory("group");
+
+    foreach($filter as $method => $args) {
+      switch ($method) {
+      case "in":
+        $group->in($args[0], $args[1]);
+        break;
+      default:
+        $group->$method($args);
+      }
+    }
+    return $group->find_all();
+  }
+}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
new file mode 100644
index 00000000..e7e75d64
--- /dev/null
+++ b/modules/user/helpers/user.php
@@ -0,0 +1,279 @@
+<?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.
+ */
+
+/**
+ * This is the API for handling users.
+ *
+ * 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-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;
+  }
+
+  /**
+   * 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 = user::guest());
+    }
+
+    // The installer cannot set a user into the session, so it just sets an id which we should
+    // upconvert into a user.
+    if ($user === 2) {
+      $user = model_cache::get("user", 2);
+      user::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);
+    }
+  }
+
+  /**
+   * Return the array of group ids this user belongs to
+   *
+   * @return array
+   */
+  static function group_ids() {
+    return Session::instance()->get("group_ids", array(1));
+  }
+
+  /**
+   * 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 = user::guest();
+    }
+    return $user;
+  }
+
+  /**
+   * Return the guest user.
+   *
+   * @todo consider caching
+   *
+   * @return User_Model
+   */
+  static function guest() {
+    return model_cache::get("user", 1);
+  }
+
+  /**
+   * 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();
+  }
+
+  /**
+   * Create a new user.
+   *
+   * @param string  $name
+   * @param string  $full_name
+   * @param string  $password
+   * @return User_Model
+   */
+  static function create($name, $full_name, $password) {
+    $user = ORM::factory("user")->where("name", $name)->find();
+    if ($user->loaded) {
+      throw new Exception("@todo USER_ALREADY_EXISTS $name");
+    }
+
+    $user->name = $name;
+    $user->full_name = $full_name;
+    $user->password = $password;
+
+    // Required groups
+    $user->add(group::everybody());
+    $user->add(group::registered_users());
+
+    $user->save();
+    return $user;
+  }
+
+  /**
+   * Is the password provided correct?
+   *
+   * @param user User Model
+   * @param string $password a plaintext password
+   * @return boolean true if the password is correct
+   */
+  static function is_correct_password($user, $password) {
+    $valid = $user->password;
+
+    // Try phpass first, since that's what we generate.
+    if (strlen($valid) == 34) {
+      require_once(MODPATH . "user/lib/PasswordHash.php");
+      $hashGenerator = new PasswordHash(10, true);
+      return $hashGenerator->CheckPassword($password, $valid);
+    }
+
+    $salt = substr($valid, 0, 4);
+    // Support both old (G1 thru 1.4.0; G2 thru alpha-4) and new password schemes:
+    $guess = (strlen($valid) == 32) ? md5($password) : ($salt . md5($salt . $password));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    // Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
+    $sanitizedPassword = html::specialchars($password, false);
+    $guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
+          : ($salt . md5($salt . $sanitizedPassword));
+    if (!strcmp($guess, $valid)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Create the hashed passwords.
+   * @param string $password a plaintext password
+   * @return string hashed password
+   */
+  static function hash_password($password) {
+    require_once(MODPATH . "user/lib/PasswordHash.php");
+    $hashGenerator = new PasswordHash(10, true);
+    return $hashGenerator->HashPassword($password);
+  }
+
+  /**
+   * Log in as a given user.
+   * @param object $user the user object.
+   */
+  static function login($user) {
+    $user->login_count += 1;
+    $user->last_login = time();
+    $user->save();
+
+    user::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 = user::active();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
+  }
+
+  /**
+   * Look up a user by id.
+   * @param integer      $id the user id
+   * @return User_Model  the user object, or null if the id was invalid.
+   */
+  static function lookup($id) {
+    return self::_lookup_user_by_field("id", $id);
+  }
+
+  /**
+   * Look up a user by name.
+   * @param integer      $name the user name
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_name($name) {
+    return self::_lookup_user_by_field("name", $name);
+  }
+
+  /**
+   * Look up a user by hash.
+   * @param integer      $hash the user hash value
+   * @return User_Model  the user object, or null if the name was invalid.
+   */
+  static function lookup_by_hash($hash) {
+    return self::_lookup_user_by_field("hash", $hash);
+  }
+
+  /**
+   * List the users
+   * @param mixed      filters (@see Database.php
+   * @return array     the user list.
+   */
+  static function get_user_list($filter=array()) {
+    $user = ORM::factory("user");
+
+    foreach($filter as $method => $args) {
+      switch ($method) {
+      case "in":
+        $user->in($args[0], $args[1]);
+        break;
+      default:
+        $user->$method($args);
+      }
+    }
+    return $user->find_all();
+  }
+
+  /**
+   * Look up a user by field value.
+   * @param string      search field
+   * @param string      search value
+   * @return User_Core  the user object, or null if the name was invalid.
+   */
+  private static function _lookup_user_by_field($field_name, $value) {
+    try {
+      $user = model_cache::get("user", $value, $field_name);
+      if ($user->loaded) {
+        return $user;
+      }
+    } catch (Exception $e) {
+      if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
+       throw $e;
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/modules/user/views/reset_password.html.php b/modules/user/views/reset_password.html.php
new file mode 100644
index 00000000..92ca4917
--- /dev/null
+++ b/modules/user/views/reset_password.html.php
@@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Password Reset Request") ?> </title>
+  </head>
+  <body>
+    <h2><?= t("Password Reset Request") ?> </h2>
+    <p>
+      <?= t("Hello, %name,", array("name" => $user->full_name ? $user->full_name : $user->name)) ?>
+    </p>
+    <p>
+  <?= t("We received a request to reset your password for <a href=\"%site_url\">%site_url</a>.  If you made this request, you can confirm it by <a href=\"%confirm_url\">clicking this link</a>.  If you didn't request this password reset, it's ok to ignore this mail.",
+        array("site_url" => html::mark_clean(url::base(false, "http")),
+              "confirm_url" => $confirm_url)) ?>
+    </p>
+  </body>
+</html>
-- 
cgit v1.2.3


From c24d01bb9cb8c5bcccfe8a8bf944038dc15cf433 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 10:52:42 -0700
Subject: Standardize the use of the lookup methods

---
 modules/user/helpers/group.php                              | 6 +++---
 modules/user/libraries/drivers/IdentityProvider/Gallery.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 567b2ee4..e65b6c96 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -65,7 +65,7 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return self::lookup_by_field("id", $id);
+    return self::_lookup_by_field("id", $id);
   }
 
   /**
@@ -74,7 +74,7 @@ class group_Core {
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return self::lookup_by_field("name", $name);
+    return self::_lookup_by_field("name", $name);
   }
 
   /**
@@ -83,7 +83,7 @@ class group_Core {
    * @param string      $value value to match
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
-  static function lookup_by_field($field_name, $value) {
+  private function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
       if ($user->loaded) {
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 026f04e9..c789e8ea 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -70,14 +70,14 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::lookup_user.
    */
   public function lookup_user($id) {
-    return user::lookup_by_field("id", $id);
+    return user::lookup($id);
   }
 
   /**
    * @see IdentityProvider_Driver::lookup_user_by_name.
    */
   public function lookup_user_by_name($name) {
-    return user::lookup_by_field("name", $name);
+    return user::lookup_by_name($name);
   }
 
   /**
@@ -105,14 +105,14 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::lookup_group.
    */
   public function lookup_group($id) {
-    return group::lookup_by_field("id", $id);
+    return group::lookup($id);
   }
 
   /**
    * @see IdentityProvider_Driver::lookup_group_by_name.
    */
   public function lookup_group_by_name($name) {
-    return group::lookup_by_field("name", $name);
+    return group::lookup_by_name($name);
   }
 
   /**
-- 
cgit v1.2.3


From 38141865926730506f55b62a499cb548b94d4bfe Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 23 Oct 2009 22:25:36 -0600
Subject: Created user.css. Moved user-related form css to the new sheet.

---
 modules/user/controllers/admin_users.php |  3 +--
 modules/user/controllers/users.php       |  1 -
 modules/user/css/user.css                |  7 +++++++
 modules/user/helpers/user.php            |  2 +-
 modules/user/helpers/user_theme.php      | 28 ++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 modules/user/css/user.css
 create mode 100644 modules/user/helpers/user_theme.php

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 5950c358..a34d152a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -313,7 +313,6 @@ class Admin_Users_Controller extends Admin_Controller {
 
   static function _get_user_add_form_admin() {
     $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $form->set_attr('class', "g-narrow");
     $group = $form->group("add_user")->label(t("Add User"));
     $group->input("name")->label(t("Username"))->id("g-username")
       ->error_messages("in_use", t("There is already a user with that username"));
@@ -372,7 +371,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
   private function _get_group_add_form_admin() {
     $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-narrow");
+    $form->set_attr('class', "g-one-quarter");
     $form_group = $form->group("add_group")->label(t("Add Group"));
     $form_group->input("name")->label(t("Name"))->id("g-name");
     $form_group->inputs["name"]->error_messages(
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index b03a47cc..2be49065 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -68,7 +68,6 @@ class Users_Controller extends Controller {
 
   private function _get_edit_form($user) {
     $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
     $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
new file mode 100644
index 00000000..aa21f9c3
--- /dev/null
+++ b/modules/user/css/user.css
@@ -0,0 +1,7 @@
+#g-login-form,
+#g-add-user-form
+#g-edit-user-form,
+#g-delete-user-form,
+#g-user-admin {
+  width: 270px;
+}
\ No newline at end of file
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index e7e75d64..47f57d3d 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,7 +26,7 @@
 class user_Core {
   static function get_login_form($url) {
     $form = new Forge($url, "", "post", array("id" => "g-login-form"));
-    $form->set_attr('class', "g-narrow");
+    $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);
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
new file mode 100644
index 00000000..191fd15a
--- /dev/null
+++ b/modules/user/helpers/user_theme.php
@@ -0,0 +1,28 @@
+<?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) {
+    $theme->css("user.css");
+  }
+
+  static function admin_head($theme) {
+    $theme->css("user.css");
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From bb47b495a7d719ee679e4747e9fd5b8f7c39b58a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 23 Oct 2009 22:28:26 -0600
Subject: Moved remaining user and group admin css into the new user.css style
 sheet.

---
 modules/user/css/user.css        | 51 +++++++++++++++++++++++++++++++++++++++-
 themes/admin_wind/css/screen.css | 44 ----------------------------------
 2 files changed, 50 insertions(+), 45 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index aa21f9c3..3b5e7ac2 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -4,4 +4,53 @@
 #g-delete-user-form,
 #g-user-admin {
   width: 270px;
-}
\ No newline at end of file
+}
+
+#g-user-admin-list .admin {
+  color: #55f;
+  font-weight: bold;
+}
+
+li.g-group {
+  float: left;
+  display: block;
+  width: 200px;
+  border: 1px solid gray;
+  padding: 0;
+  margin: 0 1em 1em 0;
+}
+
+li.g-group h4 {
+  background-color: #eee;
+  border-bottom: 1px dashed #ccc;
+  padding: .5em 0 .5em .5em;
+}
+
+li.g-group .g-button {
+  padding: 0;
+}
+
+li.g-group ul, li.g-group div {
+  height: 180px;
+  margin: 1px;
+  overflow: auto;
+  padding-top: .2em;
+}
+
+li.g-group div p {
+  color: gray;
+  text-align: center;
+  padding: 2em .5em 0 .5em
+}
+
+li.g-group .g-user {
+  padding: .2em 0 0 .5em;
+}
+
+li.g-group .g-user .g-button {
+  vertical-align: middle;
+}
+
+li.g-default-group h4, li.g-default-group .g-user {
+  color: gray;
+}
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index a889545b..25302407 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -373,55 +373,11 @@ tr.g-warning {
   margin-right: 1em;
 }
 
-#g-user-admin-list .admin {
-  color: #55f;
-  font-weight: bold;
-}
-
 .g-actions a,
 .g-actions span {
   margin-right: 3em;
 }
 
-li.g-group {
-  float: left;
-  display: block;
-  width: 200px;
-  border: 1px solid gray;
-  padding: 0;
-  margin: 0 1em 1em 0;
-}
-
-li.g-group h4 {
-  background-color: #eee;
-  border-bottom: 1px dashed #ccc;
-  padding: .5em 0 .5em .5em;
-}
-li.g-group .g-button {
-  padding: 0;
-}
-li.g-group ul, li.g-group div {
-  height: 180px;
-  margin: 1px;
-  overflow: auto;
-  padding-top: .2em;
-}
-li.g-group div p {
-  color: gray;
-  text-align: center;
-  padding: 2em .5em 0 .5em
-}
-li.g-group .g-user {
-  padding: .2em 0 0 .5em;
-}
-li.g-group .g-user .g-button {
-  vertical-align: middle;
-}
-
-li.g-default-group h4, li.g-default-group .g-user {
-  color: gray;
-}
-
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-admin-blocks-list {
-- 
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/user')

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 274d4680fad4aa8254b35b4906847d262b53cd33 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 26 Oct 2009 09:36:51 -0700
Subject: Upgrade the gallery module to version 16 to reflect the refactoring
 of the user module into an identity provider. Change how we determine if
 there are available groups that we need to export

---
 modules/gallery/helpers/access.php            | 3 +--
 modules/gallery/helpers/gallery_installer.php | 9 ++++++++-
 modules/gallery/module.info                   | 2 +-
 modules/user/helpers/user_installer.php       | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index a3abbe2e..c1c1f9d1 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -421,8 +421,7 @@ class access_Core {
   private static function _get_all_groups() {
     // When we build the gallery package, it's possible that there is no identity provider installed yet.
     // This is ok at packaging time, so work around it.
-    $config = module::get_var("gallery", "identity_provider");
-    if (!empty($config)) {
+   if (module::is_active(module::get_var("gallery", "identity_provider", "user"))) {
       return identity::groups();
     } else {
       return array();
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 9c19eaed..01a213c8 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -253,6 +253,8 @@ class gallery_installer {
       $theme->save();
     }
 
+    module::set_var("gallery", "identity_provider", "user");
+
     block_manager::add("dashboard_sidebar", "gallery", "block_adder");
     block_manager::add("dashboard_sidebar", "gallery", "stats");
     block_manager::add("dashboard_sidebar", "gallery", "platform_info");
@@ -268,7 +270,7 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 15);
+    module::set_version("gallery", 16);
   }
 
   static function upgrade($version) {
@@ -393,6 +395,11 @@ class gallery_installer {
       }
       module::set_version("gallery", $version = 15);
     }
+
+    if ($version == 15) {
+      module::set_var("gallery", "identity_provider", "user");
+      module::set_version("gallery", $version = 16);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index f509ff08..e21431a7 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 15
+version = 16
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 520f580c..cc8e71ea 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -79,7 +79,7 @@ class user_installer {
 
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
-    module::set_var("gallery", "identity_provider", "user");
+
     module::set_version("user", 1);
   }
 
-- 
cgit v1.2.3


From 2dcd8f8a25fc698f2279a09752cc7bb9dfe1d7ec Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 26 Oct 2009 11:37:03 -0700
Subject: When we are changing the password using the change password from as
 part of the password reset, the input value is in the post[hash] variable as
 opposed to the get(key) value.  This should fix ticket #850.

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

(limited to 'modules/user')

diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 6bef1a17..b76a5e92 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -116,7 +116,7 @@ class Password_Controller extends Controller {
   private function _change_password() {
     $view = $this->_new_password_form();
     if ($view->content->validate()) {
-      $user = user::lookup_user_by_field("hash", Input::instance()->get("key"));
+      $user = user::lookup_by_hash(Input::instance()->post("hash"));
       if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
-- 
cgit v1.2.3


From 514915438b91f44cab1682ee7495e2ef43aeeab1 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 07:57:51 -0700
Subject: Add a flag in the module.info (no_module_admin) to indicate that this
 module shouldn't be managed by the default module administration screen. 
 This module will always be locked on that screen.

---
 modules/gallery/helpers/module.php | 2 +-
 modules/user/module.info           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 27bc3784..da334370 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -98,7 +98,7 @@ class module_Core {
         $m->active = self::is_active($module_name);
         $m->code_version = $m->version;
         $m->version = self::get_version($module_name);
-        $m->locked = false;
+        $m->locked = !empty($m->no_module_admin);
       }
 
       // Lock certain modules
diff --git a/modules/user/module.info b/modules/user/module.info
index 8a9af407..36a2179a 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,3 +1,6 @@
 name = "Users and Groups"
-description = "Provides user and group management"
+description = "Gallery 3 user and group management"
 version = 1
+
+; Don't show this module on the module administration screen
+no_module_admin = 1
-- 
cgit v1.2.3


From 156a99beef968a22167502bb6389b4df7526feb0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 10:13:40 -0700
Subject: Set the minimum password length to 5.  The gallery owner can change
 this in the advance settings.

---
 modules/user/controllers/admin_users.php |  5 ++++-
 modules/user/controllers/password.php    |  5 +++--
 modules/user/controllers/users.php       |  5 +++++
 modules/user/helpers/user_installer.php  | 12 +++++++++++-
 modules/user/module.info                 |  2 +-
 5 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 4d80521e..55a525ba 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -308,7 +308,6 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
     $form->add_rules_from($user);
-    $form->edit_user->password->rules("-required");
 
     module::event("user_edit_form_admin", $user, $form);
     $group->submit("")->value(t("Modify User"));
@@ -330,6 +329,10 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin");
     $form->add_rules_from(ORM::factory("user"));
 
+    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $form->edit_user->password
+      ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
+
     module::event("user_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
     return $form;
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index b76a5e92..888fb37d 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -101,8 +101,9 @@ class Password_Controller extends Controller {
     if (!empty($hash)) {
       $hidden->value($hash);
     }
-    $group->password("password")->label(t("Password"))->id("g-password")
-      ->rules("required|length[1,40]");
+    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $input_password = $group->password("password")->label(t("Password"))->id("g-password")
+      ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
     $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
       ->matches($group->password);
     $group->inputs["password2"]->error_messages(
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 28164e9c..3507ec6d 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -78,6 +78,11 @@ class Users_Controller extends Controller {
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $form->add_rules_from($user);
 
+    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $form->edit_user->password
+      ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
+
+
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
     return $form;
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index cc8e71ea..9aad4130 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -80,7 +80,17 @@ class user_installer {
     access::allow($registered, "view", $root);
     access::allow($registered, "view_full", $root);
 
-    module::set_version("user", 1);
+    module::set_var("user", "mininum_password_length", 5);
+
+    module::set_version("user", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::set_var("user", "mininum_password_length", 5);
+
+      module::set_version("user", $version = 2);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/user/module.info b/modules/user/module.info
index 36a2179a..7178f108 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,6 +1,6 @@
 name = "Users and Groups"
 description = "Gallery 3 user and group management"
-version = 1
+version = 2
 
 ; Don't show this module on the module administration screen
 no_module_admin = 1
-- 
cgit v1.2.3


From 1347a300509b2ab3083bb88193987c18b33187ad Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 12:23:48 -0700
Subject: Add a password strength meter.

---
 modules/user/controllers/admin_users.php |  13 +++++++----
 modules/user/controllers/password.php    |  11 +++++----
 modules/user/controllers/users.php       |   4 +++-
 modules/user/css/progressImg1.png        | Bin 0 -> 390 bytes
 modules/user/css/user.css                |  36 ++++++++++++++++++++++++++++
 modules/user/helpers/user_theme.php      |   2 ++
 modules/user/js/password_strength.js     |  39 +++++++++++++++++++++++++++++++
 modules/user/views/user_form.html.php    |   7 ++++++
 8 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 modules/user/css/progressImg1.png
 create mode 100644 modules/user/js/password_strength.js
 create mode 100644 modules/user/views/user_form.html.php

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 55a525ba..ac5dc33c 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -63,7 +63,9 @@ class Admin_Users_Controller extends Admin_Controller {
   }
 
   public function add_user_form() {
-    print $this->_get_user_add_form_admin();
+    $v = new View("user_form.html");
+    $v->form = $this->_get_user_add_form_admin();
+    print $v;
   }
 
   public function delete_user($id) {
@@ -156,12 +158,13 @@ class Admin_Users_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    $form = $this->_get_user_edit_form_admin($user);
+    $v = new View("user_form.html");
+    $v->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_user()->id) {
-      $form->edit_user->admin->disabled(1);
+      $v->form->edit_user->admin->disabled(1);
     }
-    print $form;
+    print $v;
   }
 
   public function add_user_to_group($user_id, $group_id) {
@@ -330,7 +333,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form->add_rules_from(ORM::factory("user"));
 
     $minimum_length = module::get_var("user", "mininum_password_length", 5);
-    $form->edit_user->password
+    $form->add_user->password
       ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
 
     module::event("user_add_form_admin", $user, $form);
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 888fb37d..5f36b554 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -32,7 +32,7 @@ class Password_Controller extends Controller {
     if (request::method() == "post") {
       $this->_change_password();
     } else {
-      $user = user::lookup_user_by_field("hash", Input::instance()->get("key"));
+      $user = user::lookup_by_hash(Input::instance()->get("key"));
       if (!empty($user)) {
         print $this->_new_password_form($user->hash);
       } else {
@@ -46,7 +46,7 @@ class Password_Controller extends Controller {
 
     $valid = $form->validate();
     if ($valid) {
-      $user = identity::lookup_user_by_name($form->reset->inputs["name"]->value);
+      $user = user::lookup_by_name($form->reset->inputs["name"]->value);
       if (!$user->loaded || empty($user->email)) {
         $form->reset->inputs["name"]->add_error("no_email", 1);
         $valid = false;
@@ -110,19 +110,20 @@ class Password_Controller extends Controller {
       "mistyped", t("The password and the confirm password must match"));
     $group->submit("")->value(t("Update"));
 
-    $template->content = $form;
+    $template->content = new View("user_form.html");
+    $template->content->form = $form;
     return $template;
   }
 
   private function _change_password() {
     $view = $this->_new_password_form();
-    if ($view->content->validate()) {
+    if ($view->content->form->validate()) {
       $user = user::lookup_by_hash(Input::instance()->post("hash"));
       if (empty($user)) {
         throw new Exception("@todo FORBIDDEN", 503);
       }
 
-      $user->password = $view->content->reset->password->value;
+      $user->password = $view->content->form->reset->password->value;
       $user->hash = null;
       $user->save();
       message::success(t("Password reset successfully"));
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 3507ec6d..7bcc74d7 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -63,7 +63,9 @@ class Users_Controller extends Controller {
       access::forbidden();
     }
 
-    print $this->_get_edit_form($user);
+    $v = new View("user_form.html");
+    $v->form = $this->_get_edit_form($user);
+    print $v;
   }
 
   private function _get_edit_form($user) {
diff --git a/modules/user/css/progressImg1.png b/modules/user/css/progressImg1.png
new file mode 100644
index 00000000..a9093647
Binary files /dev/null and b/modules/user/css/progressImg1.png differ
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 3b5e7ac2..67d4f196 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -54,3 +54,39 @@ li.g-group .g-user .g-button {
 li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
+
+.g-password-strength0 {
+  background: url(progressImg1.png) no-repeat 0 0;
+  width: 138px;
+  height: 7px;
+}
+.g-password-strength10 {
+  background-position:0 -7px;
+}
+.g-password-strength20 {
+  background-position:0 -14px;
+}
+.g-password-strength30 {
+  background-position:0 -21px;
+}
+.g-password-strength40 {
+  background-position:0 -28px;
+}
+.g-password-strength50 {
+  background-position:0 -35px;
+}
+.g-password-strength60 {
+  background-position:0 -42px;
+}
+.g-password-strength70 {
+  background-position:0 -49px;
+}
+.g-password-strength80 {
+  background-position:0 -56px;
+}
+.g-password-strength90 {
+  background-position:0 -63px;
+}
+.g-password-strength100 {
+  background-position:0 -70px;
+}
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 191fd15a..31e2e8c0 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -20,9 +20,11 @@
 class user_theme_Core {
   static function head($theme) {
     $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
 
   static function admin_head($theme) {
     $theme->css("user.css");
+    $theme->script("password_strength.js");
   }
 }
\ No newline at end of file
diff --git a/modules/user/js/password_strength.js b/modules/user/js/password_strength.js
new file mode 100644
index 00000000..2442b8de
--- /dev/null
+++ b/modules/user/js/password_strength.js
@@ -0,0 +1,39 @@
+(function($) {
+   // Based on the Password Strength Indictor By Benjamin Sterling
+   // http://benjaminsterling.com/password-strength-indicator-and-generator/
+   $.widget("ui.user_password_strength",  {
+     _init: function() {
+       var self = this;
+       $(this.element).keyup(function() {
+	 var strength = self.calculateStrength (this.value);
+	 var index = Math.min(Math.floor( strength / 10 ), 10);
+         $("#g-password-gauge")
+           .removeAttr('class')
+	   .addClass( "g-password-strength0" )
+	   .addClass( self.options.classes[ index ] );
+       }).after("<div id='g-password-gauge' class='g-password-strength0'></div>");
+     },
+
+     calculateStrength: function(value) {
+       // Factor in the length of the password
+       var strength = Math.min(5, value.length) * 10 - 20;
+       // Factor in the number of numbers
+       strength += Math.min(3, value.length - value.replace(/[0-9]/g,"").length) * 10;
+       // Factor in the number of non word characters
+       strength += Math.min(3, value.length - value.replace(/\W/g,"").length) * 15;
+       // Factor in the number of Upper case letters
+       strength += Math.min(3, value.length - value.replace(/[A-Z]/g,"").length) * 10;
+
+       // Normalizxe between 0 and 100
+       return Math.max(0, Math.min(100, strength));
+     }
+   });
+   $.extend($.ui.user_password_strength,  {
+     defaults: {
+	classes : ['g-password-strength10', 'g-password-strength20', 'g-password-strength30',
+                   'g-password-strength40', 'g-password-strength50', 'g-password-strength60',
+                   'g-password-strength70',' g-password-strength80',' g-password-strength90',
+                   'g-password-strength100']
+     }
+   });
+ })(jQuery);
diff --git a/modules/user/views/user_form.html.php b/modules/user/views/user_form.html.php
new file mode 100644
index 00000000..039ae8a5
--- /dev/null
+++ b/modules/user/views/user_form.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script  type="text/javascript">
+  $("form").ready(function(){
+    $('input[name="password"]').user_password_strength();
+  });
+</script>
+<?= $form ?>
-- 
cgit v1.2.3


From 3228f04ed9b18938365866ed15027ed3c1b59ad7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 14:01:53 -0700
Subject: Fire the logon_event when the user logs on.  Cleanup some old code
 from the user/helpers/user.php file."

---
 modules/gallery/controllers/login.php |  1 +
 modules/user/helpers/user.php         | 92 -----------------------------------
 2 files changed, 1 insertion(+), 92 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 720e6375..3978b64f 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -77,6 +77,7 @@ class Login_Controller extends Controller {
       }
       identity::set_active_user($user);
       log::info("user", t("User %name logged in", array("name" => $user->name)));
+      module::event("user_login", $user);
     }
 
     // Either way, regenerate the session id to avoid session trapping
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f67429c7..f9f16da5 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -24,57 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class user_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 = user::guest());
-    }
-
-    // The installer cannot set a user into the session, so it just sets an id which we should
-    // upconvert into a user.
-    if ($user === 2) {
-      $user = model_cache::get("user", 2);
-      user::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);
-    }
-  }
-
-  /**
-   * Return the array of group ids this user belongs to
-   *
-   * @return array
-   */
-  static function group_ids() {
-    return Session::instance()->get("group_ids", array(1));
-  }
-
-  /**
-   * 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 = user::guest();
-    }
-    return $user;
-  }
-
   /**
    * Return the guest user.
    *
@@ -86,18 +35,6 @@ class user_Core {
     return model_cache::get("user", 1);
   }
 
-  /**
-   * 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();
-  }
-
   /**
    * Create a new user.
    *
@@ -170,35 +107,6 @@ class user_Core {
     return $hashGenerator->HashPassword($password);
   }
 
-  /**
-   * Log in as a given user.
-   * @param object $user the user object.
-   */
-  static function login($user) {
-    $user->login_count += 1;
-    $user->last_login = time();
-    $user->save();
-
-    user::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 = user::active();
-    if (!$user->guest) {
-      try {
-        Session::instance()->destroy();
-      } catch (Exception $e) {
-        Kohana::log("error", $e);
-      }
-      module::event("user_logout", $user);
-    }
-  }
-
   /**
    * Look up a user by id.
    * @param integer      $id the user id
-- 
cgit v1.2.3


From 3b4a64c698a06a696708afb45e6c4503c2b69b13 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 27 Oct 2009 14:21:59 -0700
Subject: Check the minimum length when adding or modifying users via the admin
 screen.

---
 modules/user/controllers/admin_users.php | 5 ++++-
 modules/user/controllers/users.php       | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index ac5dc33c..269e3dc8 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -311,6 +311,9 @@ class Admin_Users_Controller extends Admin_Controller {
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
     $form->add_rules_from($user);
+    $minimum_length = module::get_var("user", "mininum_password_length", 5);
+    $form->edit_user->password
+      ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
 
     module::event("user_edit_form_admin", $user, $form);
     $group->submit("")->value(t("Modify User"));
@@ -334,7 +337,7 @@ class Admin_Users_Controller extends Admin_Controller {
 
     $minimum_length = module::get_var("user", "mininum_password_length", 5);
     $form->add_user->password
-      ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
+      ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
 
     module::event("user_add_form_admin", $user, $form);
     $group->submit("")->value(t("Add User"));
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 7bcc74d7..ca218393 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -84,7 +84,6 @@ class Users_Controller extends Controller {
     $form->edit_user->password
       ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]");
 
-
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
     return $form;
-- 
cgit v1.2.3


From f16941a90bddce20cdc6a868fbc888eb3e944a5a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 28 Oct 2009 11:36:34 -0700
Subject: Add a static modifier to the private method

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

(limited to 'modules/user')

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index e65b6c96..3aaf1b11 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -83,7 +83,7 @@ class group_Core {
    * @param string      $value value to match
    * @return Group_Definition  the group object, or null if the name was invalid.
    */
-  private function _lookup_by_field($field_name, $value) {
+  private static function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
       if ($user->loaded) {
-- 
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/user')

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 1d3651b3292a2ea4b63a6c19bc0a4f58b9efac10 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 28 Oct 2009 17:13:23 -0700
Subject: Make the user name a required field. Fixes ticket #852

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

(limited to 'modules/user')

diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index c51fc720..184ce70a 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -21,7 +21,7 @@ class User_Model extends ORM implements User_Definition {
   protected $has_and_belongs_to_many = array("groups");
 
   var $rules = array(
-    "name" => "length[1,32]",
+    "name" => "required|length[1,32]",
     "full_name" => "length[0,255]",
     "email" => "valid_email|length[1,255]",
     "password" => "length[1,40]",
-- 
cgit v1.2.3


From 53dd35b5c8e741511d5bdc1ed35769d4ce281fe0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 29 Oct 2009 08:30:39 -0700
Subject: Just show the Identity admin menu item all the time. This gives a
 place to hang other user related module administartion menu links.

---
 modules/gallery/helpers/gallery_event.php | 21 ++++++++-------------
 modules/user/helpers/user_event.php       | 11 +++--------
 2 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 2ee20417..c16ec67d 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -187,19 +187,14 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->id("sidebar")
                         ->label(t("Manage Sidebar"))
-                        ->url(url::site("admin/sidebar"))));
-    if (count(identity::providers()) > 1) {
-      $menu
-        ->append(Menu::factory("submenu")
-                 ->id("identity_menu")
-                 ->label(t("Identity Management"))
-                 ->append(Menu::factory("link")
-                          ->id("identity_drivers")
-                          ->label(t("Identity Drivers"))
-                          ->url(url::site("admin/identity"))));
-    }
-
-    $menu
+                        ->url(url::site("admin/sidebar"))))
+      ->append(Menu::factory("submenu")
+               ->id("identity_menu")
+               ->label(t("Identity Management"))
+               ->append(Menu::factory("link")
+                        ->id("identity_drivers")
+                        ->label(t("Identity Drivers"))
+                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index a4a6e5da..1ac7f333 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,16 +20,11 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $user_group_menu = Menu::factory("link")
+    $menu->get("identity_menu")
+      ->append(Menu::factory("link")
       ->id("users_groups")
       ->label(t("Users/Groups"))
-      ->url(url::site("admin/users"));
-    $identity_menu = $menu->get("identity_menu");
-    if (empty($identity_menu)) {
-      $menu->add_after("appearance_menu", $user_group_menu);
-    }else {
-      $identity_menu->append($user_group_menu);
-    }
+      ->url(url::site("admin/users")));
 
     return $menu;
   }
-- 
cgit v1.2.3


From 0bb2b7659f8cb0c117d01958c7fec95a80e83a02 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 29 Oct 2009 11:12:55 -0700
Subject: Add the admin_user api function to the identity helper and the
 IdentityProvider interface.

---
 modules/gallery/helpers/identity.php                        | 7 +++++++
 modules/gallery/libraries/IdentityProvider.php              | 7 +++++++
 modules/gallery/libraries/drivers/IdentityProvider.php      | 7 +++++++
 modules/user/libraries/drivers/IdentityProvider/Gallery.php | 7 +++++++
 4 files changed, 28 insertions(+)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 4ebc6de8..3030bd3d 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -144,6 +144,13 @@ class identity_Core {
     return IdentityProvider::instance()->guest();
   }
 
+  /**
+   * @see IdentityProvider_Driver::admin_user.
+   */
+  static function admin_user() {
+    return IdentityProvider::instance()->admin_user();
+  }
+
   /**
    * @see IdentityProvider_Driver::create_user.
    */
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 24c849c1..8521702d 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -107,6 +107,13 @@ class IdentityProvider_Core {
     return $this->driver->guest();
   }
 
+  /**
+   * @see IdentityProvider_Driver::admin_user.
+   */
+  public function admin_user() {
+    return $this->driver->admin_user();
+  }
+
   /**
    * @see IdentityProvider_Driver::create_user.
    */
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index c951293d..739c7f6a 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -25,6 +25,13 @@ interface IdentityProvider_Driver {
    */
   public function guest();
 
+  /**
+   * Return the admins user.
+   *
+   * @return User_Definition the user object
+   */
+  public function admin_user();
+
   /**
    * Create a new user.
    *
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index c789e8ea..f133a32a 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -28,6 +28,13 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
     return user::guest();
   }
 
+  /**
+   * @see IdentityProvider_Driver::guest.
+   */
+  public function admin_user() {
+    return self::lookup_user(2);
+  }
+
   /**
    * @see IdentityProvider_Driver::create_user.
    */
-- 
cgit v1.2.3


From 04bf50bfb4241f7c814782c516732d927ff1f457 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 29 Oct 2009 17:09:01 -0700
Subject: Use an event 'check_user_name_exists' to validate the input name is
 already in use. The parameter is a standard class with the name and an exists
 flag.  Any event handler should or their result with the exists flag.

---
 modules/user/controllers/admin_users.php | 4 +++-
 modules/user/helpers/user_event.php      | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 269e3dc8..a7db6179 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -36,7 +36,9 @@ class Admin_Users_Controller extends Admin_Controller {
     $form = $this->_get_user_add_form_admin();
     $valid = $form->validate();
     $name = $form->add_user->inputs["name"]->value;
-    if ($user = user::lookup_by_name($name)) {
+    $user_exists_data = (object)array("name" => $name);
+    module::event("check_username_exists", $user_exists_data);
+    if ($user_exists_data->exists) {
       $form->add_user->inputs["name"]->add_error("in_use", 1);
       $valid = false;
     }
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 1ac7f333..e3dbacb7 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -28,4 +28,9 @@ class user_event_Core {
 
     return $menu;
   }
+
+  static function check_username_exists($data) {
+    $user = user::lookup_by_name($data->name);
+    $data->exists |= $user ? true : false;
+  }
 }
-- 
cgit v1.2.3


From c6fbd34f28f9d02f38a6c6cacbcd72fa34eee591 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 29 Oct 2009 19:16:08 -0700
Subject: Add the add_user_to_group and remove_user_from_group api method
 calls.  If the identity provider isn't writable, the method implementations
 should throw an Invalid Operation exception.

---
 modules/gallery/helpers/identity.php                   | 14 ++++++++++++++
 modules/gallery/libraries/IdentityProvider.php         | 14 ++++++++++++++
 modules/gallery/libraries/drivers/IdentityProvider.php | 13 +++++++++++++
 .../libraries/drivers/IdentityProvider/Gallery.php     | 18 ++++++++++++++++++
 4 files changed, 59 insertions(+)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index 0111cb1a..72e3312d 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -227,4 +227,18 @@ class identity_Core {
   static function groups() {
     return IdentityProvider::instance()->groups();
   }
+
+  /**
+   * @see IdentityProvider_Driver::add_user_to_group.
+   */
+  static function add_user_to_group($user, $group_id) {
+    return IdentityProvider::instance()->add_user_to_group($user, $group_id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::remove_user_to_group.
+   */
+  static function remove_user_from_group($user, $group_id) {
+    return IdentityProvider::instance()->remove_user_from_group($user, $group_id);
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 3bb4fcf5..aa519bd3 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -190,4 +190,18 @@ class IdentityProvider_Core {
   public function groups() {
     return $this->driver->groups();
   }
+
+  /**
+   * @see IdentityProvider_Driver::add_user_to_group.
+   */
+  public function add_user_to_group($user, $group_id) {
+    return $this->driver->add_user_to_group($user, $group_id);
+  }
+
+  /**
+   * @see IdentityProvider_Driver::remove_user_to_group.
+   */
+  public function remove_user_from_group($user, $group_id) {
+    return $this->driver->remove_user_from_group($user, $group_id);
+  }
 } // End Identity
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index 739c7f6a..a808c7e8 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -113,6 +113,19 @@ interface IdentityProvider_Driver {
    */
   public function groups();
 
+  /**
+   * Add the user to the specified group
+   * @param User_Definition the user to add to the group
+   * @param int             the group_id
+   */
+  static function add_user_to_group($user, $group_id);
+
+  /**
+   * Remove the user to the specified group
+   * @param User_Definition the user to add to the group
+   * @param int             the group id
+   */
+  static function remove_user_from_group($user, $group_id);
 } // End Identity Driver Definition
 
 interface Group_Definition {}
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index f133a32a..f02c53a2 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -139,5 +139,23 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
     return ORM::factory("group")->find_all();
   }
 
+  /**
+   * @see IdentityProvider_Driver::add_user_to_group.
+   */
+  static function add_user_to_group($user, $group_id) {
+    $group = self::lookup_group($group_id);
+
+    $group->add($user);
+    $group->save();
+  }
+
+  /**
+   * @see IdentityProvider_Driver::remove_user_to_group.
+   */
+  static function remove_user_from_group($user, $group_id) {
+    $group = self::lookup_group_by_name($group_id);
+    $group->remove($user);
+    $group->save();
+  }
 } // End Identity Gallery Driver
 
-- 
cgit v1.2.3


From ddf8734a414e4d426232e6dec9137eac8dcf0bb7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 30 Oct 2009 08:33:31 -0700
Subject: Caught a few more incorrect capitalizations.

---
 modules/user/controllers/admin_users.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index a7db6179..209ce8ae 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -300,14 +300,14 @@ class Admin_Users_Controller extends Admin_Controller {
   static function _get_user_edit_form_admin($user) {
     $form = new Forge(
       "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
-    $group = $form->group("edit_user")->label(t("Edit User"));
+    $group = $form->group("edit_user")->label(t("Edit user"));
     $group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
     $group->inputs["name"]->error_messages(
       "in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
+    $group->input("full_name")->label(t("Full name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
     $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+    $group->password("password2")->label(t("Confirm password"))->id("g-password2")
       ->matches($group->password);
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
@@ -324,12 +324,12 @@ class Admin_Users_Controller extends Admin_Controller {
 
   static function _get_user_add_form_admin() {
     $form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
-    $group = $form->group("add_user")->label(t("Add User"));
+    $group = $form->group("add_user")->label(t("Add user"));
     $group->input("name")->label(t("Username"))->id("g-username")
       ->error_messages("in_use", t("There is already a user with that username"));
-    $group->input("full_name")->label(t("Full Name"))->id("g-fullname");
+    $group->input("full_name")->label(t("Full name"))->id("g-fullname");
     $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+    $group->password("password2")->label(t("Confirm password"))->id("g-password2")
       ->matches($group->password);
     $group->input("email")->label(t("Email"))->id("g-email");
     $group->input("url")->label(t("URL"))->id("g-url");
@@ -374,7 +374,7 @@ class Admin_Users_Controller extends Admin_Controller {
   /* Group Form Definitions */
   private function _get_group_edit_form_admin($group) {
     $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
-    $form_group = $form->group("edit_group")->label(t("Edit Group"));
+    $form_group = $form->group("edit_group")->label(t("Edit group"));
     $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
@@ -386,11 +386,11 @@ class Admin_Users_Controller extends Admin_Controller {
   private function _get_group_add_form_admin() {
     $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
     $form->set_attr('class', "g-one-quarter");
-    $form_group = $form->group("add_group")->label(t("Add Group"));
+    $form_group = $form->group("add_group")->label(t("Add group"));
     $form_group->input("name")->label(t("Name"))->id("g-name");
     $form_group->inputs["name"]->error_messages(
       "in_use", t("There is already a group with that name"));
-    $form_group->submit("")->value(t("Add Group"));
+    $form_group->submit("")->value(t("Add group"));
     $form->add_rules_from(ORM::factory("group"));
     return $form;
   }
-- 
cgit v1.2.3


From abe42002b2250d4ecf5627293e0338e11c4bfdb0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 31 Oct 2009 14:13:35 -0700
Subject: Don't specify the default identity provider in the gallery installer.
  Let the user module use that as a trigger to set ownership of the root album
 to the administrator.

---
 modules/gallery/helpers/gallery_installer.php |  2 --
 modules/user/helpers/user_installer.php       | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 5daf1016..2eb02546 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -253,8 +253,6 @@ class gallery_installer {
       $theme->save();
     }
 
-    module::set_var("gallery", "identity_provider", "user");
-
     block_manager::add("dashboard_sidebar", "gallery", "block_adder");
     block_manager::add("dashboard_sidebar", "gallery", "stats");
     block_manager::add("dashboard_sidebar", "gallery", "platform_info");
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 9aad4130..0cba502f 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -70,8 +70,18 @@ class user_installer {
     $admin->admin = true;
     $admin->save();
 
-    // Let the admin own everything
-    $db->query("update {items} set owner_id = {$admin->id}");
+    $current_provider = module::get_var("gallery", "identity_provider");
+    if (empty($current_provider)) {
+      // If there is no provider defined then we are doing an initial install
+      // so we need to set the provider and make the administrator own everything
+      // If the installer is called and there is an identity provider, then we
+      // are switching identity providers and and the event handlers will do the
+      // right things
+      module::set_var("gallery", "identity_provider", "user");
+
+      // Let the admin own everything
+      $db->query("update {items} set owner_id = {$admin->id}");
+    }
 
     $root = ORM::factory("item", 1);
     access::allow($everybody, "view", $root);
-- 
cgit v1.2.3


From c3dcfd136bea8ec4b627a7d38f618ac97c9ea4a0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 31 Oct 2009 14:41:55 -0700
Subject: Move the identity provider menu item under the settings menu and make
 the User/Groups administration a first level menu item.  As discussed via
 -devel mailing list.

---
 modules/gallery/helpers/gallery_event.php | 13 +++++--------
 modules/user/helpers/user_event.php       |  9 ++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'modules/user')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index f3ad1630..582e3267 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -179,7 +179,11 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->id("advanced")
                         ->label(t("Advanced"))
-                        ->url(url::site("admin/advanced_settings"))))
+                        ->url(url::site("admin/advanced_settings")))
+               ->append(Menu::factory("link")
+                        ->id("identity_drivers")
+                        ->label(t("Identity drivers"))
+                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("link")
                ->id("modules")
                ->label(t("Modules"))
@@ -202,13 +206,6 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage sidebar"))
                         ->url(url::site("admin/sidebar"))))
-      ->append(Menu::factory("submenu")
-               ->id("identity_menu")
-               ->label(t("Identity management"))
-               ->append(Menu::factory("link")
-                        ->id("identity_drivers")
-                        ->label(t("Identity drivers"))
-                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index e3dbacb7..11b9c56c 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,11 +20,10 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $menu->get("identity_menu")
-      ->append(Menu::factory("link")
-      ->id("users_groups")
-      ->label(t("Users/Groups"))
-      ->url(url::site("admin/users")));
+    $menu->add_after("appearance_menu", Menu::factory("link")
+                     ->id("users_groups")
+                     ->label(t("Users/Groups"))
+                     ->url(url::site("admin/users")));
 
     return $menu;
   }
-- 
cgit v1.2.3


From 1c428df9e090b8e7e9dfa3ec5d924b8169190b42 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 31 Oct 2009 16:16:47 -0700
Subject: Revert "Use an event 'check_user_name_exists' to validate the input
 name is already in use. The parameter is a standard class with the name and
 an exists flag.  Any event handler should or their result with the exists
 flag."

This reverts commit 04bf50bfb4241f7c814782c516732d927ff1f457.
---
 modules/user/controllers/admin_users.php | 4 +---
 modules/user/helpers/user_event.php      | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 209ce8ae..54541e90 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -36,9 +36,7 @@ class Admin_Users_Controller extends Admin_Controller {
     $form = $this->_get_user_add_form_admin();
     $valid = $form->validate();
     $name = $form->add_user->inputs["name"]->value;
-    $user_exists_data = (object)array("name" => $name);
-    module::event("check_username_exists", $user_exists_data);
-    if ($user_exists_data->exists) {
+    if ($user = user::lookup_by_name($name)) {
       $form->add_user->inputs["name"]->add_error("in_use", 1);
       $valid = false;
     }
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 11b9c56c..cf91812e 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -27,9 +27,4 @@ class user_event_Core {
 
     return $menu;
   }
-
-  static function check_username_exists($data) {
-    $user = user::lookup_by_name($data->name);
-    $data->exists |= $user ? true : false;
-  }
 }
-- 
cgit v1.2.3


From dbe64762550c1920f93f8b1da8fe563d028262a6 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 6 Nov 2009 20:26:09 -0700
Subject: Remove width class from add group form, it sizes the form's elements,
 not the form itself.

---
 modules/user/controllers/admin_users.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 54541e90..cc2d881e 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -383,7 +383,6 @@ class Admin_Users_Controller extends Admin_Controller {
 
   private function _get_group_add_form_admin() {
     $form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
-    $form->set_attr('class', "g-one-quarter");
     $form_group = $form->group("add_group")->label(t("Add group"));
     $form_group->input("name")->label(t("Name"))->id("g-name");
     $form_group->inputs["name"]->error_messages(
-- 
cgit v1.2.3


From 2bd4fa4b43381da997219dbb9d2dd15a8d3af69f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 8 Nov 2009 21:46:09 -0700
Subject: Remove g-actions, it doesn't serve any real purpose in styling or
 JavaScript.

---
 modules/user/views/admin_users.html.php | 2 +-
 themes/admin_wind/css/screen.css        | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 661f1532..18ad9403 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -85,7 +85,7 @@
             <td>
               <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
             </td>
-            <td class="g-actions">
+            <td>
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
                   open_text="<?= t("Close") ?>"
                   class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 9fe3a1fc..83b258f5 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -12,7 +12,7 @@
  *  6)  jQuery and jQuery UI
  *  7)  Right-to-left language styles
  *
- * @todo Review g-actions along with g-buttonset-vertical
+ * @todo Review g-buttonset-vertical
  */
 
 /** *******************************************************************
@@ -358,11 +358,6 @@ th {
   margin-right: 1em;
 }
 
-.g-actions a,
-.g-actions span {
-  margin-right: 3em;
-}
-
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-admin-blocks-list {
-- 
cgit v1.2.3


From d29d339ea0088b2aa9cd11701289db03ec307ea3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 13:23:23 -0700
Subject: Move the password strength image out of css and into an images
 folder.

---
 modules/user/css/progressImg1.png    | Bin 390 -> 0 bytes
 modules/user/css/user.css            |   5 ++---
 modules/user/images/progressImg1.png | Bin 0 -> 390 bytes
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 modules/user/css/progressImg1.png
 create mode 100644 modules/user/images/progressImg1.png

(limited to 'modules/user')

diff --git a/modules/user/css/progressImg1.png b/modules/user/css/progressImg1.png
deleted file mode 100644
index a9093647..00000000
Binary files a/modules/user/css/progressImg1.png and /dev/null differ
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 67d4f196..92441ffd 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,9 +12,8 @@
 }
 
 li.g-group {
-  float: left;
   display: block;
-  width: 200px;
+  width: 100%;
   border: 1px solid gray;
   padding: 0;
   margin: 0 1em 1em 0;
@@ -56,7 +55,7 @@ li.g-default-group h4, li.g-default-group .g-user {
 }
 
 .g-password-strength0 {
-  background: url(progressImg1.png) no-repeat 0 0;
+  background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
   height: 7px;
 }
diff --git a/modules/user/images/progressImg1.png b/modules/user/images/progressImg1.png
new file mode 100644
index 00000000..a9093647
Binary files /dev/null and b/modules/user/images/progressImg1.png differ
-- 
cgit v1.2.3


From 766d49c4614dfcde84ec75e5296635c5fc9d7a67 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 14:03:11 -0700
Subject: Fix floated group rows when more than one row exists. Attach g-
 before all css ids and classes for consistency. Other minor layout
 adjustments.

---
 modules/user/css/user.css                     |  8 ++++++--
 modules/user/views/admin_users.html.php       | 20 ++++++++++----------
 modules/user/views/admin_users_group.html.php |  6 +++---
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 92441ffd..77e0b44b 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -13,10 +13,10 @@
 
 li.g-group {
   display: block;
-  width: 100%;
   border: 1px solid gray;
-  padding: 0;
   margin: 0 1em 1em 0;
+  padding: 0;
+  width: 200px;
 }
 
 li.g-group h4 {
@@ -54,6 +54,10 @@ li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
+.g-group.ui-droppable {
+  padding: 0 !important;
+}
+
 .g-password-strength0 {
   background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 18ad9403..df44794a 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -2,15 +2,15 @@
 <script type="text/javascript">
   var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
   $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
+    $("#g-user-admin-list .g-core-info").draggable({
       helper: "clone"
     });
     $("#g-group-admin .g-group").droppable({
-      accept: ".core-info",
+      accept: ".g-core-info",
       hoverClass: "g-selected",
       drop: function(ev, ui) {
         var user_id = $(ui.draggable).attr("id").replace("user-", "");
-        var group_id = $(this).attr("id").replace("group-", "");
+        var group_id = $(this).attr("id").replace("g-group-", "");
         $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
               {},
               function() {
@@ -18,8 +18,8 @@
               });
       }
     });
-    $("#group-1").droppable("destroy");
-    $("#group-2").droppable("destroy");
+    $("#g-group-1").droppable("destroy");
+    $("#g-group-2").droppable("destroy");
   });
 
   var reload_group = function(group_id) {
@@ -27,8 +27,8 @@
     $.get(reload_group_url.replace("__GROUPID__", group_id),
           {},
           function(data) {
-            $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .g-dialog-link").gallery_dialog();
+            $("#g-group-" + group_id).html(data);
+            $("#g-group-" + group_id + " .g-dialog-link").gallery_dialog();
           });
   }
 
@@ -68,7 +68,7 @@
 
           <? foreach ($users as $i => $user): ?>
           <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-            <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+            <td id="user-<?= $user->id ?>" class="g-core-info g-draggable">
               <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                    title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
                    alt="<?= html::clean_attribute($user->name) ?>"
@@ -121,7 +121,7 @@
       <div class="g-block-content">
         <ul>
           <? foreach ($groups as $i => $group): ?>
-          <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+          <li id="g-group-<?= $group->id ?>" class="g-group g-left <?= ($group->special ? "g-default-group" : "") ?>" />
             <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
             <?= $v ?>
           </li>
@@ -129,5 +129,5 @@
         </ul>
       </div>
     </div>
-    </div>
+  </div>
 </div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index e44cbddd..4c629945 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
   <? if (!$group->special): ?>
   <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">
+    class="g-dialog-link g-button g-right ui-state-default ui-corner-all">
     <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">
+     class="g-dialog-link g-button g-right ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? endif ?>
 </h4>
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="g-button ui-state-default ui-corner-all ui-icon-left"
+       class="g-button g-right 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>
-- 
cgit v1.2.3


From 18a168156974fa9f235ff56bdc6eba14224fb6a3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 14:09:17 -0700
Subject: Added comments to user.css

---
 modules/user/css/user.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'modules/user')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 77e0b44b..92049f83 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -1,3 +1,5 @@
+/* User- and group-related form width ~~~~ */
+
 #g-login-form,
 #g-add-user-form
 #g-edit-user-form,
@@ -6,6 +8,8 @@
   width: 270px;
 }
 
+/* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-user-admin-list .admin {
   color: #55f;
   font-weight: bold;
@@ -58,38 +62,50 @@ li.g-default-group h4, li.g-default-group .g-user {
   padding: 0 !important;
 }
 
+/* Password strength meter ~~~~~~~~~~~~~~~ */
+
 .g-password-strength0 {
   background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
   height: 7px;
 }
+
 .g-password-strength10 {
   background-position:0 -7px;
 }
+
 .g-password-strength20 {
   background-position:0 -14px;
 }
+
 .g-password-strength30 {
   background-position:0 -21px;
 }
+
 .g-password-strength40 {
   background-position:0 -28px;
 }
+
 .g-password-strength50 {
   background-position:0 -35px;
 }
+
 .g-password-strength60 {
   background-position:0 -42px;
 }
+
 .g-password-strength70 {
   background-position:0 -49px;
 }
+
 .g-password-strength80 {
   background-position:0 -56px;
 }
+
 .g-password-strength90 {
   background-position:0 -63px;
 }
+
 .g-password-strength100 {
   background-position:0 -70px;
 }
-- 
cgit v1.2.3


From 68886627cf76d69973c5956637b29908f58469ef Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 15:48:24 -0700
Subject: A few more g- prefix updates for the user module, this should be it.

---
 modules/user/css/user.css               | 28 +++++++++++++++++++---------
 modules/user/views/admin_users.html.php |  6 +++---
 2 files changed, 22 insertions(+), 12 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 92049f83..6edb3d98 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -10,12 +10,20 @@
 
 /* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-user-admin-list .admin {
+#g-user-admin {
+  
+}
+
+#g-group-admin {
+  
+}
+
+#g-user-admin-list .g-admin {
   color: #55f;
   font-weight: bold;
 }
 
-li.g-group {
+.g-group {
   display: block;
   border: 1px solid gray;
   margin: 0 1em 1em 0;
@@ -23,38 +31,40 @@ li.g-group {
   width: 200px;
 }
 
-li.g-group h4 {
+.g-group h4 {
   background-color: #eee;
   border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
 
-li.g-group .g-button {
+.g-group .g-button {
   padding: 0;
 }
 
-li.g-group ul, li.g-group div {
+.g-group ul,
+.g-group div {
   height: 180px;
   margin: 1px;
   overflow: auto;
   padding-top: .2em;
 }
 
-li.g-group div p {
+.g-group div p {
   color: gray;
   text-align: center;
   padding: 2em .5em 0 .5em
 }
 
-li.g-group .g-user {
+.g-group .g-user {
   padding: .2em 0 0 .5em;
 }
 
-li.g-group .g-user .g-button {
+.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.g-default-group h4, li.g-default-group .g-user {
+.g-default-group h4,
+.g-default-group .g-user {
   color: gray;
 }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index df44794a..45e970a7 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -9,7 +9,7 @@
       accept: ".g-core-info",
       hoverClass: "g-selected",
       drop: function(ev, ui) {
-        var user_id = $(ui.draggable).attr("id").replace("user-", "");
+        var user_id = $(ui.draggable).attr("id").replace("g-user-", "");
         var group_id = $(this).attr("id").replace("g-group-", "");
         $.get(add_user_to_group_url.replace("__USERID__", user_id).replace("__GROUPID__", group_id),
               {},
@@ -67,8 +67,8 @@
           </tr>
 
           <? foreach ($users as $i => $user): ?>
-          <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-            <td id="user-<?= $user->id ?>" class="g-core-info g-draggable">
+          <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> g-user <?= $user->admin ? "g-admin" : "" ?>">
+            <td id="g-user-<?= $user->id ?>" class="g-core-info g-draggable">
               <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                    title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
                    alt="<?= html::clean_attribute($user->name) ?>"
-- 
cgit v1.2.3


From a6f1d3ad44a658dc4f813d96735d033248e4de89 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 14 Nov 2009 23:31:14 -0700
Subject: Remove g-dialog-link from special groups delete button (registered
 users, everybody), it's supposed to be disabled. Updated wording of headings
 and instructions.

---
 modules/user/css/user.css                     | 16 +++++++---------
 modules/user/views/admin_users.html.php       | 14 +++++++-------
 modules/user/views/admin_users_group.html.php | 10 +++++-----
 3 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 6edb3d98..084eac31 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -11,11 +11,10 @@
 /* User/group admin ~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-user-admin {
-  
+  width: auto;
 }
 
 #g-group-admin {
-  
 }
 
 #g-user-admin-list .g-admin {
@@ -25,7 +24,7 @@
 
 .g-group {
   display: block;
-  border: 1px solid gray;
+  border: 1px solid #999;
   margin: 0 1em 1em 0;
   padding: 0;
   width: 200px;
@@ -41,18 +40,17 @@
   padding: 0;
 }
 
-.g-group ul,
+.g-group .g-member-list,
 .g-group div {
   height: 180px;
   margin: 1px;
   overflow: auto;
-  padding-top: .2em;
 }
 
-.g-group div p {
-  color: gray;
+.g-group p {
+  margin-top: 1em;
+  padding: .5em;
   text-align: center;
-  padding: 2em .5em 0 .5em
 }
 
 .g-group .g-user {
@@ -65,7 +63,7 @@
 
 .g-default-group h4,
 .g-default-group .g-user {
-  color: gray;
+  color: #999;
 }
 
 .g-group.ui-droppable {
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 45e970a7..45d04916 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -46,7 +46,8 @@
   <h1> <?= t("Users and groups") ?> </h1>
 
   <div class="g-block-content">
-    <div class="g-block">
+
+    <div id="g-user-admin" class="g-block">
       <a href="<?= url::site("admin/users/add_user_form") ?>"
           class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
           title="<?= t("Create a new user")->for_html_attr() ?>">
@@ -54,7 +55,7 @@
         <?= t("Add a new user") ?>
       </a>
 
-      <h2> <?= t("User admin") ?> </h2>
+      <h2> <?= t("Users") ?> </h2>
 
       <div class="g-block-content">
         <table id="g-user-admin-list">
@@ -70,7 +71,7 @@
           <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> g-user <?= $user->admin ? "g-admin" : "" ?>">
             <td id="g-user-<?= $user->id ?>" class="g-core-info g-draggable">
               <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-                   title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+                   title="<?= t("Drag user onto a group to add as a new member")->for_html_attr() ?>"
                    alt="<?= html::clean_attribute($user->name) ?>"
                    width="20"
                    height="20" />
@@ -106,7 +107,7 @@
       </div>
     </div>
 
-    <div id="g-group-admin" class="g-block ui-helper-clearfix">
+    <div id="g-group-admin" class="g-block g-right ui-helper-clearfix">
       <a href="<?= url::site("admin/users/add_group_form") ?>"
           class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
           title="<?= t("Create a new group")->for_html_attr() ?>">
@@ -114,9 +115,7 @@
         <?= t("Add a new group") ?>
       </a>
 
-      <h2>
-        <?= t("Group admin") ?>
-      </h2>
+      <h2> <?= t("Groups") ?> </h2>
 
       <div class="g-block-content">
         <ul>
@@ -129,5 +128,6 @@
         </ul>
       </div>
     </div>
+
   </div>
 </div>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 4c629945..b7e573b3 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,17 +4,17 @@
   <? if (!$group->special): ?>
   <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 g-right ui-state-default ui-corner-all">
+    class="g-dialog-link g-button g-right">
     <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 g-right ui-state-disabled ui-corner-all ui-icon-left">
+     class="g-button g-right ui-state-disabled ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("Delete") ?></span></a>
   <? endif ?>
 </h4>
 
 <? if ($group->users->count() > 0): ?>
-<ul>
+<ul class="g-member-list">
   <? foreach ($group->users as $i => $user): ?>
   <li class="g-user">
     <?= html::clean($user->name) ?>
@@ -31,8 +31,8 @@
 </ul>
 <? else: ?>
 <div>
-  <p>
-    <?= t("Drag &amp; drop users from the \"User admin\" above into this group box to add group members.") ?>
+  <p class="ui-state-disabled">
+    <?= t("Drag &amp; drop users from the \"Users\" list onto this group to add group members.") ?>
   </p>
 </div>
 <? endif ?>
-- 
cgit v1.2.3