Fix strange display in authentication panel by passing smbclient as p…

…aram instead of global_param
pydio · Jul 5, 2016 · 7322ff8 · 7322ff8
1 parent 3e18f98
commit 7322ff8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/plugins/auth.smb/class.smbAuthDriver.php b/core/src/plugins/auth.smb/class.smbAuthDriver.php
@@ -61,7 +61,7 @@ public function checkPassword($login, $pass, $seed)
     {
         if(!defined('SMB4PHP_SMBCLIENT'))
         {
-            define('SMB4PHP_SMBCLIENT', $this->pluginConf["SMBCLIENT"]);
+            define('SMB4PHP_SMBCLIENT', $this->options["SMBCLIENT"]);
         }
 
         require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.smb/smb.php");

diff --git a/core/src/plugins/auth.smb/manifest.xml b/core/src/plugins/auth.smb/manifest.xml
@@ -8,7 +8,7 @@
 	<server_settings>
 		<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"/>
-        <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"/>
+        <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"/>
 	</server_settings>
 	<class_definition filename="plugins/auth.smb/class.smbAuthDriver.php" classname="smbAuthDriver"/>
 	<registry_contributions>