3 files changed, 27 insertions, 46 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 1702fb87..e65b6c96 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -28,7 +28,7 @@ class group_Core {
    * Create a new group.
    *
    * @param string  $name
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   static function create($name) {
     $group = ORM::factory("group")->where("name", $name)->find();
@@ -38,14 +38,13 @@ class group_Core {
 
     $group->name = $name;
     $group->save();
-
     return $group;
   }
 
   /**
    * The group of all possible visitors.  This includes the guest user.
    *
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   static function everybody() {
     return model_cache::get("group", 1);
@@ -54,37 +53,37 @@ class group_Core {
   /**
    * The group of all logged-in visitors.  This does not include guest users.
    *
-   * @return Group_Model
+   * @return Group_Definition the group object
    */
   static function registered_users() {
     return model_cache::get("group", 2);
   }
 
   /**
-   * Look up a user by id.
+   * Look up a group by id.
    * @param integer      $id the user id
-   * @return User_Model  the user object, or null if the id was invalid.
+   * @return Group_Definition  the group object, or null if the id was invalid.
    */
   static function lookup($id) {
-    return self::_lookup_group_by_field("id", $id);
+    return self::_lookup_by_field("id", $id);
   }
 
   /**
    * Look up a group by name.
    * @param integer      $id the group name
-   * @return Group_Model  the group object, or null if the name was invalid.
+   * @return Group_Definition  the group object, or null if the name was invalid.
    */
   static function lookup_by_name($name) {
-    return self::_lookup_group_by_field("name", $name);
+    return self::_lookup_by_field("name", $name);
   }
 
   /**
-   * Look up a user by field value.
-   * @param string      search field
-   * @param string      search value
-   * @return Group_Model  the user object, or null if the name was invalid.
+   * 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.
    */
-  private static function _lookup_group_by_field($field_name, $value) {
+  private function _lookup_by_field($field_name, $value) {
     try {
       $user = model_cache::get("group", $value, $field_name);
       if ($user->loaded) {
@@ -97,24 +96,4 @@ class group_Core {
     }
     return null;
   }
-
-  /**
-   * List the users
-   * @param mixed      filters (@see Database.php
-   * @return array     the group list.
-   */
-  static function get_group_list($filter=array()) {
-    $group = ORM::factory("group");
-
-    foreach($filter as $method => $args) {
-      switch ($method) {
-      case "in":
-        $group->in($args[0], $args[1]);
-        break;
-      default:
-        $group->$method($args);
-      }
-    }
-    return $group->find_all();
-  }
 }
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 78b009eb..a4a6e5da 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,11 +20,17 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $menu->add_after("appearance_menu",
-                     Menu::factory("link")
-                     ->id("users_groups")
-                     ->label(t("Users/Groups"))
-                     ->url(url::site("admin/users")));
+    $user_group_menu = Menu::factory("link")
+      ->id("users_groups")
+      ->label(t("Users/Groups"))
+      ->url(url::site("admin/users"));
+    $identity_menu = $menu->get("identity_menu");
+    if (empty($identity_menu)) {
+      $menu->add_after("appearance_menu", $user_group_menu);
+    }else {
+      $identity_menu->append($user_group_menu);
+    }
+
     return $menu;
   }
 }
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 8ef4f13d..520f580c 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -71,8 +71,7 @@ class user_installer {
     $admin->save();
 
     // Let the admin own everything
-    $db->update("items", array("owner_id" => $admin->id), array("owner_id" => "IS NULL"));
-    module::set_version("user", 1);
+    $db->query("update {items} set owner_id = {$admin->id}");
 
     $root = ORM::factory("item", 1);
     access::allow($everybody, "view", $root);
@@ -80,6 +79,8 @@ 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);
   }
 
   static function uninstall() {
@@ -92,11 +93,6 @@ class user_installer {
       $group->delete();
     }
 
-    try {
-      Session::instance()->destroy();
-    } catch (Exception $e) {
-      // We don't care if there was a problem destroying the session.
-    }
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS {users};");
     $db->query("DROP TABLE IF EXISTS {groups};");