1 files changed, 71 insertions, 5 deletions

diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 1410f1ef..36c617a8 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -19,18 +19,84 @@
  */
 class user_installer {
   static function install() {
+    $db = Database::instance();
+    $db->query("CREATE TABLE IF NOT EXISTS {users} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` varchar(32) NOT NULL,
+                 `full_name` varchar(255) NOT NULL,
+                 `password` varchar(64) NOT NULL,
+                 `login_count` int(10) unsigned NOT NULL DEFAULT 0,
+                 `last_login` int(10) unsigned NOT NULL DEFAULT 0,
+                 `email` varchar(64) default NULL,
+                 `admin` BOOLEAN default 0,
+                 `guest` BOOLEAN default 0,
+                 `hash` char(32) default NULL,
+                 `url` varchar(255) default NULL,
+                 `locale` char(10) default NULL,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`hash`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups} (
+                 `id` int(9) NOT NULL auto_increment,
+                 `name` char(64) default NULL,
+                 `special` BOOLEAN default 0,
+                 PRIMARY KEY (`id`),
+                 UNIQUE KEY(`name`))
+               DEFAULT CHARSET=utf8;");
+
+    $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
+                 `group_id` int(9) NOT NULL,
+                 `user_id` int(9) NOT NULL,
+                 PRIMARY KEY (`group_id`, `user_id`),
+                 UNIQUE KEY(`user_id`, `group_id`))
+               DEFAULT CHARSET=utf8;");
+
+    $everybody = group::create("Everybody");
+    $everybody->special = true;
+    $everybody->save();
+
+    $registered = group::create("Registered Users");
+    $registered->special = true;
+    $registered->save();
+
+    $guest = user::create("guest", "Guest User", "");
+    $guest->guest = true;
+    $guest->remove($registered);
+    $guest->save();
+
+    $admin = user::create("admin", "Gallery Administrator", "admin");
+    $admin->admin = true;
+    $admin->save();
+
+    // Let the admin own everything
+    $db->query("update {items} set owner_id = {$admin->id}");
+
+    $root = ORM::factory("item", 1);
+    access::allow($everybody, "view", $root);
+    access::allow($everybody, "view_full", $root);
+
+    access::allow($registered, "view", $root);
+    access::allow($registered, "view_full", $root);
     user::activate();
     module::set_var("gallery", "identity_provider", "user");
     module::set_version("user", 1);
   }
 
   static function uninstall() {
-    user::deactivate();
+    // Delete all users and groups so that we give other modules an opportunity to clean up
+    foreach (ORM::factory("user")->find_all() as $user) {
+      $user->delete();
+    }
 
-    try {
-      Session::instance()->destroy();
-    } catch (Exception $e) {
-      // We don't care if there was a problem destroying the session.
+    foreach (ORM::factory("group")->find_all() as $group) {
+      $group->delete();
     }
+
+    $db = Database::instance();
+    $db->query("DROP TABLE IF EXISTS {users};");
+    $db->query("DROP TABLE IF EXISTS {groups};");
+    $db->query("DROP TABLE IF EXISTS {groups_users};");
   }
 }
\ No newline at end of file