holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix not working customized etemplates after fix with content-disposition attachment, we now only set it for urls ending with "?download", not for "?download=something"

Browse Source
This commit is contained in:
Ralf Becker 2015-04-02 10:46:53 +00:00
parent ee4997632a
commit 0127e6d07c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.vfs_webdav_server.inc.php
View File

@ -627,7 +627,9 @@ class vfs_webdav_server extends HTTP_WebDAV_Server_Filesystem
*/
function __construct()
{
if ($_SERVER['REQUEST_METHOD'] == 'GET' && ($this->force_download = strpos($_SERVER['REQUEST_URI'],'?download') !== false))
if ($_SERVER['REQUEST_METHOD'] == 'GET' && ($this->force_download = strpos($_SERVER['REQUEST_URI'],'?download') !== false &&
// do NOT send content-disposition attachment for etemplates containing ?download=$timestamp
strpos($_SERVER['REQUEST_URI'],'?download=') === false))
{
$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'],0,$this->force_download);
}