Fix case sensitivity

pydio · Aug 26, 2013 · 7f1dbb9 · 7f1dbb9
1 parent 5239828
commit 7f1dbb9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 94 deletions.
diff --git a/core/src/data/files/AjaXplorer-QuickStart.txt b/core/src/data/files/AjaXplorer-QuickStart.txt
diff --git a/core/src/plugins/auth.multi/class.multiAuthDriver.php b/core/src/plugins/auth.multi/class.multiAuthDriver.php
@@ -60,7 +60,7 @@ public function init($options){
 				throw new Exception("Cannot find plugin $name for type 'auth'");
 			}
 			$instance->init($options);
-            if($this->masterSlaveMode && $name != $this->getOption("MASTER_DRIVER")){
+            if($name != $this->getOption("MASTER_DRIVER")){
                 $this->slaveName = $name;
             }
 			$this->drivers[$name] = $instance;
@@ -223,11 +223,11 @@ function listUsers($baseGroup="/"){
             return array_merge($masterUsers, $slaveUsers);
         }
 		if($this->getCurrentDriver()){
-			return $this->getCurrentDriver()->listUsers($baseGroup);
+//			return $this->getCurrentDriver()->listUsers($baseGroup);
 		}
 		$allUsers = array();
 		foreach($this->drivers as $driver){
-			$allUsers = array_merge($driver->listUsers($baseGroup));
+			$allUsers = array_merge($allUsers, $driver->listUsers($baseGroup));
 		}
 		return $allUsers;
 	}

diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -278,7 +278,9 @@ abstract function deleteBinary($context, $ID);
 	 * @return AbstractAjxpUser
 	 */
 	function createUserObject($userId){
-		$abstractUser = $this->instantiateAbstractUserImpl($userId);
+        $userId = AuthService::filterUserSensitivity($userId);
+
+        $abstractUser = $this->instantiateAbstractUserImpl($userId);
 		if(!$abstractUser->storageExists()){
 			AuthService::updateDefaultRights($abstractUser);
 		}