Changeset 285 for Dev/branches/jos-branch/server/classes/models/Respondent.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/Respondent.php (modified) (7 diffs)

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

@@ -16 +16 @@
 
         public $email;
-        public $password;
+        public $passwordHash;
+        public $passwordSalt;
 
         /**
@@ -24 +25 @@
          * @param type password
          */
-        public function __construct($uid = null, $email = null, $password = null)
+        public function __construct($uid = null, $email = null, $passwordHash = null, $passwordSalt = null)
         {
         if(!isset($uid))
@@ -33 +34 @@
         $this->uid = $uid;
         $this->email = $email;
-        $this->password = $password;
+        $this->passwordHash = $passwordHash;
+        $this->passwordSalt = $passwordSalt;
         }
     /**
@@ -64 +66 @@
         $model->add(new Statement($resourceRespondent,$predicateName,$literalRespondentName));                  
 
-        $literalPassword = new Literal($this->password);
-        $predicatePassword = new Resource(PASSWORD);
-        $model->add(new Statement($resourceRespondent,$predicatePassword,$literalPassword));
+        $literalPasswordHash = new Literal($this->passwordHash);
+        $predicatePasswordHash = new Resource(PASSWORDHASH);
+        $model->add(new Statement($resourceRespondent,$predicatePasswordHash,$literalPasswordHash));
+        
+        $literalPasswordSalt = new Literal($this->passwordSalt);
+        $predicatePasswordSalt = new Resource(PASSWORDSALT);
+        $model->add(new Statement($resourceRespondent,$predicatePasswordSalt,$literalPasswordSalt));
+        
                 $model->saveAs(Respondent::$filename, 'rdf');
                 return true;
@@ -85 +92 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT ?uid, ?email, ?password
+            SELECT ?uid, ?email, ?passwordHash, ?passwordSalt
             WHERE       
             {
@@ -91 +98 @@
                                         predicates:uid ?uid ;
                                         predicates:email ?email ;
-                                        predicates:password ?password ;
+                                        predicates:passwordHash ?passwordHash ;
+                                        predicates:passwordSalt ?passwordSalt ;
                                         ' . ResearchToolObject::createArguments($arguments) .  '
             }';
@@ -102 +110 @@
             foreach($results as $result)
             { 
-                    $respondents[] = new Respondent($result['?uid']->label, $result['?email']->label, $result['?password']->label);
+                    $respondents[] = new Respondent($result['?uid']->label, $result['?email']->label, $result['?passwordHash']->label, $result['?passwordSalt']->label);
             }
         }
         return $respondents;
         }
+
+    public static function create($obj) {
+        return new Respondent($obj->uid, $obj->email, $obj->passwordHash, $obj->passwordSalt);
+    }
+
 }
 
-        
-
-
-
+?>