diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-03-18 19:42:04 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-03-18 19:42:04 +0000 |
| commit | 340cd2734b883a4089551c98e4cdfa6ec6b7a017 (patch) | |
| tree | 64e93b32271e7065d19654ce1c75453cb0e5daed | |
| parent | f6c3667efa32d0fa24307b3acc3a239081bf6410 (diff) | |
| parent | 792d0d3314f13123bb136131a791c121bd9ef4e7 (diff) | |
| download | nextcloud-server-340cd2734b883a4089551c98e4cdfa6ec6b7a017.tar.gz nextcloud-server-340cd2734b883a4089551c98e4cdfa6ec6b7a017.zip | |
Merge pull request #7766 from Xenopathic/master
Fix smb4php to work with home shares
| -rw-r--r-- | apps/files_external/3rdparty/smb4php/smb.php | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php index 622942b052a..656930514f0 100644 --- a/apps/files_external/3rdparty/smb4php/smb.php +++ b/apps/files_external/3rdparty/smb4php/smb.php @@ -20,6 +20,7 @@ # GNU General Public License for more details. # # Addition 17/12/2012 Frank Karlitschek (frank@owncloud.org) +# Addition 17/03/2014 Robin McCorkell (rmccorkell@karoshi.org.uk) # On the official website http://www.phpclasses.org/smb4php the # license is listed as LGPL so we assume that this is # dual-licensed GPL/LGPL @@ -238,17 +239,10 @@ class smb { trigger_error ("url_stat(): list failed for host '{$pu['host']}'", E_USER_WARNING); break; case 'share': - if ($o = smb::look ($pu)) { - $found = FALSE; - $lshare = strtolower ($pu['share']); # fix by Eric Leung - foreach ($o['disk'] as $s) if ($lshare == strtolower($s)) { - $found = TRUE; - $stat = stat ("/tmp"); - break; - } - if (! $found) - trigger_error ("url_stat(): disk resource '{$lshare}' not found in '{$pu['host']}'", E_USER_WARNING); - } + if (smb::execute("ls", $pu)) + $stat = stat ("/tmp"); + else + trigger_error ("url_stat(): disk resource '{$pu['share']}' not found in '{$pu['host']}'", E_USER_WARNING); break; case 'path': if ($o = smb::execute ('dir "'.$pu['path'].'"', $pu)) { |