From a00619b812393cf73d1c188af7961af820d36185 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 20 Sep 2009 20:59:18 -0700
Subject: * Move the captured field into the exif module where it is created
 and populated. * Create a new API event get_sort_fields that allows modules
 to contribute new sort fields that they manage. the only condition is that
 the module needs to add it to the item table. * Changed g2_import to call
 this api to get the allowable sort fields * Changed album::get_edit_form to
 call this new api to get the available sort fields Partial fix for ticket
 #627, as the Capture date is not available until the exif module is
 installed.

---
 modules/gallery/helpers/gallery_installer.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 6500482b..aebb7a32 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -68,7 +68,6 @@ class gallery_installer {
     $db->query("CREATE TABLE {items} (
                  `id` int(9) NOT NULL auto_increment,
                  `album_cover_item_id` int(9) default NULL,
-                 `captured` int(9) default NULL,
                  `created` int(9) default NULL,
                  `description` varchar(2048) default NULL,
                  `height` int(9) default NULL,
@@ -268,7 +267,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", 12);
+    module::set_version("gallery", 13);
   }
 
   static function upgrade($version) {
@@ -364,6 +363,20 @@ class gallery_installer {
       $db->query("UPDATE {items} SET `relative_url_cache` = NULL, `relative_path_cache` = NULL");
       module::set_version("gallery", $version = 12);
     }
+
+    if ($version == 12) {
+      // remove the capture field if exif is not installed and it has no data
+      if (!module::is_active("exif")) {
+        $total_records = $db->query("SELECT COUNT(id) as total_records FROM {items}")
+          ->current()->total_records;
+        $count_null = $db->query("SELECT COUNT(id) as count_null FROM {items} where `captured`is NULL")
+          ->current()->count_null;
+        if ($total_records == $count_null) {
+          $db->query("ALTER TABLE {items} DROP COLUMN `captured`");
+        }
+      }
+      module::set_version("gallery", $version = 13);
+    }
   }
 
   static function uninstall() {
-- 
cgit v1.2.3


From c01e467466eff51926108d030f21385179fa24d2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 21 Sep 2009 09:11:31 -0700
Subject: If captured had been used for any sort orders, reset back to weight

---
 modules/gallery/helpers/gallery_installer.php | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index aebb7a32..645d6865 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -367,6 +367,8 @@ class gallery_installer {
     if ($version == 12) {
       // remove the capture field if exif is not installed and it has no data
       if (!module::is_active("exif")) {
+        $db->query("update g3_items set sort_order = 'weight'
+                     where type = 'album' and sort_order = 'captured';");
         $total_records = $db->query("SELECT COUNT(id) as total_records FROM {items}")
           ->current()->total_records;
         $count_null = $db->query("SELECT COUNT(id) as count_null FROM {items} where `captured`is NULL")
-- 
cgit v1.2.3


From ed6dfbc0e8eabf7662d128fd4241a92fa3a140b8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 21 Sep 2009 13:56:10 -0700
Subject: Revert "If captured had been used for any sort orders, reset back to
 weight"

This reverts commit c01e467466eff51926108d030f21385179fa24d2.
---
 modules/gallery/helpers/gallery_installer.php | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 645d6865..aebb7a32 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -367,8 +367,6 @@ class gallery_installer {
     if ($version == 12) {
       // remove the capture field if exif is not installed and it has no data
       if (!module::is_active("exif")) {
-        $db->query("update g3_items set sort_order = 'weight'
-                     where type = 'album' and sort_order = 'captured';");
         $total_records = $db->query("SELECT COUNT(id) as total_records FROM {items}")
           ->current()->total_records;
         $count_null = $db->query("SELECT COUNT(id) as count_null FROM {items} where `captured`is NULL")
-- 
cgit v1.2.3


From dd31b1d39f9a342afc82cc7e446e36454a882cf9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 21 Sep 2009 13:56:52 -0700
Subject: Revert "* Move the captured field into the exif module where it is
 created and populated."

This reverts commit a00619b812393cf73d1c188af7961af820d36185.
---
 modules/exif/helpers/exif_event.php           |  4 ----
 modules/exif/helpers/exif_installer.php       | 10 +--------
 modules/g2_import/helpers/g2_import.php       | 32 +++++++++------------------
 modules/gallery/helpers/album.php             | 12 +++++-----
 modules/gallery/helpers/gallery_event.php     | 10 ---------
 modules/gallery/helpers/gallery_installer.php | 17 ++------------
 modules/gallery/module.info                   |  2 +-
 modules/info/views/info_block.html.php        |  2 +-
 8 files changed, 23 insertions(+), 66 deletions(-)

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

diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index c5c48bdc..826ec959 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -27,8 +27,4 @@ class exif_event_Core {
   static function item_deleted($item) {
     Database::instance()->delete("exif_records", array("item_id" => $item->id));
   }
-
-  static function get_sort_fields($sort_order) {
-    $sort_order->fields["captured"] = t("Date captured");
-  }
 }
diff --git a/modules/exif/helpers/exif_installer.php b/modules/exif/helpers/exif_installer.php
index b826224a..66226061 100644
--- a/modules/exif/helpers/exif_installer.php
+++ b/modules/exif/helpers/exif_installer.php
@@ -29,12 +29,6 @@ class exif_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`))
                DEFAULT CHARSET=utf8;");
-
-
-    $item_fields = $db->list_fields("items");
-    if (empty($item_fields["captured"])) {
-      $db->query("ALTER TABLE {items} ADD COLUMN `captured` int(9) default NULL");
-    }
     module::set_version("exif", 1);
   }
 
@@ -47,8 +41,6 @@ class exif_installer {
   }
 
   static function uninstall() {
-    $db = Database::instance();
-    $db->query("DROP TABLE IF EXISTS {exif_records};");
-    $db->query("ALTER TABLE {items} DROP COLUMN `captured`");
+    Database::instance()->query("DROP TABLE IF EXISTS {exif_records};");
   }
 }
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 4686b23d..7e5c6f75 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -23,7 +23,6 @@ class g2_import_Core {
   public static $map = array();
 
   private static $current_g2_item = null;
-  private static $order_map = false;
 
   static function is_configured() {
     return module::get_var("g2_import", "embed_path");
@@ -314,6 +313,7 @@ class g2_import_Core {
     return $message;
   }
 
+
   /**
    * Import a single album.
    */
@@ -357,26 +357,16 @@ class g2_import_Core {
     $album->view_count = g2(GalleryCoreApi::fetchItemViewCount($g2_album_id));
     $album->created = $g2_album->getCreationTimestamp();
 
-    if (self::$order_map === false) {
-      self::$order_map = array(
-        "originationTimestamp" => "captured",
-        "creationTimestamp" => "created",
-        "description" => "description",
-        "modificationTimestamp" => "updated",
-        "orderWeight" => "weight",
-        "pathComponent" => "name",
-        "summary" => "description",
-        "title" => "title",
-        "viewCount" => "view_count");
-     $sort_order = (object)array("fields" => array());
-     module::event("get_sort_fields", $sort_order);
-     foreach (self::$order_map as $g2_sort_key => $g3_sort_key) {
-       if (empty($sort_order->fields[$g3_sort_key])) {
-         unset(self::$order_map[$g2_sort_key]);
-       }
-     }
-    }
-
+    $order_map = array(
+      "originationTimestamp" => "captured",
+      "creationTimestamp" => "created",
+      "description" => "description",
+      "modificationTimestamp" => "updated",
+      "orderWeight" => "weight",
+      "pathComponent" => "name",
+      "summary" => "description",
+      "title" => "title",
+      "viewCount" => "view_count");
     $direction_map = array(
       ORDER_ASCENDING => "asc",
       ORDER_DESCENDING => "desc");
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index eeeb7e52..9cd746d7 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -166,10 +166,12 @@ class album_Core {
    * Return a structured set of all the possible sort orders.
    */
   static function get_sort_order_options() {
-    $sort_order = (object)array("fields" => array());
-    module::event("get_sort_fields", $sort_order);
-    asort($sort_order->fields);
-
-    return $sort_order->fields;
+    return array("weight" => t("Manual"),
+                 "captured" => t("Date captured"),
+                 "created" => t("Date uploaded"),
+                 "title" => t("Title"),
+                 "updated" => t("Date modified"),
+                 "view_count" => t("Number of views"),
+                 "rand_key" => t("Random"));
   }
 }
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 446a8a91..64f2a9ff 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -53,14 +53,4 @@ class gallery_event_Core {
     $data[] = $item->name;
     $data[] = $item->title;
   }
-
-  static function get_sort_fields($sort_order) {
-    $sort_order->fields = array_merge($sort_order->fields,
-                                      array("weight" => t("Manual"),
-                                            "created" => t("Date uploaded"),
-                                            "title" => t("Title"),
-                                            "updated" => t("Date modified"),
-                                            "view_count" => t("Number of views"),
-                                            "rand_key" => t("Random")));
-  }
 }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index aebb7a32..6500482b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -68,6 +68,7 @@ class gallery_installer {
     $db->query("CREATE TABLE {items} (
                  `id` int(9) NOT NULL auto_increment,
                  `album_cover_item_id` int(9) default NULL,
+                 `captured` int(9) default NULL,
                  `created` int(9) default NULL,
                  `description` varchar(2048) default NULL,
                  `height` int(9) default NULL,
@@ -267,7 +268,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", 13);
+    module::set_version("gallery", 12);
   }
 
   static function upgrade($version) {
@@ -363,20 +364,6 @@ class gallery_installer {
       $db->query("UPDATE {items} SET `relative_url_cache` = NULL, `relative_path_cache` = NULL");
       module::set_version("gallery", $version = 12);
     }
-
-    if ($version == 12) {
-      // remove the capture field if exif is not installed and it has no data
-      if (!module::is_active("exif")) {
-        $total_records = $db->query("SELECT COUNT(id) as total_records FROM {items}")
-          ->current()->total_records;
-        $count_null = $db->query("SELECT COUNT(id) as count_null FROM {items} where `captured`is NULL")
-          ->current()->count_null;
-        if ($total_records == $count_null) {
-          $db->query("ALTER TABLE {items} DROP COLUMN `captured`");
-        }
-      }
-      module::set_version("gallery", $version = 13);
-    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 65a0691c..70bd91e2 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 13
+version = 12
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 1142bbd4..d8f36984 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -16,7 +16,7 @@
     <?= html::clean($item->name) ?>
   </li>
   <? endif ?>
-  <? if (module::is_active("exif") && $item->captured): ?>
+  <? if ($item->captured): ?>
   <li>
     <strong class="caption"><?= t("Captured:") ?></strong>
     <?= date("M j, Y H:i:s", $item->captured)?>
-- 
cgit v1.2.3


From b038e9cbb4d913088a26f8c4e6e4699de9c860d7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 23 Sep 2009 17:03:25 -0700
Subject: set the version number to 13, so we will update the default themes in
 the gallery vars

---
 modules/gallery/helpers/gallery_installer.php | 11 +++++++++++
 modules/gallery/module.info                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 6500482b..6ea1b227 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -364,6 +364,17 @@ class gallery_installer {
       $db->query("UPDATE {items} SET `relative_url_cache` = NULL, `relative_path_cache` = NULL");
       module::set_version("gallery", $version = 12);
     }
+
+    if ($version == 12) {
+      if (module::get_var("gallery", "active_site_theme") == "default") {
+        module::set_var("gallery", "active_site_theme", "wind");
+      }
+      if (module::get_var("gallery", "active_admin_theme") == "admin_default") {
+        module::set_var("gallery", "active_admin_theme", "admin_wind");
+      }
+      module::set_version("gallery", $version = 13);
+    }
+
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 70bd91e2..65a0691c 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 12
+version = 13
-- 
cgit v1.2.3


From 054a8dedac11ffbaa030fdc178031e5f975bbbdf Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 24 Sep 2009 10:28:02 -0700
Subject: Oops, forgot to change the install version number to match the
 upgrade version number

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

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 6ea1b227..cf13d794 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,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", 12);
+    module::set_version("gallery", 13);
   }
 
   static function upgrade($version) {
-- 
cgit v1.2.3


From 8e16cee2c3b7df19354af366f212ce52a2a7b5c8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 24 Sep 2009 14:24:43 -0700
Subject: Forgot to change the defaults theme names on initial install... Duh

---
 modules/gallery/helpers/gallery_installer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index cf13d794..ee605b27 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -224,8 +224,8 @@ class gallery_installer {
     $root->save();
     access::add_item($root);
 
-    module::set_var("gallery", "active_site_theme", "default");
-    module::set_var("gallery", "active_admin_theme", "admin_default");
+    module::set_var("gallery", "active_site_theme", "wind");
+    module::set_var("gallery", "active_admin_theme", "admin_wind");
     module::set_var("gallery", "page_size", 9);
     module::set_var("gallery", "thumb_size", 200);
     module::set_var("gallery", "resize_size", 640);
-- 
cgit v1.2.3


From 74328584205c6685af44de6ea011f5e337fa9155 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 27 Sep 2009 11:25:03 -0700
Subject: Fix one more place in the installer where we referring to the old
 default theme names.

Update installer.sql
---
 installer/install.sql                         | 10 +++++-----
 modules/gallery/helpers/gallery_installer.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/installer/install.sql b/installer/install.sql
index e8aaa681..12785f09 100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -228,7 +228,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',12);
+INSERT INTO {modules} VALUES (1,1,'gallery',13);
 INSERT INTO {modules} VALUES (2,1,'user',1);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
@@ -331,8 +331,8 @@ CREATE TABLE {themes} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {themes} VALUES (1,'default',1);
-INSERT INTO {themes} VALUES (2,'admin_default',1);
+INSERT INTO {themes} VALUES (1,'wind',1);
+INSERT INTO {themes} VALUES (2,'admin_wind',1);
 DROP TABLE IF EXISTS {users};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
@@ -368,8 +368,8 @@ CREATE TABLE {vars} (
   UNIQUE KEY `module_name` (`module_name`,`name`)
 ) AUTO_INCREMENT=28 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','default');
-INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_default');
+INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','wind');
+INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_wind');
 INSERT INTO {vars} VALUES (3,'gallery','page_size','9');
 INSERT INTO {vars} VALUES (4,'gallery','thumb_size','200');
 INSERT INTO {vars} VALUES (5,'gallery','resize_size','640');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index ee605b27..d4aae4c3 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -244,7 +244,7 @@ class gallery_installer {
       100);
 
     // Instantiate default themes (site and admin)
-    foreach (array("default", "admin_default") as $theme_name) {
+    foreach (array("wind", "admin_wind") as $theme_name) {
       $theme_info = new ArrayObject(parse_ini_file(THEMEPATH . $theme_name . "/theme.info"),
                                     ArrayObject::ARRAY_AS_PROPS);
       $theme = ORM::factory("theme");
-- 
cgit v1.2.3


From 467b74c3106558d1656301b9c73236417d4421ac Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 27 Sep 2009 15:24:51 -0700
Subject: This path requires the upgrader to be run and applies the following
 changes: * moves the composite method back into core * requires that the
 operation be fully qualified i.e. gallery_graphics::resize * caches the
 graphics rules on each request

---
 installer/install.sql                              |  4 +-
 .../gallery/controllers/admin_theme_options.php    |  8 +--
 modules/gallery/helpers/gallery_graphics.php       | 55 ++++++++++++++++
 modules/gallery/helpers/gallery_installer.php      | 21 +++++-
 modules/gallery/helpers/graphics.php               | 30 ++++++---
 modules/gallery/module.info                        |  2 +-
 modules/watermark/controllers/admin_watermarks.php |  2 +-
 modules/watermark/helpers/watermark_graphics.php   | 75 ----------------------
 modules/watermark/helpers/watermark_installer.php  | 22 ++++++-
 modules/watermark/module.info                      |  2 +-
 10 files changed, 124 insertions(+), 97 deletions(-)
 delete mode 100644 modules/watermark/helpers/watermark_graphics.php

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

diff --git a/installer/install.sql b/installer/install.sql
index 12785f09..80042b10 100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -88,8 +88,8 @@ CREATE TABLE {graphics_rules} (
   PRIMARY KEY  (`id`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','resize',100,'thumb');
-INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','gallery','resize',100,'resize');
+INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'thumb');
+INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 8970c3c9..27a67bdb 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -35,9 +35,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       $thumb_size = $form->edit_theme->thumb_size->value;
       $thumb_dirty = false;
       if (module::get_var("gallery", "thumb_size") != $thumb_size) {
-        graphics::remove_rule("gallery", "thumb", "resize");
+        graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
         graphics::add_rule(
-          "gallery", "thumb", "resize",
+          "gallery", "thumb", "gallery_graphics::resize",
           array("width" => $thumb_size, "height" => $thumb_size, "master" => Image::AUTO),
           100);
         module::set_var("gallery", "thumb_size", $thumb_size);
@@ -46,9 +46,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       $resize_size = $form->edit_theme->resize_size->value;
       $resize_dirty = false;
       if (module::get_var("gallery", "resize_size") != $resize_size) {
-        graphics::remove_rule("gallery", "resize", "resize");
+        graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
         graphics::add_rule(
-          "gallery", "resize", "resize",
+          "gallery", "resize", "gallery_graphics::resize",
           array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO),
           100);
         module::set_var("gallery", "resize_size", $resize_size);
diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index f62fbf97..bdd600c5 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -51,4 +51,59 @@ class gallery_graphics_Core {
 
     module::event("graphics_resize_completed", $input_file, $output_file, $options);
   }
+
+  /**
+   * Overlay an image on top of the input file.
+   *
+   * Valid options are: file, mime_type, position, transparency_percent, padding
+   *
+   * Valid positions: northwest, north, northeast,
+   *                  west, center, east,
+   *                  southwest, south, southeast
+   *
+   * padding is in pixels
+   *
+   * @param string     $input_file
+   * @param string     $output_file
+   * @param array      $options
+   */
+  static function composite($input_file, $output_file, $options) {
+    try {
+      graphics::init_toolkit();
+
+      module::event("graphics_composite", $input_file, $output_file, $options);
+
+      list ($width, $height) = getimagesize($input_file);
+      list ($w_width, $w_height) = getimagesize($options["file"]);
+
+      $pad = isset($options["padding"]) ? $options["padding"] : 10;
+      $top = $pad;
+      $left = $pad;
+      $y_center = max($height / 2 - $w_height / 2, $pad);
+      $x_center = max($width / 2 - $w_width / 2, $pad);
+      $bottom = max($height - $w_height - $pad, $pad);
+      $right = max($width - $w_width - $pad, $pad);
+
+      switch ($options["position"]) {
+      case "northwest": $x = $left;     $y = $top;       break;
+      case "north":     $x = $x_center; $y = $top;       break;
+      case "northeast": $x = $right;    $y = $top;       break;
+      case "west":      $x = $left;     $y = $y_center;  break;
+      case "center":    $x = $x_center; $y = $y_center;  break;
+      case "east":      $x = $right;    $y = $y_center;  break;
+      case "southwest": $x = $left;     $y = $bottom;    break;
+      case "south":     $x = $x_center; $y = $bottom;    break;
+      case "southeast": $x = $right;    $y = $bottom;    break;
+      }
+
+      Image::factory($input_file)
+        ->composite($options["file"], $x, $y, $options["transparency"])
+        ->quality(module::get_var("gallery", "image_quality"))
+        ->save($output_file);
+
+      module::event("graphics_composite_completed", $input_file, $output_file, $options);
+    } catch (ErrorException $e) {
+      Kohana::log("error", $e->get_message());
+    }
+  }
 }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index d4aae4c3..f995b606 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -235,11 +235,11 @@ class gallery_installer {
 
     // Add rules for generating our thumbnails and resizes
     graphics::add_rule(
-      "gallery", "thumb", "resize",
+      "gallery", "thumb", "gallery_graphics::resize",
       array("width" => 200, "height" => 200, "master" => Image::AUTO),
       100);
     graphics::add_rule(
-      "gallery", "resize", "resize",
+      "gallery", "resize", "gallery_graphics::resize",
       array("width" => 640, "height" => 480, "master" => Image::AUTO),
       100);
 
@@ -268,7 +268,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", 13);
+    module::set_version("gallery", 14);
   }
 
   static function upgrade($version) {
@@ -375,6 +375,21 @@ class gallery_installer {
       module::set_version("gallery", $version = 13);
     }
 
+    if ($version == 13) {
+      // Add rules for generating our thumbnails and resizes
+      graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
+      graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
+      graphics::add_rule(
+        "gallery", "thumb", "gallery_graphics::resize",
+        array("width" => 200, "height" => 200, "master" => Image::AUTO),
+        100);
+      graphics::add_rule(
+        "gallery", "resize", "gallery_graphics::resize",
+        array("width" => 640, "height" => 480, "master" => Image::AUTO),
+        100);
+      module::set_version("gallery", $version = 14);
+    }
+
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 6705652f..0e32022f 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -19,6 +19,7 @@
  */
 class graphics_Core {
   private static $init;
+  private static $_rules_cache = array();
 
   /**
    * Add a new graphics rule.
@@ -26,7 +27,7 @@ class graphics_Core {
    * Rules are applied to targets (thumbnails and resizes) in priority order.  Rules are functions
    * in the graphics class.  So for example, the following rule:
    *
-   *   graphics::add_rule("gallery", "thumb", "resize",
+   *   graphics::add_rule("gallery", "thumb", "gallery_graphics::resize",
    *                       array("width" => 200, "height" => 200, "master" => Image::AUTO), 100);
    *
    * Specifies that "gallery" is adding a rule to resize thumbnails down to a max of 200px on
@@ -35,7 +36,7 @@ class graphics_Core {
    *
    * @param string  $module_name the module that added the rule
    * @param string  $target      the target for this operation ("thumb" or "resize")
-   * @param string  $operation   the name of the operation
+   * @param string  $operation   the name of the operation (<defining class>::method)
    * @param array   $args        arguments to the operation
    * @param integer $priority    the priority for this rule (lower priorities are run first)
    */
@@ -56,7 +57,7 @@ class graphics_Core {
    * Remove any matching graphics rules
    * @param string  $module_name the module that added the rule
    * @param string  $target      the target for this operation ("thumb" or "resize")
-   * @param string  $operation   the name of the operation
+   * @param string  $operation   the name of the operation(<defining class>::method)
    */
   static function remove_rule($module_name, $target, $operation) {
     ORM::factory("graphics_rule")
@@ -146,13 +147,9 @@ class graphics_Core {
           $working_file = $input_file;
         }
 
-        foreach (ORM::factory("graphics_rule")
-                 ->where("target", $target)
-                 ->where("active", true)
-                 ->orderby("priority", "asc")
-                 ->find_all() as $rule) {
+        foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args));
-          call_user_func_array(array("{$rule->module_name}_graphics", $rule->operation), $args);
+          call_user_func_array($rule->operation, $args);
           $working_file = $output_file;
         }
       }
@@ -180,6 +177,21 @@ class graphics_Core {
     }
   }
 
+  private static function _get_rules($target) {
+    if (empty(self::$_rules_cache[$target])) {
+      $rules = array();
+      foreach (ORM::factory("graphics_rule")
+               ->where("target", $target)
+               ->where("active", true)
+               ->orderby("priority", "asc")
+               ->find_all() as $rule) {
+        $rules[] = (object)$rule->as_array();
+      }
+      self::$_rules_cache[$target] = $rules;
+    }
+    return self::$_rules_cache[$target];
+  }
+
   /**
    * Rotate an image.  Valid options are degrees
    *
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 65a0691c..bffcb1c6 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 13
+version = 14
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 423196ac..2a1d5f60 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -138,7 +138,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
     if ($name = module::get_var("watermark", "name")) {
       foreach (array("thumb", "resize") as $target) {
         graphics::add_rule(
-          "watermark", $target, "composite",
+          "watermark", $target, "gallery_graphics::composite",
           array("file" => VARPATH . "modules/watermark/$name",
                 "width" => module::get_var("watermark", "width"),
                 "height" => module::get_var("watermark", "height"),
diff --git a/modules/watermark/helpers/watermark_graphics.php b/modules/watermark/helpers/watermark_graphics.php
deleted file mode 100644
index aef7586b..00000000
--- a/modules/watermark/helpers/watermark_graphics.php
+++ /dev/null
@@ -1,75 +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 watermark_graphics_Core {
-  /**
-   * Overlay an image on top of the input file.
-   *
-   * Valid options are: file, mime_type, position, transparency_percent, padding
-   *
-   * Valid positions: northwest, north, northeast,
-   *                  west, center, east,
-   *                  southwest, south, southeast
-   *
-   * padding is in pixels
-   *
-   * @param string     $input_file
-   * @param string     $output_file
-   * @param array      $options
-   */
-  static function composite($input_file, $output_file, $options) {
-    try {
-      graphics::init_toolkit();
-
-      module::event("graphics_composite", $input_file, $output_file, $options);
-
-      list ($width, $height) = getimagesize($input_file);
-      list ($w_width, $w_height) = getimagesize($options["file"]);
-
-      $pad = isset($options["padding"]) ? $options["padding"] : 10;
-      $top = $pad;
-      $left = $pad;
-      $y_center = max($height / 2 - $w_height / 2, $pad);
-      $x_center = max($width / 2 - $w_width / 2, $pad);
-      $bottom = max($height - $w_height - $pad, $pad);
-      $right = max($width - $w_width - $pad, $pad);
-
-      switch ($options["position"]) {
-      case "northwest": $x = $left;     $y = $top;       break;
-      case "north":     $x = $x_center; $y = $top;       break;
-      case "northeast": $x = $right;    $y = $top;       break;
-      case "west":      $x = $left;     $y = $y_center;  break;
-      case "center":    $x = $x_center; $y = $y_center;  break;
-      case "east":      $x = $right;    $y = $y_center;  break;
-      case "southwest": $x = $left;     $y = $bottom;    break;
-      case "south":     $x = $x_center; $y = $bottom;    break;
-      case "southeast": $x = $right;    $y = $bottom;    break;
-      }
-
-      Image::factory($input_file)
-        ->composite($options["file"], $x, $y, $options["transparency"])
-        ->quality(module::get_var("gallery", "image_quality"))
-        ->save($output_file);
-
-      module::event("graphics_composite_completed", $input_file, $output_file, $options);
-    } catch (ErrorException $e) {
-      Kohana::log("error", $e->get_message());
-    }
-  }
-}
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index b3e91044..5c7dfdab 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -33,11 +33,31 @@ class watermark_installer {
                DEFAULT CHARSET=utf8;");
 
     @mkdir(VARPATH . "modules/watermark");
-    module::set_version("watermark", 1);
+    module::set_version("watermark", 2);
   }
 
   static function uninstall() {
     Database::instance()->query("DROP TABLE {watermarks}");
     dir::unlink(VARPATH . "modules/watermark");
   }
+
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      graphics::remove_rules("watermark");
+      if ($name = module::get_var("watermark", "name")) {
+        foreach (array("thumb", "resize") as $target) {
+          graphics::add_rule(
+            "watermark", $target, "gallery_graphics::composite",
+            array("file" => VARPATH . "modules/watermark/$name",
+                  "width" => module::get_var("watermark", "width"),
+                  "height" => module::get_var("watermark", "height"),
+                  "position" => module::get_var("watermark", "position"),
+                  "transparency" => 101 - module::get_var("watermark", "transparency")),
+            1000);
+        }
+      }
+      module::set_version("watermark", $version = 2);
+    }
+  }
 }
diff --git a/modules/watermark/module.info b/modules/watermark/module.info
index abd4a3cf..41a871bd 100644
--- a/modules/watermark/module.info
+++ b/modules/watermark/module.info
@@ -1,3 +1,3 @@
 name = "Watermarks"
 description = "Allows users to watermark their photos"
-version = 1
+version = 2
-- 
cgit v1.2.3


From c97a88599eb7b199294edbfae382353456061bef Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 27 Sep 2009 17:55:48 -0700
Subject: Change gallery installer to do a direct update to the database,
 preppending gallery_graphics:: to each of the defined rules operations

---
 installer/install.sql                             |  2 +-
 modules/gallery/helpers/gallery_installer.php     | 12 ++----------
 modules/watermark/helpers/watermark_installer.php | 22 +---------------------
 3 files changed, 4 insertions(+), 32 deletions(-)

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

diff --git a/installer/install.sql b/installer/install.sql
index 80042b10..da349c36 100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -228,7 +228,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',13);
+INSERT INTO {modules} VALUES (1,1,'gallery',14);
 INSERT INTO {modules} VALUES (2,1,'user',1);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index f995b606..49bd9bb7 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -377,16 +377,8 @@ class gallery_installer {
 
     if ($version == 13) {
       // Add rules for generating our thumbnails and resizes
-      graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
-      graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
-      graphics::add_rule(
-        "gallery", "thumb", "gallery_graphics::resize",
-        array("width" => 200, "height" => 200, "master" => Image::AUTO),
-        100);
-      graphics::add_rule(
-        "gallery", "resize", "gallery_graphics::resize",
-        array("width" => 640, "height" => 480, "master" => Image::AUTO),
-        100);
+      Database::instance()->query("update g3_graphics_rules g
+                                   set operation=concat(\"gallery_graphics::\", g.operation);");
       module::set_version("gallery", $version = 14);
     }
 
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 5c7dfdab..b3e91044 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -33,31 +33,11 @@ class watermark_installer {
                DEFAULT CHARSET=utf8;");
 
     @mkdir(VARPATH . "modules/watermark");
-    module::set_version("watermark", 2);
+    module::set_version("watermark", 1);
   }
 
   static function uninstall() {
     Database::instance()->query("DROP TABLE {watermarks}");
     dir::unlink(VARPATH . "modules/watermark");
   }
-
-  static function upgrade($version) {
-    $db = Database::instance();
-    if ($version == 1) {
-      graphics::remove_rules("watermark");
-      if ($name = module::get_var("watermark", "name")) {
-        foreach (array("thumb", "resize") as $target) {
-          graphics::add_rule(
-            "watermark", $target, "gallery_graphics::composite",
-            array("file" => VARPATH . "modules/watermark/$name",
-                  "width" => module::get_var("watermark", "width"),
-                  "height" => module::get_var("watermark", "height"),
-                  "position" => module::get_var("watermark", "position"),
-                  "transparency" => 101 - module::get_var("watermark", "transparency")),
-            1000);
-        }
-      }
-      module::set_version("watermark", $version = 2);
-    }
-  }
 }
-- 
cgit v1.2.3


From a0d13cd324e75bc5ff630d5ead09c9d5734b6de9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 28 Sep 2009 08:03:14 -0700
Subject: Clean up upgrader for version 14.  Put {} around table name,
 capitalize reserved words, use single quotes in the query to avoid escaping
 the double quotes, remove table alias.

---
 modules/gallery/helpers/gallery_installer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 49bd9bb7..9e4e3c35 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -377,8 +377,8 @@ class gallery_installer {
 
     if ($version == 13) {
       // Add rules for generating our thumbnails and resizes
-      Database::instance()->query("update g3_graphics_rules g
-                                   set operation=concat(\"gallery_graphics::\", g.operation);");
+      Database::instance()->query(
+        "UPDATE {graphics_rules} SET `operation` = CONCAT('gallery_graphics::', `operation`);");
       module::set_version("gallery", $version = 14);
     }
 
-- 
cgit v1.2.3


From e197e4017daa0833cec84d8392e4d05cdf81503d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Sep 2009 17:02:48 -0700
Subject: Set the gallery version to 15 and provide upgrade processing to set
 the default sidebar.

---
 modules/gallery/helpers/gallery_installer.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 9e4e3c35..743808ea 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,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", 14);
+    module::set_version("gallery", 15);
   }
 
   static function upgrade($version) {
@@ -382,6 +382,17 @@ class gallery_installer {
       module::set_version("gallery", $version = 14);
     }
 
+    if ($version == 14) {
+      $sidebar_blocks = block_manager::get_active("site.sidebar");
+      if (empty($sidebar_blocks)) {
+        $available_blocks = block_manager::get_available_site_blocks();
+        foreach  (array_key(block_manager::get_available_site_blocks()) as $id) {
+          $sidebar_blocks[] = explode(":", $id);
+        }
+        block_manager::set_active("site.sidebar", $sidebar_blocks);
+      }
+      module::set_version("gallery", $version = 15);
+    }
   }
 
   static function uninstall() {
-- 
cgit v1.2.3


From 81eaf1e46cb1646bf6b5d5c2f86ea3b3c7a0bd06 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Sep 2009 17:30:01 -0700
Subject: Add functionality to activate sidebar blocks when the module is
 activated and deactivate the sidebar blocks when the module is deactivated.

---
 modules/gallery/helpers/block_manager.php     | 23 +++++++++++++++++++++++
 modules/gallery/helpers/gallery_installer.php |  2 +-
 modules/gallery/helpers/module.php            |  6 ++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

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

diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 233e4f2e..906a251d 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -32,12 +32,35 @@ class block_manager_Core {
     self::set_active($location, $blocks);
   }
 
+  static function activate_sidebar_blocks($module_name) {
+    $block_class = "{$module_name}_block";
+    if (method_exists($block_class, "get_site_list")) {
+      $blocks = call_user_func(array($block_class, "get_site_list"));
+      Kohana::log("error", Kohana::debug($blocks));
+      foreach  (array_keys($blocks) as $id) {
+        list ($unused, $block_id) = explode(":", $id);
+        self::add("site.sidebar", $module_name, $block_id);
+      }
+    }
+  }
+
   static function remove($location, $block_id) {
     $blocks = self::get_active($location);
     unset($blocks[$block_id]);
     self::set_active($location, $blocks);
   }
 
+  static function deactivate_sidebar_blocks($module_name) {
+    $block_class = "{$module_name}_block";
+    if (method_exists($block_class, "get_site_list")) {
+      $blocks = call_user_func(array($block_class, "get_site_list"));
+      foreach  (array_keys($blocks) as $id) {
+        list ($unused, $block_id) = explode(":", $id);
+        self::remove("site.sidebar", $module_name, $block_id);
+      }
+    }
+  }
+
   static function get_available_admin_blocks() {
     return self::_get_blocks("get_admin_list");
   }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 743808ea..b1ea1f19 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -386,7 +386,7 @@ class gallery_installer {
       $sidebar_blocks = block_manager::get_active("site.sidebar");
       if (empty($sidebar_blocks)) {
         $available_blocks = block_manager::get_available_site_blocks();
-        foreach  (array_key(block_manager::get_available_site_blocks()) as $id) {
+        foreach  (array_keys(block_manager::get_available_site_blocks()) as $id) {
           $sidebar_blocks[] = explode(":", $id);
         }
         block_manager::set_active("site.sidebar", $sidebar_blocks);
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index a27fdbc5..fe37f4f9 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -195,6 +195,9 @@ class module_Core {
     module::load_modules();
 
     graphics::activate_rules($module_name);
+
+    block_manager::activate_sidebar_blocks($module_name);
+
     log::success(
       "module", t("Activated module %module_name", array("module_name" => $module_name)));
   }
@@ -219,6 +222,9 @@ class module_Core {
     module::load_modules();
 
     graphics::deactivate_rules($module_name);
+
+    block_manager::deactivate_sidebar_blocks($module_name);
+
     log::success(
       "module", t("Deactivated module %module_name", array("module_name" => $module_name)));
   }
-- 
cgit v1.2.3


From aa0529d557ed0609bf7e5b23a5cf2437f7998c4b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 4 Oct 2009 09:45:17 -0700
Subject: Create a gallery::plugin_path which returns the appropriate path to
 the module or theme.  This checks for the existence of an application/modules
 or application/themes first.

---
 modules/gallery/controllers/admin_themes.php  | 31 +++++++++++++-----------
 modules/gallery/helpers/gallery.php           | 13 ++++++++++
 modules/gallery/helpers/gallery_installer.php |  4 ++--
 modules/gallery/helpers/module.php            | 34 +++++++++++++++++----------
 modules/gallery/helpers/theme.php             |  7 ++----
 5 files changed, 55 insertions(+), 34 deletions(-)

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

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 24f91aba..722cfb45 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -29,17 +29,20 @@ class Admin_Themes_Controller extends Admin_Controller {
 
   private function _get_themes() {
     $themes = array();
-    foreach (scandir(THEMEPATH) as $theme_name) {
-      if ($theme_name[0] == ".") {
-        continue;
-      }
-
-      $file = THEMEPATH . "$theme_name/theme.info";
-      $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-      $theme_info->description = t($theme_info->description);
-      $theme_info->name = t($theme_info->name);
+    foreach (array(APPPATH . "themes/", THEMEPATH) as $themepath) {
+      foreach (scandir($themepath) as $theme_name) {
+        if ($theme_name[0] == ".") {
+          continue;
+        }
+        $file = $themepath . "$theme_name/theme.info";
+        if (file_exists($file)) {
+          $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+          $theme_info->description = t($theme_info->description);
+          $theme_info->name = t($theme_info->name);
 
-      $themes[$theme_name] = $theme_info;
+          $themes[$theme_name] = $theme_info;
+        }
+      }
     }
     return $themes;
   }
@@ -47,8 +50,8 @@ class Admin_Themes_Controller extends Admin_Controller {
   public function preview($type, $theme_name) {
     $view = new View("admin_themes_preview.html");
     $theme_name = preg_replace("/[^\w]/", "", $theme_name);
-    $view->info = new ArrayObject(
-      parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
+    $view->info = new ArrayObject(parse_ini_file(
+      gallery::plugin_path("$theme_name/theme.info", "theme")), ArrayObject::ARRAY_AS_PROPS);
     $view->theme_name = $theme_name;
     $view->type = $type;
     if ($type == "admin") {
@@ -63,8 +66,8 @@ class Admin_Themes_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $theme_name = preg_replace("/[^\w]/", "", $theme_name);
-    $info = new ArrayObject(
-      parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
+    $info = new ArrayObject(parse_ini_file(
+      gallery::plugin_path("$theme_name/theme.info", "theme")), ArrayObject::ARRAY_AS_PROPS);
 
     if ($type == "admin" && $info->admin) {
       module::set_var("gallery", "active_admin_theme", $theme_name);
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 37a08d08..6d387d76 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -110,4 +110,17 @@ class gallery_Core {
     return $file_name;
   }
 
+  /**
+   * Return a full path to the theme or module file.  It checks the APPPATH/(themes|modules) first
+   * then the THEMEPATH | MODPATH
+   * @param $file the file or directory
+   * @param $type ("module" | "theme" optional: defaults to "module")
+   * @return string
+   */
+  static function plugin_path($file, $type="module") {
+    if (!file_exists($ofile = APPPATH . "{$type}s/$file")) {
+      $ofile = $type == "module" ? MODPATH . $file : THEMEPATH . $file;
+    }
+    return $ofile;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index b1ea1f19..e834a62c 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -245,8 +245,8 @@ class gallery_installer {
 
     // Instantiate default themes (site and admin)
     foreach (array("wind", "admin_wind") as $theme_name) {
-      $theme_info = new ArrayObject(parse_ini_file(THEMEPATH . $theme_name . "/theme.info"),
-                                    ArrayObject::ARRAY_AS_PROPS);
+      $file = gallery::plugin_path("$theme_name/theme.info", "theme");
+      $theme_info = new ArrayObject(parse_ini_file($file, ArrayObject::ARRAY_AS_PROPS);
       $theme = ORM::factory("theme");
       $theme->name = $theme_name;
       $theme->version = $theme_info->version;
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index fe37f4f9..99c52cab 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -77,15 +77,23 @@ class module_Core {
   static function available() {
     if (empty(self::$available)) {
       $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-      foreach (glob(MODPATH . "*/module.info") as $file) {
-        $module_name = basename(dirname($file));
-        $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-        $m =& $modules->$module_name;
-        $m->installed = self::is_installed($module_name);
-        $m->active = self::is_active($module_name);
-        $m->code_version = $m->version;
-        $m->version = self::get_version($module_name);
-        $m->locked = false;
+      foreach (array(APPPATH . "modules/", MODPATH) as $modpath) {
+        foreach (scandir($modpath) as $module_name) {
+          if ($module_name[0] == ".") {
+            continue;
+          }
+          $file = "{$modpath}$module_name/module.info";
+          if (file_exists($file)) {
+            $modules->$module_name =
+              new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+            $m =& $modules->$module_name;
+            $m->installed = self::is_installed($module_name);
+            $m->active = self::is_active($module_name);
+            $m->code_version = $m->version;
+            $m->version = self::get_version($module_name);
+            $m->locked = false;
+          }
+        }
       }
 
       // Lock certain modules
@@ -113,7 +121,7 @@ class module_Core {
    */
   static function install($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, MODPATH . $module_name);
+    array_unshift($kohana_modules, gallery::plugin_path($module_name));
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $installer_class = "{$module_name}_installer";
@@ -140,7 +148,7 @@ class module_Core {
    */
   static function upgrade($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, MODPATH . $module_name);
+    array_unshift($kohana_modules, gallery::plugin_path($module_name));
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $version_before = module::get_version($module_name);
@@ -179,7 +187,7 @@ class module_Core {
    */
   static function activate($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, MODPATH . $module_name);
+    array_unshift($kohana_modules, gallery::plugin_path($module_name));
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $installer_class = "{$module_name}_installer";
@@ -271,7 +279,7 @@ class module_Core {
         $gallery = $module;
       } else {
         self::$active[] = $module;
-        $kohana_modules[] = MODPATH . $module->name;
+        $kohana_modules[] = gallery::plugin_path($module->name);
       }
     }
     self::$active[] = $gallery;  // put gallery last in the module list to match core.modules
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index fb8f7ca7..3ba11aa2 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -30,11 +30,8 @@ class theme_Core {
    */
   static function load_themes() {
     $modules = Kohana::config("core.modules");
-    if (Router::$controller == "admin") {
-      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_admin_theme"));
-    } else {
-      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_site_theme"));
-    }
+    array_unshift($modules, gallery::plugin_path(module::get_var("gallery",
+      (Router::$controller == "admin") ? "active_admin_theme" : "active_site_theme"), "theme"));
 
     Kohana::config_set("core.modules", $modules);
   }
-- 
cgit v1.2.3


From 2634a683b30982963264faf9867d32d1aa71a182 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 4 Oct 2009 10:04:35 -0700
Subject: Revert "Create a gallery::plugin_path which returns the appropriate
 path to the module or theme.  This checks for the existence of an
 application/modules or application/themes first."

This reverts commit e1e1461a77caf5bff457927f098366497de6ffff.
---
 modules/gallery/controllers/admin_themes.php  | 31 +++++++++++-------------
 modules/gallery/helpers/gallery.php           | 13 ----------
 modules/gallery/helpers/gallery_installer.php |  4 ++--
 modules/gallery/helpers/module.php            | 34 ++++++++++-----------------
 modules/gallery/helpers/theme.php             |  7 ++++--
 5 files changed, 34 insertions(+), 55 deletions(-)

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

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 722cfb45..24f91aba 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -29,20 +29,17 @@ class Admin_Themes_Controller extends Admin_Controller {
 
   private function _get_themes() {
     $themes = array();
-    foreach (array(APPPATH . "themes/", THEMEPATH) as $themepath) {
-      foreach (scandir($themepath) as $theme_name) {
-        if ($theme_name[0] == ".") {
-          continue;
-        }
-        $file = $themepath . "$theme_name/theme.info";
-        if (file_exists($file)) {
-          $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-          $theme_info->description = t($theme_info->description);
-          $theme_info->name = t($theme_info->name);
-
-          $themes[$theme_name] = $theme_info;
-        }
+    foreach (scandir(THEMEPATH) as $theme_name) {
+      if ($theme_name[0] == ".") {
+        continue;
       }
+
+      $file = THEMEPATH . "$theme_name/theme.info";
+      $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+      $theme_info->description = t($theme_info->description);
+      $theme_info->name = t($theme_info->name);
+
+      $themes[$theme_name] = $theme_info;
     }
     return $themes;
   }
@@ -50,8 +47,8 @@ class Admin_Themes_Controller extends Admin_Controller {
   public function preview($type, $theme_name) {
     $view = new View("admin_themes_preview.html");
     $theme_name = preg_replace("/[^\w]/", "", $theme_name);
-    $view->info = new ArrayObject(parse_ini_file(
-      gallery::plugin_path("$theme_name/theme.info", "theme")), ArrayObject::ARRAY_AS_PROPS);
+    $view->info = new ArrayObject(
+      parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
     $view->theme_name = $theme_name;
     $view->type = $type;
     if ($type == "admin") {
@@ -66,8 +63,8 @@ class Admin_Themes_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $theme_name = preg_replace("/[^\w]/", "", $theme_name);
-    $info = new ArrayObject(parse_ini_file(
-      gallery::plugin_path("$theme_name/theme.info", "theme")), ArrayObject::ARRAY_AS_PROPS);
+    $info = new ArrayObject(
+      parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
 
     if ($type == "admin" && $info->admin) {
       module::set_var("gallery", "active_admin_theme", $theme_name);
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 6d387d76..37a08d08 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -110,17 +110,4 @@ class gallery_Core {
     return $file_name;
   }
 
-  /**
-   * Return a full path to the theme or module file.  It checks the APPPATH/(themes|modules) first
-   * then the THEMEPATH | MODPATH
-   * @param $file the file or directory
-   * @param $type ("module" | "theme" optional: defaults to "module")
-   * @return string
-   */
-  static function plugin_path($file, $type="module") {
-    if (!file_exists($ofile = APPPATH . "{$type}s/$file")) {
-      $ofile = $type == "module" ? MODPATH . $file : THEMEPATH . $file;
-    }
-    return $ofile;
-  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index e834a62c..b1ea1f19 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -245,8 +245,8 @@ class gallery_installer {
 
     // Instantiate default themes (site and admin)
     foreach (array("wind", "admin_wind") as $theme_name) {
-      $file = gallery::plugin_path("$theme_name/theme.info", "theme");
-      $theme_info = new ArrayObject(parse_ini_file($file, ArrayObject::ARRAY_AS_PROPS);
+      $theme_info = new ArrayObject(parse_ini_file(THEMEPATH . $theme_name . "/theme.info"),
+                                    ArrayObject::ARRAY_AS_PROPS);
       $theme = ORM::factory("theme");
       $theme->name = $theme_name;
       $theme->version = $theme_info->version;
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 99c52cab..fe37f4f9 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -77,23 +77,15 @@ class module_Core {
   static function available() {
     if (empty(self::$available)) {
       $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-      foreach (array(APPPATH . "modules/", MODPATH) as $modpath) {
-        foreach (scandir($modpath) as $module_name) {
-          if ($module_name[0] == ".") {
-            continue;
-          }
-          $file = "{$modpath}$module_name/module.info";
-          if (file_exists($file)) {
-            $modules->$module_name =
-              new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-            $m =& $modules->$module_name;
-            $m->installed = self::is_installed($module_name);
-            $m->active = self::is_active($module_name);
-            $m->code_version = $m->version;
-            $m->version = self::get_version($module_name);
-            $m->locked = false;
-          }
-        }
+      foreach (glob(MODPATH . "*/module.info") as $file) {
+        $module_name = basename(dirname($file));
+        $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+        $m =& $modules->$module_name;
+        $m->installed = self::is_installed($module_name);
+        $m->active = self::is_active($module_name);
+        $m->code_version = $m->version;
+        $m->version = self::get_version($module_name);
+        $m->locked = false;
       }
 
       // Lock certain modules
@@ -121,7 +113,7 @@ class module_Core {
    */
   static function install($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, gallery::plugin_path($module_name));
+    array_unshift($kohana_modules, MODPATH . $module_name);
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $installer_class = "{$module_name}_installer";
@@ -148,7 +140,7 @@ class module_Core {
    */
   static function upgrade($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, gallery::plugin_path($module_name));
+    array_unshift($kohana_modules, MODPATH . $module_name);
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $version_before = module::get_version($module_name);
@@ -187,7 +179,7 @@ class module_Core {
    */
   static function activate($module_name) {
     $kohana_modules = Kohana::config("core.modules");
-    array_unshift($kohana_modules, gallery::plugin_path($module_name));
+    array_unshift($kohana_modules, MODPATH . $module_name);
     Kohana::config_set("core.modules",  $kohana_modules);
 
     $installer_class = "{$module_name}_installer";
@@ -279,7 +271,7 @@ class module_Core {
         $gallery = $module;
       } else {
         self::$active[] = $module;
-        $kohana_modules[] = gallery::plugin_path($module->name);
+        $kohana_modules[] = MODPATH . $module->name;
       }
     }
     self::$active[] = $gallery;  // put gallery last in the module list to match core.modules
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 3ba11aa2..fb8f7ca7 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -30,8 +30,11 @@ class theme_Core {
    */
   static function load_themes() {
     $modules = Kohana::config("core.modules");
-    array_unshift($modules, gallery::plugin_path(module::get_var("gallery",
-      (Router::$controller == "admin") ? "active_admin_theme" : "active_site_theme"), "theme"));
+    if (Router::$controller == "admin") {
+      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_admin_theme"));
+    } else {
+      array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_site_theme"));
+    }
 
     Kohana::config_set("core.modules", $modules);
   }
-- 
cgit v1.2.3


From b528fbde579b76cdab098a0319fdfbded93bee4a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 21 Oct 2009 11:50:42 -0700
Subject: Change this files to use the API instead of referencing the group
 tables directly

---
 modules/g2_import/helpers/g2_import.php       | 2 +-
 modules/gallery/helpers/gallery_installer.php | 2 +-
 modules/notification/helpers/notification.php | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 8b48f727..d24aab93 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -301,7 +301,7 @@ class g2_import_Core {
         $user->admin = true;
         $message .= t("\n\tAdded 'admin' flag to user");
       } else {
-        $group = ORM::factory("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/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index b1ea1f19..10e796fd 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 = ORM::factory("group")->find_all();
+      $groups = Identity::groups();
       $permissions = ORM::factory("permission")->find_all();
       foreach($groups as $group) {
         foreach($permissions as $permission) {
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 64eed8dc..080f154b 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -78,6 +78,9 @@ class notification {
       $subscriber_ids[] = $subscriber->user_id;
     }
 
+    if (empty($subscriber_ids)) {
+      return array();
+    }
     $users = Identity::get_user_list($subscriber_ids);
 
     $subscribers = array();
-- 
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/gallery/helpers/gallery_installer.php')

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

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

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

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

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


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

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 79f700ef9f79926d5e806bd48e5a6f99b6ecc5bb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 12 Nov 2009 09:29:17 -0800
Subject: Change the keys of the block arrays in block manager to be a md5 hash
 of module_name:block_id.  This allows easier lookup of blocks to remove when
 modules are being deactivated. Change the module activation/deactivation to
 call (activate|deactivate)_blocks instead of just the sidebar blocks.  This
 insures that when a module is deactivated any admin dashboard blocks are
 removed as well the site sideboard blocks. Fix for ticket #876.

---
 installer/install.sql                         | 31 ++++++++++++++-------------
 modules/gallery/helpers/block_manager.php     | 18 ++++++++++++----
 modules/gallery/helpers/gallery_installer.php | 14 +++++++++++-
 modules/gallery/helpers/module.php            |  4 ++--
 modules/gallery/module.info                   |  2 +-
 5 files changed, 46 insertions(+), 23 deletions(-)

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

diff --git a/installer/install.sql b/installer/install.sql
index 714d8ab7..617d89ff 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -228,8 +228,8 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',16);
-INSERT INTO {modules} VALUES (2,1,'user',1);
+INSERT INTO {modules} VALUES (1,1,'gallery',17);
+INSERT INTO {modules} VALUES (2,1,'user',2);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
 INSERT INTO {modules} VALUES (5,1,'info',1);
@@ -264,7 +264,7 @@ CREATE TABLE {permissions} (
 ) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {permissions} VALUES (1,'View','view');
-INSERT INTO {permissions} VALUES (2,'View Full Size','view_full');
+INSERT INTO {permissions} VALUES (2,'View full size','view_full');
 INSERT INTO {permissions} VALUES (3,'Edit','edit');
 INSERT INTO {permissions} VALUES (4,'Add','add');
 DROP TABLE IF EXISTS {search_records};
@@ -366,7 +366,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=33 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_wind');
@@ -376,14 +376,15 @@ INSERT INTO {vars} VALUES (5,'gallery','resize_size','640');
 INSERT INTO {vars} VALUES (6,'gallery','default_locale','en_US');
 INSERT INTO {vars} VALUES (7,'gallery','image_quality','75');
 INSERT INTO {vars} VALUES (8,'gallery','image_sharpen','15');
-INSERT INTO {vars} VALUES (9,'gallery','identity_provider','user');
-INSERT INTO {vars} VALUES (22,'gallery','time_format','H:i:s');
-INSERT INTO {vars} VALUES (23,'gallery','show_credits','1');
-INSERT INTO {vars} VALUES (24,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
-INSERT INTO {vars} VALUES (11,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
-INSERT INTO {vars} VALUES (21,'gallery','date_time_format','Y-M-d H:i:s');
-INSERT INTO {vars} VALUES (20,'gallery','date_format','Y-M-d');
-INSERT INTO {vars} VALUES (16,'gallery','blocks_dashboard_center','a:4:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}i:9;a:2:{i:0;s:7:\"comment\";i:1;s:15:\"recent_comments\";}}');
-INSERT INTO {vars} VALUES (19,'gallery','choose_default_tookit','1');
-INSERT INTO {vars} VALUES (26,'comment','spam_caught','0');
-INSERT INTO {vars} VALUES (28,'gallery','blocks_site.sidebar','a:3:{i:596516649;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:1189641421;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:1025202362;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
+INSERT INTO {vars} VALUES (10,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
+INSERT INTO {vars} VALUES (22,'gallery','show_credits','1');
+INSERT INTO {vars} VALUES (23,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
+INSERT INTO {vars} VALUES (20,'gallery','date_time_format','Y-M-d H:i:s');
+INSERT INTO {vars} VALUES (21,'gallery','time_format','H:i:s');
+INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:4:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}i:9;a:2:{i:0;s:7:\"comment\";i:1;s:15:\"recent_comments\";}}');
+INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
+INSERT INTO {vars} VALUES (19,'gallery','date_format','Y-M-d');
+INSERT INTO {vars} VALUES (26,'user','mininum_password_length','5');
+INSERT INTO {vars} VALUES (25,'gallery','identity_provider','user');
+INSERT INTO {vars} VALUES (28,'comment','spam_caught','0');
+INSERT INTO {vars} VALUES (30,'gallery','blocks_site.sidebar','a:3:{s:32:\"6e901fd82a43b0e07ebbd7123b5ee349\";a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}s:32:\"c07f62cf746316b111a61681fe49ad39\";a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}s:32:\"2eef3fd349091e4e1cee9e27072bff39\";a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 0e78661a..980d1db5 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -28,11 +28,12 @@ class block_manager_Core {
 
   static function add($location, $module_name, $block_id) {
     $blocks = self::get_active($location);
-    $blocks[rand()] = array($module_name, $block_id);
+    $blocks[md5("$module_name:$block_id")] = array($module_name, $block_id);
+
     self::set_active($location, $blocks);
   }
 
-  static function activate_sidebar_blocks($module_name) {
+  static function activate_blocks($module_name) {
     $block_class = "{$module_name}_block";
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
@@ -48,12 +49,21 @@ class block_manager_Core {
     self::set_active($location, $blocks);
   }
 
-  static function deactivate_sidebar_blocks($module_name) {
+  static function deactivate_blocks($module_name) {
     $block_class = "{$module_name}_block";
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach  (array_keys($blocks) as $block_id) {
-        self::remove("site.sidebar", $module_name, $block_id);
+        self::remove("site.sidebar", md5("$module_name:$block_id"));
+      }
+    }
+
+    if (method_exists($block_class, "get_admin_list")) {
+      $blocks = call_user_func(array($block_class, "get_admin_list"));
+      foreach (array("dashboard_sidebar", "dashboard_center") as $location) {
+        foreach  (array_keys($blocks) as $block_id) {
+          self::remove($location, md5("$module_name:$block_id"));
+        }
       }
     }
   }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 2eb02546..26cd14f5 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,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", 16);
+    module::set_version("gallery", 17);
   }
 
   static function upgrade($version) {
@@ -398,6 +398,18 @@ class gallery_installer {
       module::set_var("gallery", "identity_provider", "user");
       module::set_version("gallery", $version = 16);
     }
+
+    if ($version == 16) {
+      foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $location) {
+        $blocks = block_manager::get_active($location);
+        $new_blocks = array();
+        foreach ($blocks as $block) {
+          $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
+        }
+        block_manager::set_active($location, $new_blocks);
+      }
+      module::set_version("gallery", $version = 17);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index da334370..e6c196ce 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -211,7 +211,7 @@ class module_Core {
 
     graphics::activate_rules($module_name);
 
-    block_manager::activate_sidebar_blocks($module_name);
+    block_manager::activate_blocks($module_name);
 
     log::success(
       "module", t("Activated module %module_name", array("module_name" => $module_name)));
@@ -238,7 +238,7 @@ class module_Core {
 
     graphics::deactivate_rules($module_name);
 
-    block_manager::deactivate_sidebar_blocks($module_name);
+    block_manager::deactivate_blocks($module_name);
 
     log::success(
       "module", t("Deactivated module %module_name", array("module_name" => $module_name)));
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index e21431a7..2a35b809 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 16
+version = 17
-- 
cgit v1.2.3


From def88149ccf8b542b376b96dd25c52f2ec6920e1 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 13 Nov 2009 09:14:39 -0800
Subject: Undo using the md5 hash of the module name and block_id, so duplicate
 blocks are no allowed again

---
 installer/install.sql                         | 14 +++++++-------
 modules/gallery/controllers/packager.php      | 11 +++++++++++
 modules/gallery/helpers/block_manager.php     | 18 +++++++++++++-----
 modules/gallery/helpers/gallery_installer.php | 15 ++++++++++++++-
 modules/gallery/module.info                   |  2 +-
 5 files changed, 46 insertions(+), 14 deletions(-)

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

diff --git a/installer/install.sql b/installer/install.sql
index 1f6014a7..0fd3601a 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -228,7 +228,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',17);
+INSERT INTO {modules} VALUES (1,1,'gallery',18);
 INSERT INTO {modules} VALUES (2,1,'user',2);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
@@ -366,7 +366,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=35 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_wind');
@@ -376,15 +376,15 @@ INSERT INTO {vars} VALUES (5,'gallery','resize_size','640');
 INSERT INTO {vars} VALUES (6,'gallery','default_locale','en_US');
 INSERT INTO {vars} VALUES (7,'gallery','image_quality','75');
 INSERT INTO {vars} VALUES (8,'gallery','image_sharpen','15');
-INSERT INTO {vars} VALUES (10,'gallery','blocks_dashboard_sidebar','a:4:{s:32:\"ea6daed3baa18234bb574af71ab42250\";a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}s:32:\"f566a858e4b0238c0429d7b03b9f136f\";a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}s:32:\"4a3e6ed692f52ff14fbc0bfb94a1a130\";a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}s:32:\"53c72b14ba93d7f23d0efb72cc4d7cd1\";a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
+INSERT INTO {vars} VALUES (21,'gallery','time_format','H:i:s');
 INSERT INTO {vars} VALUES (22,'gallery','show_credits','1');
 INSERT INTO {vars} VALUES (23,'gallery','credits','Powered by <a href=\"%url\">Gallery %version</a>');
+INSERT INTO {vars} VALUES (10,'gallery','blocks_dashboard_sidebar','a:4:{i:2;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"block_adder\";}i:3;a:2:{i:0;s:7:\"gallery\";i:1;s:5:\"stats\";}i:4;a:2:{i:0;s:7:\"gallery\";i:1;s:13:\"platform_info\";}i:5;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"project_news\";}}');
 INSERT INTO {vars} VALUES (20,'gallery','date_time_format','Y-M-d H:i:s');
-INSERT INTO {vars} VALUES (21,'gallery','time_format','H:i:s');
-INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:3:{s:32:\"0fb54e06307c0ec68ff9494082191235\";a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}s:32:\"f76ac022796947436740be2144b6d776\";a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}s:32:\"42a3ca45d2397f2d3e59dacae4caf3e0\";a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}}');
-INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (19,'gallery','date_format','Y-M-d');
+INSERT INTO {vars} VALUES (15,'gallery','blocks_dashboard_center','a:3:{i:6;a:2:{i:0;s:7:\"gallery\";i:1;s:7:\"welcome\";}i:7;a:2:{i:0;s:7:\"gallery\";i:1;s:12:\"photo_stream\";}i:8;a:2:{i:0;s:7:\"gallery\";i:1;s:11:\"log_entries\";}}');
+INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (26,'user','mininum_password_length','5');
 INSERT INTO {vars} VALUES (27,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (25,'gallery','identity_provider','user');
-INSERT INTO {vars} VALUES (29,'gallery','blocks_site.sidebar','a:3:{s:32:\"6e901fd82a43b0e07ebbd7123b5ee349\";a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}s:32:\"c07f62cf746316b111a61681fe49ad39\";a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}s:32:\"2eef3fd349091e4e1cee9e27072bff39\";a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
+INSERT INTO {vars} VALUES (29,'gallery','blocks_site.sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index f0e35b2d..b2550603 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -73,6 +73,17 @@ class Packager_Controller extends Controller {
   }
 
   private function _dump_database() {
+    // We now have a clean install with just the packages that we want.  Make sure that the
+    // database is clean too.
+    $i = 1;
+    foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $key) {
+      $blocks = array();
+      foreach (unserialize(module::get_var("gallery", "blocks_{$key}")) as $rnd => $value) {
+        $blocks[++$i] = $value;
+      }
+      module::set_var("gallery", "blocks_{$key}", serialize($blocks));
+    }
+
     $db = Database::instance();
     $db->query("TRUNCATE {sessions}");
     $db->query("TRUNCATE {logs}");
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 980d1db5..d513abd9 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -28,7 +28,7 @@ class block_manager_Core {
 
   static function add($location, $module_name, $block_id) {
     $blocks = self::get_active($location);
-    $blocks[md5("$module_name:$block_id")] = array($module_name, $block_id);
+    $blocks[rand()] = array($module_name, $block_id);
 
     self::set_active($location, $blocks);
   }
@@ -49,21 +49,29 @@ class block_manager_Core {
     self::set_active($location, $blocks);
   }
 
+  static function remove_blocks_for_module($location, $module_name) {
+    $blocks = self::get_active($location);
+    foreach ($blocks as $key => $block) {
+      if ($block[0] == $module_name) {
+        unset($blocks[$key]);
+      }
+    }
+    self::set_active($location, $blocks);
+  }
+
   static function deactivate_blocks($module_name) {
     $block_class = "{$module_name}_block";
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach  (array_keys($blocks) as $block_id) {
-        self::remove("site.sidebar", md5("$module_name:$block_id"));
+        self::remove_blocks_for_module("site.sidebar", $module_name);
       }
     }
 
     if (method_exists($block_class, "get_admin_list")) {
       $blocks = call_user_func(array($block_class, "get_admin_list"));
       foreach (array("dashboard_sidebar", "dashboard_center") as $location) {
-        foreach  (array_keys($blocks) as $block_id) {
-          self::remove($location, md5("$module_name:$block_id"));
-        }
+        self::remove_blocks_for_module($location, $module_name);
       }
     }
   }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 26cd14f5..2d4a1e04 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,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", 17);
+    module::set_version("gallery", 18);
   }
 
   static function upgrade($version) {
@@ -410,6 +410,19 @@ class gallery_installer {
       }
       module::set_version("gallery", $version = 17);
     }
+
+    if ($version == 17) {
+      // Once published we can't go back so reset the keys to a random to allow duplicates
+      foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $location) {
+        $blocks = block_manager::get_active($location);
+        $new_blocks = array();
+        foreach ($blocks as $block) {
+          $new_blocks[rand()] = $block;
+        }
+        block_manager::set_active($location, $new_blocks);
+      }
+      module::set_version("gallery", $version = 18);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 2a35b809..3a5d68b2 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 17
+version = 18
-- 
cgit v1.2.3


From 0fe32a61f6c55e1302e45358375bf69a161ccdd4 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 13 Nov 2009 13:56:05 -0800
Subject: Standardize the name of the blocks.

---
 installer/install.sql                         |  4 ++--
 modules/gallery/controllers/admin_sidebar.php |  4 ++--
 modules/gallery/controllers/packager.php      |  2 +-
 modules/gallery/helpers/block_manager.php     |  4 ++--
 modules/gallery/helpers/gallery_installer.php | 30 +++++++++++++++++----------
 modules/gallery/libraries/Theme_View.php      |  2 +-
 modules/gallery/module.info                   |  2 +-
 7 files changed, 28 insertions(+), 20 deletions(-)

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

diff --git a/installer/install.sql b/installer/install.sql
index 0fd3601a..38851eff 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -228,7 +228,7 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',18);
+INSERT INTO {modules} VALUES (1,1,'gallery',19);
 INSERT INTO {modules} VALUES (2,1,'user',2);
 INSERT INTO {modules} VALUES (3,1,'comment',2);
 INSERT INTO {modules} VALUES (4,1,'organize',1);
@@ -387,4 +387,4 @@ INSERT INTO {vars} VALUES (18,'gallery','choose_default_tookit','1');
 INSERT INTO {vars} VALUES (26,'user','mininum_password_length','5');
 INSERT INTO {vars} VALUES (27,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (25,'gallery','identity_provider','user');
-INSERT INTO {vars} VALUES (29,'gallery','blocks_site.sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
+INSERT INTO {vars} VALUES (29,'gallery','blocks_site_sidebar','a:3:{i:9;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:10;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:11;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index 6c8d15f1..77e83bc2 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -37,7 +37,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
     foreach ($this->input->get("block", array()) as $block_id) {
       $active_blocks[md5($block_id)] = explode(":", (string) $block_id);
     }
-    block_manager::set_active("site.sidebar", $active_blocks);
+    block_manager::set_active("site_sidebar", $active_blocks);
 
     $result = array("result" => "success");
     list($available, $active) = $this->_get_blocks();
@@ -55,7 +55,7 @@ class Admin_Sidebar_Controller extends Admin_Controller {
   private function _get_blocks() {
     $active_blocks = array();
     $available_blocks = block_manager::get_available_site_blocks();
-    foreach (block_manager::get_active("site.sidebar") as $block) {
+    foreach (block_manager::get_active("site_sidebar") as $block) {
       $id = "{$block[0]}:{$block[1]}";
       if (!empty($available_blocks[$id])) {
         $active_blocks[$id] = $available_blocks[$id];
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index b2550603..82c3c938 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -76,7 +76,7 @@ class Packager_Controller extends Controller {
     // We now have a clean install with just the packages that we want.  Make sure that the
     // database is clean too.
     $i = 1;
-    foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $key) {
+    foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $key) {
       $blocks = array();
       foreach (unserialize(module::get_var("gallery", "blocks_{$key}")) as $rnd => $value) {
         $blocks[++$i] = $value;
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index d513abd9..b003f1d8 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -38,7 +38,7 @@ class block_manager_Core {
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach  (array_keys($blocks) as $block_id) {
-        self::add("site.sidebar", $module_name, $block_id);
+        self::add("site_sidebar", $module_name, $block_id);
       }
     }
   }
@@ -64,7 +64,7 @@ class block_manager_Core {
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
       foreach  (array_keys($blocks) as $block_id) {
-        self::remove_blocks_for_module("site.sidebar", $module_name);
+        self::remove_blocks_for_module("site_sidebar", $module_name);
       }
     }
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 2d4a1e04..470c54cf 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,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", 18);
+    module::set_version("gallery", 19);
   }
 
   static function upgrade($version) {
@@ -383,13 +383,13 @@ class gallery_installer {
     }
 
     if ($version == 14) {
-      $sidebar_blocks = block_manager::get_active("site.sidebar");
+      $sidebar_blocks = block_manager::get_active("site_sidebar");
       if (empty($sidebar_blocks)) {
         $available_blocks = block_manager::get_available_site_blocks();
         foreach  (array_keys(block_manager::get_available_site_blocks()) as $id) {
           $sidebar_blocks[] = explode(":", $id);
         }
-        block_manager::set_active("site.sidebar", $sidebar_blocks);
+        block_manager::set_active("site_sidebar", $sidebar_blocks);
       }
       module::set_version("gallery", $version = 15);
     }
@@ -400,20 +400,18 @@ class gallery_installer {
     }
 
     if ($version == 16) {
-      foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $location) {
-        $blocks = block_manager::get_active($location);
-        $new_blocks = array();
-        foreach ($blocks as $block) {
-          $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
-        }
-        block_manager::set_active($location, $new_blocks);
+      $blocks = block_manager::get_active($location);
+      $new_blocks = array();
+      foreach ($blocks as $block) {
+        $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
       }
+      block_manager::set_active($location, $new_blocks);
       module::set_version("gallery", $version = 17);
     }
 
     if ($version == 17) {
       // Once published we can't go back so reset the keys to a random to allow duplicates
-      foreach (array("dashboard_sidebar", "dashboard_center", "site.sidebar") as $location) {
+      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
         $blocks = block_manager::get_active($location);
         $new_blocks = array();
         foreach ($blocks as $block) {
@@ -423,6 +421,16 @@ class gallery_installer {
       }
       module::set_version("gallery", $version = 18);
     }
+
+    if ($version == 18) {
+      // Once published we can't go back so reset the keys to a random to allow duplicates
+      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
+        $blocks = block_manager::get_active("site.sidebar");
+        block_manager::set_active("site_sidebar", $blocks);
+        module::clear_var("gallery", "blocks_site.sidebar");
+      }
+      module::set_version("gallery", $version = 19);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index f8fae0f7..7e6a0b2e 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -165,7 +165,7 @@ class Theme_View_Core extends Gallery_View {
    * Print out the sidebar.
    */
   public function sidebar_blocks() {
-    $sidebar = block_manager::get_html("site.sidebar", $this);
+    $sidebar = block_manager::get_html("site_sidebar", $this);
     if (empty($sidebar) && identity::active_user()->admin) {
       $sidebar = new View("no_sidebar.html");
     }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 3a5d68b2..2dc62ecd 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 18
+version = 19
-- 
cgit v1.2.3


From 100a66d861849ab0d78dca84b0b06c1af973752a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Nov 2009 12:03:41 -0800
Subject: Fix a bunch of little issues in the version 16, 17, and 18 upgraders.
 - Add a missing loop in 15->16 causing ticket #881 - Comment the blocks
 correctly - Remove unnecessary loop from 18->19

---
 modules/gallery/helpers/gallery_installer.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

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

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 470c54cf..57a5ee9f 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -399,18 +399,21 @@ class gallery_installer {
       module::set_version("gallery", $version = 16);
     }
 
+    // Convert block keys to an md5 hash of the module and block name
     if ($version == 16) {
-      $blocks = block_manager::get_active($location);
-      $new_blocks = array();
-      foreach ($blocks as $block) {
-        $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
+      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
+        $blocks = block_manager::get_active($location);
+        $new_blocks = array();
+        foreach ($blocks as $block) {
+          $new_blocks[md5("{$block[0]}:{$block[1]}")] = $block;
+        }
+        block_manager::set_active($location, $new_blocks);
       }
-      block_manager::set_active($location, $new_blocks);
       module::set_version("gallery", $version = 17);
     }
 
+    // We didn't like md5 hashes so convert block keys back to random keys to allow duplicates.
     if ($version == 17) {
-      // Once published we can't go back so reset the keys to a random to allow duplicates
       foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
         $blocks = block_manager::get_active($location);
         $new_blocks = array();
@@ -422,13 +425,11 @@ class gallery_installer {
       module::set_version("gallery", $version = 18);
     }
 
+    // Rename blocks_site.sidebar to blocks_site_sidebar
     if ($version == 18) {
-      // Once published we can't go back so reset the keys to a random to allow duplicates
-      foreach (array("dashboard_sidebar", "dashboard_center", "site_sidebar") as $location) {
-        $blocks = block_manager::get_active("site.sidebar");
-        block_manager::set_active("site_sidebar", $blocks);
-        module::clear_var("gallery", "blocks_site.sidebar");
-      }
+      $blocks = block_manager::get_active("site.sidebar");
+      block_manager::set_active("site_sidebar", $blocks);
+      module::clear_var("gallery", "blocks_site.sidebar");
       module::set_version("gallery", $version = 19);
     }
   }
-- 
cgit v1.2.3