diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-12-10 12:05:39 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-12-10 12:42:26 +0100 |
| commit | 409b5108896edda9adf916cd566dbce2d2b00351 (patch) | |
| tree | aaa25fd8a1ae7365a6df19df60b4f27f4086df4c /apps/files/download.php | |
| parent | bc3650e48c7ec4f05794c2bd98a90cca3090f1e3 (diff) | |
| download | nextcloud-server-409b5108896edda9adf916cd566dbce2d2b00351.tar.gz nextcloud-server-409b5108896edda9adf916cd566dbce2d2b00351.zip | |
Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
Diffstat (limited to 'apps/files/download.php')
| -rw-r--r-- | apps/files/download.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/files/download.php b/apps/files/download.php index e3fe24e45d7..6b055e99a53 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -37,12 +37,7 @@ if(!\OC\Files\Filesystem::file_exists($filename)) { $ftype=\OC\Files\Filesystem::getMimeType( $filename ); header('Content-Type:'.$ftype); -if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) { - header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' ); -} else { - header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) ) - . '; filename="' . rawurlencode( basename($filename) ) . '"' ); -} +OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); OCP\Response::disableCaching(); header('Content-Length: '.\OC\Files\Filesystem::filesize($filename)); |