From 89bc26210ae653020e5fdaf9696f506c169bffb6 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 6 Dec 2012 19:55:30 +0100 Subject: [files_external] removing function as it's the same in the base class - THX Robin Conflicts: apps/files_external/lib/smb.php --- apps/files_external/lib/smb.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'apps/files_external/lib/smb.php') diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 96778b0b2e1..58abcd43f5a 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -59,11 +59,6 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ } } - public function filetype($path) { - // using opendir causes the same amount of requests and caches the content of the folder in one go - return (bool)@$this->opendir($path) ? 'dir' : 'file'; - } - /** * check if a file or folder has been updated since $time * @param string $path -- cgit v1.2.3 From 392be7816261d4e7af33257b705b84d448a3bed8 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 11 Feb 2013 20:32:44 +0100 Subject: the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still ..... --- apps/files_external/lib/smb.php | 1 + 1 file changed, 1 insertion(+) (limited to 'apps/files_external/lib/smb.php') diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 58abcd43f5a..e1070116642 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -45,6 +45,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ if (substr($path, -1)=='/') { $path=substr($path, 0, -1); } + $path = rawurlencode($path); return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path; } -- cgit v1.2.3 From 0c1174770d29d9d4ccf526d2180b27db65067625 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Mon, 11 Feb 2013 21:25:29 +0100 Subject: use urlencode not rawurlencode --- apps/files_external/lib/smb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files_external/lib/smb.php') diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index e1070116642..e17ce1168dc 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -45,7 +45,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ if (substr($path, -1)=='/') { $path=substr($path, 0, -1); } - $path = rawurlencode($path); + $path = urlencode($path); return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path; } -- cgit v1.2.3