Fix auth.multi updateUserObject call in user-choice mode.

pydio · Aug 27, 2013 · 7dd5683 · 7dd5683
1 parent 7fab74a
commit 7dd5683
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core/src/plugins/auth.multi/class.multiAuthDriver.php b/core/src/plugins/auth.multi/class.multiAuthDriver.php
@@ -234,9 +234,17 @@ function listUsers($baseGroup="/"){
 
     function updateUserObject(&$userObject){
         $s = $this->getAuthScheme($userObject->getId());
-        if(isSet($this->drivers[$s])){
+        $test = $this->extractRealId($userObject->getId());
+        if($test != $userObject->getId()) {
+            $restore = $userObject->getId();
+            $userObject->setId($test);
+        }
+        if(!empty($s) && isSet($this->drivers[$s])){
             $this->drivers[$s]->updateUserObject($userObject);
+        }else if(!empty($this->currentDriver) && isSet($this->drivers[$this->currentDriver])){
+            $this->drivers[$this->currentDriver]->updateUserObject($userObject);
         }
+        if(isSet($restore)) $userObject->setId($restore);
     }
 
     /**

diff --git a/core/src/plugins/core.conf/class.AbstractAjxpUser.php b/core/src/plugins/core.conf/class.AbstractAjxpUser.php
@@ -106,6 +106,9 @@ function getId(){
 		return $this->id;
 	}
 
+    function setId($id){
+        $this->id = $id ;
+    }
     /**
      * @return bool
      */