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

Author: cdujeu

core/src/plugins/access.smb/class.smbAccessWrapper.php

@@ -64,7 +64,7 @@ protected static function initPath($path, $streamType, $storeOpenContext = false
             }
         }
         $basePath = $repoObject->getOption("PATH");
-        $fullPath = "smb://".$credentials.$host."/";//.$basePath."/".$path;
+        $fullPath = "smbclient://".$credentials.$host."/";//.$basePath."/".$path;
         if ($basePath!="") {
            $fullPath.=trim($basePath, "/\\" );
            }

core/src/plugins/access.smb/smb.php

@@ -412,11 +412,11 @@ public function clearstatcache ($url='')
 
     public static function cleanUrl($url)
     {
-        $url = str_replace("smb://", "smb:/__/__", $url);
+        $url = str_replace("smbclient://", "smbclient:/__/__", $url);
         while (strstr($url, "//")!==FALSE) {
             $url = str_replace("//", "/", $url);
         }
-        $url = str_replace("smb:/__/__", "smb://", $url);
+        $url = str_replace("smbclient:/__/__", "smbclient://", $url);
         return $url;
     }
 
@@ -481,8 +481,8 @@ public function smbparseUrl ($url)
     {
         $pass = $_SESSION["AJXP_SESSION_REMOTE_PASS"];
         //$pass = $pass["password"];
-        $pu['scheme'] = 'smb';
-        $temp = substr($url, 6);
+        $pu['scheme'] = 'smbclient';
+        $temp = substr($url, 12);
         //echo $temp . "\n";
         $pu['user'] = "";
         if (strstr($temp, ":") !== false) {
@@ -772,5 +772,5 @@ function ConvSmbParameterToWinOs($params)
 # Register 'smb' protocol !
 ###################################################################
 
-stream_wrapper_register('smb', 'smb_stream_wrapper')
+stream_wrapper_register('smbclient', 'smb_stream_wrapper')
     or die ('Failed to register protocol');