diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-08-16 02:48:42 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-08-16 02:48:42 -0700 |
| commit | 837cefd8a3a7540b37afb42312f1397baa70c3ac (patch) | |
| tree | ba9db328963acadf8962bd8a98aa5c31ee2065ae | |
| parent | 1e8849b04eebf06a7c86675e4d96c38d8f9c95b2 (diff) | |
| parent | 05549884c6dea83669cc2947c6a901c97ed55ed0 (diff) | |
| download | nextcloud-server-837cefd8a3a7540b37afb42312f1397baa70c3ac.tar.gz nextcloud-server-837cefd8a3a7540b37afb42312f1397baa70c3ac.zip | |
Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
no files external for SMB on windows
| -rwxr-xr-x | apps/files_external/lib/config.php | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index e3a2cf0b30b..14e974d65ca 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -93,14 +93,18 @@ class OC_Mount_Config { 'root' => '&Root', 'secure' => '!Secure ftps://')); - if(OC_Mount_Config::checksmbclient()) $backends['\OC\Files\Storage\SMB']=array( - 'backend' => 'SMB / CIFS', - 'configuration' => array( - 'host' => 'URL', - 'user' => 'Username', - 'password' => '*Password', - 'share' => 'Share', - 'root' => '&Root')); + if (!OC_Util::runningOnWindows()) { + if (OC_Mount_Config::checksmbclient()) { + $backends['\OC\Files\Storage\SMB'] = array( + 'backend' => 'SMB / CIFS', + 'configuration' => array( + 'host' => 'URL', + 'user' => 'Username', + 'password' => '*Password', + 'share' => 'Share', + 'root' => '&Root')); + } + } if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\DAV']=array( 'backend' => 'ownCloud / WebDAV', @@ -444,8 +448,10 @@ class OC_Mount_Config { public static function checkDependencies() { $l= new OC_L10N('files_external'); $txt=''; - if(!OC_Mount_Config::checksmbclient()) { - $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />'; + if (!OC_Util::runningOnWindows()) { + if(!OC_Mount_Config::checksmbclient()) { + $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />'; + } } if(!OC_Mount_Config::checkphpftp()) { $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />'; |