Changeset 285 for Dev/branches/jos-branch/server/classes/models/User.php

Timestamp:

02/24/12 10:03:02 (13 years ago)

Author:

jkraaijeveld

Message:

Merge from rest-dojo-ui 272-282

File:

• Dev/branches/jos-branch/server/classes/models/User.php (modified) (7 diffs)

Dev/branches/jos-branch/server/classes/models/User.php

@@ -17 +17 @@
     
     public $email;
-    public $password;
+    public $passwordHash;
+    public $passwordSalt;
     
     /**
@@ -23 +24 @@
      * If the user does not yet exist in the database, call with null as first parameter
      */
-    public function __construct($uid = null, $email = null, $password = null) {
+    public function __construct($uid = null, $email = null, $passwordHash = null, $passwordSalt = null) {
         if(!isset($uid))
         {
@@ -30 +31 @@
         $this->uid = $uid;
                 $this->email = $email;
-        $this->password = sha1($password);
+        $this->passwordHash = $passwordHash;
+        $this->passwordSalt = $passwordSalt;
         }
 
@@ -60 +62 @@
         $model->add(new Statement($resourceUser,$predicateName,$literalUserName));                      
 
-        $literalPassword = new Literal($this->password);
-        $predicatePassword = new Resource(PASSWORD);
-                $model->add(new Statement($resourceUser,$predicatePassword,$literalPassword));
+        $literalPasswordHash = new Literal($this->passwordHash);
+        $predicatePasswordHash = new Resource(PASSWORDHASH);
+                $model->add(new Statement($resourceUser,$predicatePasswordHash,$literalPasswordHash));
+
+        $literalPasswordSalt = new Literal($this->passwordSalt);
+        $predicatePasswordSalt = new Resource(PASSWORDSALT);
+                $model->add(new Statement($resourceUser,$predicatePasswordSalt,$literalPasswordSalt));
 
                 $model->saveAs(User::$filename, 'rdf');
@@ -82 +88 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT ?uid, ?email, ?password
+            SELECT ?uid, ?email, ?passwordHash, ?passwordSalt
             WHERE       
             {
@@ -88 +94 @@
                                         predicates:uid ?uid ;
                                         predicates:email ?email ;
-                                        predicates:password ?password ;
+                                        predicates:passwordHash ?passwordHash ;
+                                        predicates:passwordSalt ?passwordSalt ;
                                         ' . ResearchToolObject::createArguments($arguments) . '
             }';
@@ -99 +106 @@
             foreach($results as $result)
             { 
-                                $users[] = new User($result['?uid']->label, $result['?email']->label, $result['?password']->label);
+                                $users[] = new User($result['?uid']->label, $result['?email']->label, $result['?passwordHash']->label, $result['?passwordSalt']->label);
             }
         }
         return $users;
         }
+
+    public static function create($obj) {
+        return new User($obj->uid, $obj->email,$obj->passwordHash,$obj->passwordSalt);
+    }
+
 }