diff options
author | Björn Schießle <schiessle@owncloud.com> | 2012-10-24 10:04:19 +0200 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2012-10-24 10:06:00 +0200 |
commit | 070fe02448ca0c6c1cc9104c5dc47814b9dd05d5 (patch) | |
tree | ec11e0e7d0bfd50f4d55b890c74022450d9e3907 /apps/files_sharing/public.php | |
parent | a7eb56c799499a76fdc49c1a1dc971bb6dfea72e (diff) | |
download | nextcloud-server-070fe02448ca0c6c1cc9104c5dc47814b9dd05d5.tar.gz nextcloud-server-070fe02448ca0c6c1cc9104c5dc47814b9dd05d5.zip |
calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem.
Diffstat (limited to 'apps/files_sharing/public.php')
-rw-r--r-- | apps/files_sharing/public.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 59385dd6868..ba3338febd7 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -24,12 +24,18 @@ if (isset($_GET['token'])) { if (isset($_GET['file']) || isset($_GET['dir'])) { if (isset($_GET['dir'])) { $type = 'folder'; - $path = OC_Filesystem::normalizePath($_GET['dir']); + $path = $_GET['dir'];
+ if(strlen($path)>1 and substr($path,-1,1)==='/') {
+ $path=substr($path,0,-1);
+ } $baseDir = $path; $dir = $baseDir; } else { $type = 'file'; - $path = OC_Filesystem::normalizePath($_GET['file']); + $path = $_GET['dir'];
+ if(strlen($path)>1 and substr($path,-1,1)==='/') {
+ $path=substr($path,0,-1);
+ } } $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1); if (OCP\User::userExists($uidOwner)) { |