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

fix problem regarding display / visualization of .ics attachments

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-10 13:24:08 +00:00
parent db262997fb
commit 4e3e03e446
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/inc/class.mail_ui.inc.php
View File

@ -2388,9 +2388,10 @@ unset($query['actions']);
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
$GLOBALS['egw']->session->commit_session(); $GLOBALS['egw']->session->commit_session();
//error_log(__METHOD__.print_r($_GET,true));
if ($_GET['mode'] != "save") if ($_GET['mode'] != "save")
{ {
if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY') if (strtoupper($attachment['type']) == 'TEXT/DIRECTORY' || empty($attachment['type']))
{ {
$sfxMimeType = $attachment['type']; $sfxMimeType = $attachment['type'];
$buff = explode('.',$attachment['filename']); $buff = explode('.',$attachment['filename']);
@ -2450,10 +2451,12 @@ unset($query['actions']);
//Import failed, download content anyway //Import failed, download content anyway
} }
} }
header ("Content-Type: ".$attachment['type']."; name=\"". $attachment['filename'] ."\""); //error_log(__METHOD__.__LINE__.'->'.array2string($attachment));
$filename = ($attachment['filename']?$attachment['filename']:$mailbox.'_uid'.$uid.'_part'.$part);
header ("Content-Type: ".$attachment['type']."; name=\"". $filename ."\"");
if($_GET['mode'] == "save") { if($_GET['mode'] == "save") {
// ask for download // ask for download
header ("Content-Disposition: attachment; filename=\"". $attachment['filename'] ."\""); header ("Content-Disposition: attachment; filename=\"". $filename ."\"");
} else { } else {
// display it // display it
header ("Content-Disposition: inline; filename=\"". $attachment['filename'] ."\""); header ("Content-Disposition: inline; filename=\"". $attachment['filename'] ."\"");