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

* Mail: Fix save button in image view mode (expose) does not work for mails attachments

Browse Source
This commit is contained in:
Hadi Nategh 2016-08-30 11:27:13 +02:00
parent 440815a9c6
commit ce331ff3d2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2135,7 +2135,9 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$attachmentHTML[$key]['mail_id'] = $rowID; $attachmentHTML[$key]['mail_id'] = $rowID;
$attachmentHTML[$key]['winmailFlag']=$value['is_winmail']; $attachmentHTML[$key]['winmailFlag']=$value['is_winmail'];
$attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "mail_DisplayNone"; $attachmentHTML[$key]['classSaveAllPossiblyDisabled'] = "mail_DisplayNone";
// reset mode array as it should be considered differently for
// each attachment
$mode = array();
switch(strtoupper($value['mimeType'])) switch(strtoupper($value['mimeType']))
{ {
case 'MESSAGE/RFC822': case 'MESSAGE/RFC822':
@ -2154,6 +2156,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
case 'IMAGE/PNG': case 'IMAGE/PNG':
case 'IMAGE/GIF': case 'IMAGE/GIF':
case 'IMAGE/BMP': case 'IMAGE/BMP':
// set mode for media mimetypes because we need
// to structure a download url to be used maybe in expose.
$mode = array(
'mode' => 'save'
);
case 'APPLICATION/PDF': case 'APPLICATION/PDF':
case 'TEXT/PLAIN': case 'TEXT/PLAIN':
case 'TEXT/HTML': case 'TEXT/HTML':
@ -2172,14 +2179,14 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
case 'TEXT/VCARD': case 'TEXT/VCARD':
case 'TEXT/CALENDAR': case 'TEXT/CALENDAR':
case 'TEXT/X-VCALENDAR': case 'TEXT/X-VCALENDAR':
$linkData = array $linkData = array_merge(array
( (
'menuaction' => 'mail.mail_ui.getAttachment', 'menuaction' => 'mail.mail_ui.getAttachment',
'id' => $rowID, 'id' => $rowID,
'part' => $value['partID'], 'part' => $value['partID'],
'is_winmail' => $value['is_winmail'], 'is_winmail' => $value['is_winmail'],
'mailbox' => base64_encode($mailbox), 'mailbox' => base64_encode($mailbox),
); ) , $mode);
$windowName = 'displayAttachment_'. $uid; $windowName = 'displayAttachment_'. $uid;
$reg = '800x600'; $reg = '800x600';
// handle calendar/vcard // handle calendar/vcard