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

The vision here is that all user and group code that is gallery or ui specific
is contained within the core product.  Anything that relates to manipulating a
user or group is contained in the back end code that can be replaced.
---
 modules/gallery/config/identity.php | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 modules/gallery/config/identity.php

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
new file mode 100644
index 00000000..f2064127
--- /dev/null
+++ b/modules/gallery/config/identity.php
@@ -0,0 +1,36 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/*
+ * @package  User
+ *
+ * User settings, defined as arrays, or "groups". If no group name is
+ * used when loading the cache library, the group named "default" will be used.
+ *
+ * Each group can be used independently, and multiple groups can be used at once.
+ *
+ * Group Options:
+ *  driver   - User backend driver. Gallery comes with Gallery user driver.
+ *
+ *  params   - Driver parameters, specific to each driver.
+ */
+$config["default"] = array (
+  "driver"   => "gallery",
+  "params"   => array(),
+);
-- 
cgit v1.2.3


From 03d0311618267cf0b16445161c4d275749d64a5e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 7 Oct 2009 21:40:05 -0700
Subject: Implement a user::is_writable() API method and disable the user add,
 updates and display if the Identity driver does not support writes. This is
 set in the config.identity.php

---
 modules/gallery/config/identity.php              |  3 +-
 modules/gallery/helpers/gallery_theme.php        |  1 +
 modules/gallery/helpers/user.php                 | 39 ++++++++++++++++++++----
 modules/gallery/libraries/Identity.php           | 11 +++++++
 modules/gallery/libraries/drivers/Identity.php   |  1 -
 modules/gallery/views/admin_users.html.php       | 36 ++++++++++++++--------
 modules/gallery/views/admin_users_group.html.php |  4 +--
 modules/gallery/views/login.html.php             |  2 +-
 themes/admin_wind/css/screen.css                 |  3 +-
 9 files changed, 75 insertions(+), 25 deletions(-)

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
index f2064127..72d1b589 100644
--- a/modules/gallery/config/identity.php
+++ b/modules/gallery/config/identity.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 /*
- * @package  User
+ * @package  Identity
  *
  * User settings, defined as arrays, or "groups". If no group name is
  * used when loading the cache library, the group named "default" will be used.
@@ -32,5 +32,6 @@
  */
 $config["default"] = array (
   "driver"   => "gallery",
+  "allow_updates" => false,
   "params"   => array(),
 );
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index a342b4bd..54b35fb7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -55,6 +55,7 @@ class gallery_theme_Core {
     if ($theme->page_type != "login") {
       $view = new View("login.html");
       $view->user = user::active();
+      $view->writable = user::is_writable();
       return $view->render();
     }
   }
diff --git a/modules/gallery/helpers/user.php b/modules/gallery/helpers/user.php
index abbf8ab0..e3494fdf 100644
--- a/modules/gallery/helpers/user.php
+++ b/modules/gallery/helpers/user.php
@@ -25,24 +25,34 @@
  */
 class user_Core {
   static function get_edit_form($user) {
+    $writable = self::is_writable();
     $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
     $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
+    if ($writable) {
+      $group->password("password")->label(t("Password"))->id("g-password");
+      $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+        ->matches($group->password);
+    }
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $form->add_rules_from(self::get_edit_rules());
 
     module::event("user_edit_form", $user, $form);
     $group->submit("")->value(t("Save"));
+
+    if (!$writable) {
+      foreach ($group->inputs as $input) {
+        $input->disabled("disabled");
+      }
+    }
     return $form;
   }
 
   static function get_edit_form_admin($user) {
+    $writable = self::is_writable();
     $form = new Forge(
       "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $group = $form->group("edit_user")->label(t("Edit User"));
@@ -51,9 +61,11 @@ class user_Core {
       "in_use", t("There is already a user with that username"));
     $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
     self::_add_locale_dropdown($group, $user);
-    $group->password("password")->label(t("Password"))->id("g-password");
-    $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
-      ->matches($group->password);
+    if ($writable) {
+      $group->password("password")->label(t("Password"))->id("g-password");
+      $group->password("password2")->label(t("Confirm Password"))->id("g-password2")
+        ->matches($group->password);
+    }
     $group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
     $group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
     $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
@@ -61,6 +73,11 @@ class user_Core {
 
     module::event("user_edit_form_admin", $user, $form);
     $group->submit("")->value(t("Modify User"));
+    if (!$writable) {
+      foreach ($group->inputs as $input) {
+        $input->disabled("disabled");
+      }
+    }
     return $form;
   }
 
@@ -234,6 +251,16 @@ class user_Core {
     }
   }
 
+  /**
+   * Determine if a feature is supported by the driver.
+   *
+   * @param  string  $feature the name of the feature to check
+   * @return boolean true if supported
+   */
+  static function is_writable() {
+    return Identity::instance()->is_writable();
+  }
+
   /**
    * Return the guest user.
    *
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index a24e6226..fec822db 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -92,6 +92,17 @@ class Identity_Core {
     }
   }
 
+  /**
+   * Determine if a feature is supported by the driver.
+   *
+   * @param  string  $feature the name of the feature to check
+   * @return boolean true if supported
+   */
+  public function is_writable() {
+    return !empty($this->config["allow_updates"]);
+  }
+
+
   /**
    * Return the guest user.
    *
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index e67547be..a92958c7 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -176,7 +176,6 @@ abstract class User_Definition {
     case "hash":
     case "url":
     case "locale":
-      Kohana::log("error", "__set($column, $value)");
       $this->user->$column = $value;
       break;
     default:
diff --git a/modules/gallery/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
index a127bc15..82d0926c 100644
--- a/modules/gallery/views/admin_users.html.php
+++ b/modules/gallery/views/admin_users.html.php
@@ -2,7 +2,7 @@
 <script type="text/javascript">
   var add_user_to_group_url = "<?= url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf") ?>";
   $(document).ready(function(){
-    $("#g-user-admin-list .core-info").draggable({
+    $("#g-user-admin-list .g-draggable").draggable({
       helper: "clone"
     });
     $("#g-group-admin .g-group").droppable({
@@ -20,6 +20,7 @@
     });
     $("#group-1").droppable("destroy");
     $("#group-2").droppable("destroy");
+    $(".g-group-disable").droppable("destroy");
   });
 
   var reload_group = function(group_id) {
@@ -42,12 +43,14 @@
   }
 </script>
 <div class="g-block">
+  <? if (!empty($writable)): ?>
   <a href="<?= url::site("admin/users/add_user_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
   </a>
+  <? endif ?>
 
   <h2>
     <?= t("User Admin") ?>
@@ -65,7 +68,7 @@
 
       <? foreach ($users as $i => $user): ?>
       <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+        <td id="user-<?= $user->id ?>" class="core-info <?= !empty($writable) ? "g-draggable" : "" ?> ">
           <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
                title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
                alt="<?= html::clean_attribute($user->name) ?>"
@@ -86,15 +89,19 @@
           <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
               open_text="<?= t("close") ?>"
               class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a>
-          <? if (user::active()->id != $user->id && !$user->guest): ?>
-          <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
-          <? else: ?>
-          <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
-              class="g-button ui-state-disabled ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
+            <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text">
+              <?= (!empty($writable)) ? t("edit") : t("display") ?>
+            </span></a>
+          <? if (!empty($writable)): ?>
+            <? if (user::active()->id != $user->id && !$user->guest): ?>
+            <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
+                class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
+              <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+            <? else: ?>
+            <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
+                class="g-button ui-state-disabled ui-corner-all ui-icon-left">
+              <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
+            <? endif ?>
           <? endif ?>
         </td>
       </tr>
@@ -104,12 +111,14 @@
 </div>
 
 <div id="g-group-admin" class="g-block g-clearfix">
+  <? if (!empty($writable)): ?>
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new group") ?>
   </a>
+  <? endif ?>
 
   <h2>
     <?= t("Group Admin") ?>
@@ -118,8 +127,9 @@
   <div class="g-block-content">
     <ul>
       <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+      <? $class = !empty($writable) ? "" : "g-group-disable" ?>
+      <li id="group-<?= $group->id ?>" class="g-group <?= $class ?> <?= ($group->special ? "g-default-group" : "") ?>" />
+        <? $v = new View("admin_users_group.html"); $v->group = $group; $v->writable = !empty($writable) ?>
         <?= $v ?>
       </li>
       <? endforeach ?>
diff --git a/modules/gallery/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
index db3645a0..539f69b7 100644
--- a/modules/gallery/views/admin_users_group.html.php
+++ b/modules/gallery/views/admin_users_group.html.php
@@ -4,7 +4,7 @@
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
     title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
-    class="g-dialog-link g-button ui-state-default ui-corner-all">
+    class="g-dialog-link g-button ui-state-default ui-corner-all <?= !empty($writable) ? "" : "ui-state-disabled"  ?>">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? else: ?>
   <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="g-button ui-state-default ui-corner-all ui-icon-left"
+       class="g-button ui-state-default ui-corner-all ui-icon-left <?= !empty($writable) ? "" : "ui-state-disabled"  ?>"
        title="<?= t("Remove %user from %group group",
               array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
       <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 049ba043..fa6308ae 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -10,7 +10,7 @@
   <li class="first">
     <?= t('Logged in as %name', array('name' => html::mark_clean(
       '<a href="' . url::site("form/edit/users/{$user->id}") .
-      '" title="' . t("Edit Your Profile")->for_html_attr() .
+      '" title="' . ($writable ? t("Edit Your Profile")->for_html_attr() : t("Display Your Profile")->for_html_attr()) .
       '" id="g-user-profile-link" class="g-dialog-link">' .
       html::clean($user->display_name()) . '</a>'))) ?>
   </li>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 3573df57..79382198 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -567,7 +567,8 @@ li.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.g-default-group h4, li.g-default-group .g-user {
+li.g-default-group h4, li.g-default-group .g-user,
+li.g-group-disable h4, li.g-group-disable .g-user {
   color: gray;
 }
 
-- 
cgit v1.2.3


From 3a0413901fb4422fb34d786ba935dc63486bd187 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 7 Oct 2009 21:46:26 -0700
Subject: Forgot to save these before the last commit

---
 modules/gallery/config/identity.php         | 2 +-
 modules/gallery/controllers/admin_users.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
index 72d1b589..0479d08b 100644
--- a/modules/gallery/config/identity.php
+++ b/modules/gallery/config/identity.php
@@ -32,6 +32,6 @@
  */
 $config["default"] = array (
   "driver"   => "gallery",
-  "allow_updates" => false,
+  "allow_updates" => true,
   "params"   => array(),
 );
diff --git a/modules/gallery/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
index 6c72440a..9b7c81f1 100644
--- a/modules/gallery/controllers/admin_users.php
+++ b/modules/gallery/controllers/admin_users.php
@@ -21,6 +21,7 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
+    $view->content->writable = user::is_writable();
     $view->content->users = user::users(array("orderby" => array("name" => "ASC")));
     $view->content->groups = group::groups(array("orderby" => array("name" => "ASC")));
     print $view;
-- 
cgit v1.2.3


From 052491e258ec72746839298a545fecad18a947a0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 8 Oct 2009 06:26:12 -0700
Subject: If the Identity backend is not writable don't display the "Forgot
 Your Password" link

---
 modules/gallery/config/identity.php       | 2 +-
 modules/gallery/views/login_ajax.html.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
index 0479d08b..72d1b589 100644
--- a/modules/gallery/config/identity.php
+++ b/modules/gallery/config/identity.php
@@ -32,6 +32,6 @@
  */
 $config["default"] = array (
   "driver"   => "gallery",
-  "allow_updates" => true,
+  "allow_updates" => false,
   "params"   => array(),
 );
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index d3364b46..332a5365 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -36,8 +36,10 @@
     <li id="g-login-form">
       <?= $form ?>
     </li>
+    <? if (!empty($writable)): ?>
     <li>
       <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
     </li>
+    <? endif ?>
   </ul>
 </div>
-- 
cgit v1.2.3


From 1c1b726d077dc4db27b8af526384e74b9ae50e4f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 13 Oct 2009 19:56:02 -0700
Subject: Change the user config setting "allow_updates" to true in the
 identity config file and correct a missing variable in the view.

---
 modules/gallery/config/identity.php       | 2 +-
 modules/gallery/helpers/gallery_theme.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
index 72d1b589..0479d08b 100644
--- a/modules/gallery/config/identity.php
+++ b/modules/gallery/config/identity.php
@@ -32,6 +32,6 @@
  */
 $config["default"] = array (
   "driver"   => "gallery",
-  "allow_updates" => false,
+  "allow_updates" => true,
   "params"   => array(),
 );
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index a342b4bd..54b35fb7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -55,6 +55,7 @@ class gallery_theme_Core {
     if ($theme->page_type != "login") {
       $view = new View("login.html");
       $view->user = user::active();
+      $view->writable = user::is_writable();
       return $view->render();
     }
   }
-- 
cgit v1.2.3


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

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

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/identity.php b/modules/gallery/config/identity.php
deleted file mode 100644
index 0479d08b..00000000
--- a/modules/gallery/config/identity.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-/*
- * @package  Identity
- *
- * User settings, defined as arrays, or "groups". If no group name is
- * used when loading the cache library, the group named "default" will be used.
- *
- * Each group can be used independently, and multiple groups can be used at once.
- *
- * Group Options:
- *  driver   - User backend driver. Gallery comes with Gallery user driver.
- *
- *  params   - Driver parameters, specific to each driver.
- */
-$config["default"] = array (
-  "driver"   => "gallery",
-  "allow_updates" => true,
-  "params"   => array(),
-);
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index fe37f4f9..eab94500 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -90,7 +90,8 @@ class module_Core {
 
       // Lock certain modules
       $modules->gallery->locked = true;
-      $modules->user->locked = true;
+      $identity_module = self::get_var("gallery", "identity_provider", "user");
+      $modules->$identity_module->locked = true;
       $modules->ksort();
       self::$available = $modules;
     }
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index f844cf8f..9eb4b83b 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -49,49 +49,35 @@ class Identity_Core {
   /**
    * Loads the configured driver and validates it.
    *
-   * @param   array|string  custom configuration or config group name
    * @return  void
    */
-  public function __construct($config="default") {
-    if (is_string($config)) {
-      $name = $config;
-
-      // Test the config group name
-      if (($config = Kohana::config("identity.".$config)) === NULL) {
-        throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
-      }
-
-      if (is_array($config)) {
-        // Append the default configuration options
-        $config += Kohana::config("identity.default");
-      } else {
-        // Load the default group
-        $config = Kohana::config("identity.default");
-      }
-
-      // Cache the config in the object
-      $this->config = $config;
-
-      // Set driver name
-      $driver = "Identity_".ucfirst($this->config["driver"])."_Driver";
-
-      // Load the driver
-      if ( ! Kohana::auto_load($driver)) {
-        throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
-                                   get_class($this));
-      }
-
-      // Initialize the driver
-      $this->driver = new $driver($this->config["params"]);
-
-      // Validate the driver
-      if ( !($this->driver instanceof Identity_Driver)) {
-        throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
-                                   get_class($this), "Identity_Driver");
-      }
-
-      Kohana::log("debug", "Identity Library initialized");
+  public function __construct() {
+    $name = $config = module::get_var("gallery", "identity_provider", "user");
+
+    // Test the config group name
+    if (($this->config = Kohana::config("identity.".$config)) === NULL) {
+      throw new Exception("@todo NO USER LIBRARY CONFIGURATION FOR: $name");
+    }
+
+    // Set driver name
+    $driver = "Identity_".ucfirst($this->config["driver"])."_Driver";
+
+    // Load the driver
+    if ( ! Kohana::auto_load($driver)) {
+      throw new Kohana_Exception("core.driver_not_found", $this->config["driver"],
+                                 get_class($this));
     }
+
+    // Initialize the driver
+    $this->driver = new $driver($this->config["params"]);
+
+    // Validate the driver
+    if ( !($this->driver instanceof Identity_Driver)) {
+      throw new Kohana_Exception("core.driver_implements", $this->config["driver"],
+                                 get_class($this), "Identity_Driver");
+    }
+
+    Kohana::log("debug", "Identity Library initialized");
   }
 
   /**
diff --git a/modules/user/config/identity.php b/modules/user/config/identity.php
new file mode 100644
index 00000000..f9f013aa
--- /dev/null
+++ b/modules/user/config/identity.php
@@ -0,0 +1,37 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+/*
+ * @package  Identity
+ *
+ * User settings, defined as arrays, or "groups". If no group name is
+ * used when loading the cache library, the group named "default" will be used.
+ *
+ * Each group can be used independently, and multiple groups can be used at once.
+ *
+ * Group Options:
+ *  driver        - User backend driver. Gallery comes with Gallery user driver.
+ *  allow_updates - Flag to indicate that the back end allows updates.
+ *  params        - Driver parameters, specific to each driver.
+ */
+$config["user"] = array (
+  "driver"        => "gallery",
+  "allow_updates" => true,
+  "params"        => array(),
+);
-- 
cgit v1.2.3


From baca223e1d5a5d495b41b0232d2528a776bbc49c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 4 Nov 2009 08:24:15 -0800
Subject: Address the inconsistency between Add Photos and Server Add so that
 neither replace spaces in the filename

Fixes ticket #853
---
 modules/gallery/config/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/config')

diff --git a/modules/gallery/config/upload.php b/modules/gallery/config/upload.php
index 897ecacf..69ea7768 100644
--- a/modules/gallery/config/upload.php
+++ b/modules/gallery/config/upload.php
@@ -33,4 +33,4 @@ $config['create_directories'] = FALSE;
 /**
  * Remove spaces from uploaded filenames.
  */
-$config['remove_spaces'] = TRUE;
\ No newline at end of file
+$config['remove_spaces'] = FALSE;
\ No newline at end of file
-- 
cgit v1.2.3