RFC/SGL_UserRefactoring: Session_and_DA_UserWithout_Dataobject.diff

lib/SGL/Session.php

@@ -143 +143 @@
-
-        //  if user id is passed in constructor, ie, during login, init user
-        if ($uid > 0) {
-
-
-
+
+
-            $this->_init($sessUser);
-
-        //  if session doesn't exist, initialise

modules/user/classes/DA_User.php

@@ -38 +38 @@
-// +---------------------------------------------------------------------------+
-// $Id: DA_User.php,v 1.14 2005/06/21 23:26:24 demian Exp $
-
-require_once 'DB/DataObject.php';
-
-//  role sync constants
-define('SGL_ROLESYNC_ADD',              1);
-define('SGL_ROLESYNC_REMOVE',           2);
@@ -102 +100 @@
-        $ok = $oUser->insert();
-
-        if (!$ok) {
- DataObject
+
-        }
-        //  assign permissions associated with role user belongs to
-        //  first get all perms associated with user's role
@@ -214 +212 @@
-     * @param integer   $id optional user id
-     * @return object   A DataObjects user object
-     */
-
-
-
+
-        if (!is_null($id)) {
-
+
+
+
-        }
-        return $oUser;
-    }
@@ -1107 +1105 @@
-    function isUniqueUsername($username)
-    {
-        if (isset($username)) {
-
-
-
-
-
+
+
+
-            return (boolean)$numRows == 0;
-        }
-    }
@@ -1126 +1122 @@
-    function isUniqueEmail($email)
-    {
-        if (isset($email)) {
-
-
-
-
-
+
+
+
-            return (boolean)$numRows == 0;
-
+ else {return false;}
-    }
-
-    /**
@@ -1158 +1152 @@
-
-    //OrgPreferenceMgr::_updateAll
-}
+
+class User {
+    var $usr_id           = 0;
+    var $organisation_id  = 0;
+    var $role_id          = 0;  
+    var $username         = '';
+    var $passwd           = '';
+    var $first_name       = '';
+    var $last_name        = '';
+    var $teleph           = '';
+    var $mobile           = '';
+    var $email            = '';
+    var $addr_1           = '';
+    var $addr_2           = '';
+    var $addr_3           = '';
+    var $city             = '';
+    var $region           = '';
+    var $country          = '';
+    var $post_code        = '';
+    var $is_email_public  = 0;
+    var $is_acct_active   = 0;
+    var $security_questio = '';
+    var $security_answer  = '';
+    var $date_created     = '0000-00-00';
+    var $created_by       = 0;
+    var $last_updated     = '0000-00-00';
+    var $updated_by      = '';
+    
+    function User($id = false) {
+        $this->dbh = & SGL_DB::singleton();
+        $c = &SGL_Config::singleton();
+        $this->conf = $c->getAll();
+        
+        if($id) {
+            $aDbobject = $this->dbh->getAssoc("SELECT * FROM {$this->conf['table']['user']} WHERE usr_id = $id");
+            foreach (get_object_vars($aDbobject[$id]) as $prop => $val) {
+                $this->$prop = $val;
+            }
+            unset($dbobject);
+        }
+    }
+    
+    function setFrom($obj) {
+        foreach (get_object_vars($obj) as $prop => $val) {
+            $this->$prop = $val;
+        }
+    }
+    
+    function update() {
+        $ok = $this->dbh->query("
+            UPDATE {$this->conf['table']['user']}
+            SET
+            organisation_id  = $this->organisation_id,
+            role_id          = $this->role_id,
+            username         = '$this->username',
+            passwd           = '$this->passwd',
+            first_name       = '$this->first_name',
+            last_name        = '$this->last_name',
+            telephone        = '$this->teleph',
+            mobile           = '$this->mobile',
+            email            = '$this->email',
+            addr_1           = '$this->addr_1',
+            addr_2           = '$this->addr_2',
+            addr_3           = '$this->addr_3',
+            city             = '$this->city',
+            region           = '$this->region',
+            country          = '$this->country',
+            post_code        = '$this->post_code',
+            is_email_public  = '$this->is_email_public',
+            is_acct_active   = '$this->is_acct_active',
+            security_question= '$this->security_question',
+            security_answer  = '$this->security_answer',
+            date_created     = '$this->date_created',
+            created_by       = '$this->created_by',
+            last_updated     = '$this->last_updated',
+            updated_by       = '$this->updated_by'
+            WHERE 
+                usr_id   =   $this->usr_id
+                
+        ");
+    }
+    function insert() {
+        $ok = $this->dbh->query("
+            INSERT INTO {$this->conf['table']['user']}
+            VALUES (
+                $this->usr_id           ,
+                $this->organisation_id  ,
+                $this->role_id          ,
+                '$this->username     ,
+                '$this->passwd',
+                '$this->first_name',
+                '$this->last_name',
+                '$this->telephone',
+                '$this->mobile',
+                '$this->email',
+                '$this->addr_1',
+                '$this->addr_2',
+                '$this->addr_3',
+                '$this->city',
+                '$this->region',
+                '$this->country',
+                '$this->post_code',
+                '$this->is_email_public',
+                '$this->is_acct_active',
+                '$this->security_question',
+                '$this->security_answer',
+                '$this->date_created',
+                '$this->created_by',
+                '$this->last_updated',
+                '$this->updated_by'
+                
+            );
+        ");
+        if(PEAR::isError($ok)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
-?>