Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/auth.smb/class.smbAuthDriver.php

@@ -72,7 +72,7 @@ public function checkPassword($login, $pass, $seed)
         if(!empty($domain)){
             $login = $domain.$login;
         }
-        $strTmp = "$login:$pass@".$host."/".$basePath."/".$smbPath."/";
+        $strTmp = "$login:$pass@".$host."/".$basePath."/";
         $strTmp = str_replace("//", "/",$strTmp);
         $url = "smb://".$strTmp;
         try {

core/src/plugins/core.conf/class.AbstractConfDriver.php

@@ -724,7 +724,7 @@ public function switchAction($action, $httpVars, $fileVars)
                     if($original_id != $data["new_user_id"]){
                         throw new Exception(str_replace("%s", $data["new_user_id"], $mess["ajxp_conf.127"]));
                     }
-                    if (AuthService::userExists($data["new_user_id"])) {
+                    if (AuthService::userExists($data["new_user_id"],"w")) {
                         throw new Exception($mess["ajxp_conf.43"]);
                     }
                     $loggedUser = AuthService::getLoggedUser();