Fix domain separator. User decide to use / or \

pydio · Oct 15, 2014 · b8fd0cb · b8fd0cb
1 parent 7991771
commit b8fd0cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/plugins/access.smb/class.smbAccessWrapper.php b/core/src/plugins/access.smb/class.smbAccessWrapper.php
@@ -55,7 +55,7 @@ protected static function initPath($path, $streamType, $storeOpenContext = false
             $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
             $credentials = "$login:$pass@";
             $domain = $repoObject->getOption("DOMAIN");
-            if($domain != "") $credentials = $domain."/".$credentials;
+            if($domain != "") $credentials = $domain.$credentials;
         }
         $basePath = $repoObject->getOption("PATH");
         $fullPath = "smb://".$credentials.$host."/";//.$basePath."/".$path;

diff --git a/core/src/plugins/access.smb/manifest.xml b/core/src/plugins/access.smb/manifest.xml
@@ -8,7 +8,7 @@
 	<server_settings>
 		<param name="HOST" type="string" label="CONF_MESSAGE[Host]" description="CONF_MESSAGE[Server IP or name, do not use add slashes or backward slashes]" mandatory="true" default="SERVER_IP"/>
 		<param name="PATH" type="string" label="CONF_MESSAGE[Uri]" description="CONF_MESSAGE[Path to the share and complementary URI if necessary]" mandatory="false"/>
-		<param name="DOMAIN" type="string" label="CONF_MESSAGE[Domain]" description="CONF_MESSAGE[Default domain to use with session credentials]" mandatory="false"/>
+		<param name="DOMAIN" type="string" label="CONF_MESSAGE[Domain]" description="CONF_MESSAGE[Default domain to use with session credentials. The domain name ends with '/' or '\' depend on your system. Example: MyDomain\ or YourDomain/]" mandatory="false"/>
 		<param name="CHMOD_VALUE" type="string" label="CONF_MESSAGE[File Creation Mask]" description="CONF_MESSAGE[Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc.]" default="0666"/>
         <global_param name="SMBCLIENT" type="string" label="CONF_MESSAGE[Smbclient]" description="CONF_MESSAGE[Path to smbclient executable, considered to be in the path by default.]" mandatory="true" default="smbclient"/>
         <global_param name="SMB_PATH_TMP" type="string" label="CONF_MESSAGE[Path Tmp]" description="CONF_MESSAGE[OS Path Temporary if not the default one]" mandatory="true" default="/tmp"/>