Changeset 2820

Timestamp:

11/17/08 04:39:47 (8 weeks ago)

Author:

rickc

Message:

We neglected to add the admin group to a new installation when we added the admin group on updates to r2264.

Files:

• trunk/htdocs/system/classes/installhandler.php (modified) (5 diffs)

trunk/htdocs/system/classes/installhandler.php

@@ -418 +418 @@
         }
 
-        // Let's setup the admin user now.
+        // Let's setup the admin user and group now.
         // But first, let's make sure that no users exist
         $all_users = Users::get_all();
         if ( count( $all_users ) < 1 ) {
-            if (! $this->create_admin_user()) {
+            $user = $this->create_admin_user();
+            if (! $user ) {
                 $this->theme->assign('form_errors', array('admin_user'=>_t('Problem creating admin user.')));
+                DB::rollback();
+                return false;
+            }
+            $admin_group = $this->create_admin_group( $user );
+            if( ! $admin_group ) {
+                $this->theme->assign('form_errors', array('admin_user'=>_t('Problem creating admin group.')));
                 DB::rollback();
                 return false;
@@ -510 +517 @@
      * Creates the administrator user from form information
      *
-     * @return  bool  Creation successful?
+     * @return  mixed. the user on success, false on failure
      */
     private function create_admin_user()
@@ -535 +542 @@
 
         // Insert the admin user
-        User::create(array (
+        $user = User::create(array (
             'username'=>$admin_username,
             'email'=>$admin_email,
@@ -541 +548 @@
         ));
 
-        return true;
+        return $user;
+    }
+
+    /**
+     * Creates the admin group using the created user
+     *
+     * @param $user User the administrative user who is installing
+     * @return  mixed  the user group on success, false on failure
+     */
+    private function create_admin_group( $user )
+    {
+        // Create the admin group
+        $group = UserGroup::create( array( 'name' => 'admin' ) );
+        if( ! $group ) {
+            return false;
+        }
+        $group->add( $user->id );
+        return $group;
     }
 
@@ -1192 +1216 @@
         }
         $admin_group->add( $ids );
-        $admin_group->update();
 
         // @TODO: Decide on a set of default admin permissions and give them to the admin group