diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-20 16:55:18 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-20 16:55:18 +0100 |
| commit | 0624476aa19a63b1f4e35f35e151c3fc46cb697f (patch) | |
| tree | 67e9ead3bfd44e7efe3f4a6d1325866075dbd702 /lib/private/files.php | |
| parent | f33d35cd073addb08c78a65b719c72eb5424434a (diff) | |
| parent | ec45a3c0e2567c89729bc6fe8c996b7939025429 (diff) | |
| download | nextcloud-server-0624476aa19a63b1f4e35f35e151c3fc46cb697f.tar.gz nextcloud-server-0624476aa19a63b1f4e35f35e151c3fc46cb697f.zip | |
Merge branch 'master' into mimeicons-svg
Diffstat (limited to 'lib/private/files.php')
| -rw-r--r-- | lib/private/files.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/private/files.php b/lib/private/files.php index 6a6916537d4..656d6f044ca 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -106,7 +106,12 @@ class OC_Files { if ($xsendfile) { $filename = OC_Helper::moveToNoClean($filename); } - $name = $files . '.zip'; + // downloading root ? + if ($files === '') { + $name = 'download.zip'; + } else { + $name = $files . '.zip'; + } set_time_limit($executionTime); } else { $zip = false; @@ -208,6 +213,8 @@ class OC_Files { $dirname=basename($dir); $zip->addEmptyDir($internalDir.$dirname); $internalDir.=$dirname.='/'; + // prevent absolute dirs + $internalDir = ltrim($internalDir, '/'); $files=OC_Files::getDirectoryContent($dir); foreach($files as $file) { $filename=$file['name']; |