[Gforge-commits] gforge/common/include Group.class, 1.66, 1.67 System.class, 1.1, 1.2 User.class, 1.36, 1.37

[cbayle]

Update of /cvsroot/gforge/gforge/common/include
In directory db.perdue.net:/tmp/cvs-serv22961/common/include

Modified Files:
        Group.class System.class User.class 
Log Message:
Code cleanup in Group.class which is now much simpler
Some functions are done in the proper class (System or User)


Index: Group.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/include/Group.class,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- Group.class 3 Nov 2004 00:16:22 -0000       1.66
+++ Group.class 12 Dec 2004 16:30:35 -0000      1.67
@@ -1313,29 +1313,12 @@
                                //
                                //      user was not already a member
                                //
-                               //      if no unix account, give them a unix_uid
+                               //      check and create if user doesn't exists
                                //
-                               if ( !db_result($res_newuser,0,'unix_uid') ) {
-                                       
$user=&user_get_object($user_id,$res_newuser);
-                                       if (!$user->setUpUnixUID()) {
-                                               $this->setError('ERROR: Cannot 
assign UNIX uid to the user: '.$user->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
-                                       if (!$SYS->sys_create_user($user_id)) {
-                                               
$this->setError($SYS->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
-                               } else {
-                                       //
-                                       //      User already had unix account
-                                       //
-                                       if 
(!$SYS->sys_check_create_user($user_id)) {
-                                               
$this->setError($SYS->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
+                               if (!$SYS->sys_check_create_user($user_id)) {
+                                       
$this->setError($SYS->getErrorMessage());
+                                       db_rollback();
+                                       return false;
                                }
                                //
                                //      Create this user's row in the 
user_group table
@@ -1414,43 +1397,35 @@
                                        db_rollback();
                                        return false;
                                }
-
                        } else {
                                //
                                //  user was already a member
-                               //  make sure they are set up with a unix_uid,
-                               //  LDAP entry and membership
+                               //  make sure they are set up 
                                //
                                $user=&user_get_object($user_id,$res_newuser);
-                               if (!$user->setUpUnixUID()) {
-                                       $this->setError('ERROR: Cannot assign 
UNIX uid to the user: '.$user->getErrorMessage());
+                               $user->fetchData($user->getID());
+                               if (!$SYS->sys_check_create_user($user_id)) {
+                                       
$this->setError($SYS->getErrorMessage());
                                        db_rollback();
                                        return false;
-                               } else {
-                                       $user->fetchData($user->getID());
-                                       if 
(!$SYS->sys_check_create_user($user_id)) {
-                                               
$this->setError($SYS->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
-                                       $role = new Role($this,$role_id);
-                                       if (!$role || !is_object($role)) {
-                                               $this->setError('Error Getting 
Role Object');
-                                               db_rollback();
-                                               return false;
-                                       } elseif ($role->isError()) {
-                                               
$this->setError('addUser::roleget::'.$role->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
-                                       if (!$role->setUser($user_id)) {
-                                               
$this->setError('addUser::role::setUser'.$role->getErrorMessage());
-                                               db_rollback();
-                                               return false;
-                                       }
-                                       db_commit();
-                                       return true;
                                }
+                               $role = new Role($this,$role_id);
+                               if (!$role || !is_object($role)) {
+                                       $this->setError('Error Getting Role 
Object');
+                                       db_rollback();
+                                       return false;
+                               } elseif ($role->isError()) {
+                                       
$this->setError('addUser::roleget::'.$role->getErrorMessage());
+                                       db_rollback();
+                                       return false;
+                               }
+                               if (!$role->setUser($user_id)) {
+                                       
$this->setError('addUser::role::setUser'.$role->getErrorMessage());
+                                       db_rollback();
+                                       return false;
+                               }
+                               db_commit();
+                               return true;
                        }
                } else {
                        //

Index: System.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/include/System.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- System.class        9 May 2004 18:15:37 -0000       1.1
+++ System.class        12 Dec 2004 16:30:36 -0000      1.2
@@ -90,8 +90,9 @@
                $user = &user_get_object($user_id);
                if (!$user) {
                        return false;
+               } else {
+                       return $user->setUpUnixUID();
                }
-               return true;
        }
 
        /**
@@ -102,7 +103,7 @@
        *
        */
        function sys_check_create_user($user_id) {
-               return true;
+               return $this->sys_create_user($user_id);
        }
 
        /**

Index: User.class
===================================================================
RCS file: /cvsroot/gforge/gforge/common/include/User.class,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- User.class  21 Sep 2004 15:53:13 -0000      1.36
+++ User.class  12 Dec 2004 16:30:36 -0000      1.37
@@ -571,10 +571,6 @@
        function setUnixStatus($status) {
                global $Language,$SYS;
                db_begin();
-               if ($status != 'N') {
-                       $this->setUpUnixUID () ;
-               }
-
                $res=db_query("
                        UPDATE users 
                        SET unix_status='$status'