diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-03-17 15:03:25 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-03-17 15:03:25 +0000 |
| commit | 792d0d3314f13123bb136131a791c121bd9ef4e7 (patch) | |
| tree | 485df5e396e88e942f08e441ee531574e19d419c /apps/files_external/3rdparty | |
| parent | 6fbf3dd7c4e64a68d2b8a0a2c24a1b92de7868b1 (diff) | |
| download | nextcloud-server-792d0d3314f13123bb136131a791c121bd9ef4e7.tar.gz nextcloud-server-792d0d3314f13123bb136131a791c121bd9ef4e7.zip | |
Fix smb4php to work with home shares
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
Diffstat (limited to 'apps/files_external/3rdparty')
| -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)) { |