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

Author: cdujeu

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

@@ -56,7 +56,7 @@ public function logoutCallback($actionName, $httpVars, $fileVars)
 
     public function checkPassword($login, $pass, $seed)
     {
-        require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.smb/smb.php");
+       require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.smb/smb.php");
 
         $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
         $repoId = $this->options["REPOSITORY_ID"];
@@ -66,7 +66,15 @@ public function checkPassword($login, $pass, $seed)
         $basePath = $repoObject->getOption("PATH", true);
         $basePath = str_replace("AJXP_USER", $login, $basePath);
         $host = $repoObject->getOption("HOST");
-        $url = "smb://$login:$pass@".$host."/".$basePath."/";
+        $domain = $repoObject->getOption("DOMAIN", true);
+        $smbPath = $repoObject->getOption("PATH", true);
+
+        if(!empty($domain)){
+            $login = $domain.$login;
+        }
+        $strTmp = "$login:$pass@".$host."/".$basePath."/".$smbPath."/";
+        $strTmp = str_replace("//", "/",$strTmp);
+        $url = "smb://".$strTmp;
         try {
             if (!is_dir($url)) {
                 $this->logDebug("SMB Login failure");

core/src/plugins/auth.smb/manifest.xml

@@ -6,7 +6,7 @@
         </resources>
     </client_settings>
 	<server_settings>
-		<param name="REPOSITORY_ID" type="string" label="CONF_MESSAGE[Repository]" description="CONF_MESSAGE[Id of the repository to use for testing connexion]" mandatory="true"/>
+		<param name="REPOSITORY_ID" type="select" choices="json_list:list_all_repositories_json" label="CONF_MESSAGE[Workspace]" description="CONF_MESSAGE[ID of the workspace used to validate credentials]" mandatory="true"/>
 		<param name="ADMIN_USER" type="string" label="CONF_MESSAGE[Admin user]" description="CONF_MESSAGE[The ID of an existing admin for Pydio (using conf.serial)]" mandatory="true"/>
 	</server_settings>
 	<class_definition filename="plugins/auth.smb/class.smbAuthDriver.php" classname="smbAuthDriver"/>