extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle message/rfc822 attachments as display when opened from drafted message; properly restore message/rfc822 attachments stored with .eml files

Browse Source
This commit is contained in:
Klaus Leithoff 2014-07-11 13:49:27 +00:00
parent 772ebe6a41
commit a0d6257d1e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,10 +455,10 @@ class mail_ui
//$content[self::$nm_index]['path'] = self::get_home_dir(); //$content[self::$nm_index]['path'] = self::get_home_dir();
} }
} }
else if ($content['mailPreview']['mailPreviewHeadersAttachments']['previewAttachmentArea'][0]['save_zip']) // else if ($content['mailPreview']['mailPreviewHeadersAttachments']['previewAttachmentArea'][0]['save_zip'])
{ // {
$this->download_zip(current($content[self::$nm_index]['selected'])); // $this->download_zip(current($content[self::$nm_index]['selected']));
} // }
//$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,'.($toSchema?'toaddress':'fromaddress').',date,size'; // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns //$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,'.($toSchema?'toaddress':'fromaddress').',date,size'; // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size'; // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns $content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size'; // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
$content[self::$nm_index]['csv_fields'] = false; $content[self::$nm_index]['csv_fields'] = false;
@ -2100,10 +2100,10 @@ class mail_ui
$rowID = $_requesteddata['id']; $rowID = $_requesteddata['id'];
//unset($_REQUEST); //unset($_REQUEST);
} }
if($_requesteddata['mail_displayattachments'][0]['save_zip']) // if($_requesteddata['mail_displayattachments'][0]['save_zip'])
{ // {
$this->download_zip($_requesteddata['mail_id']); // $this->download_zip($_requesteddata['mail_id']);
} // }
$preventRedirect=false; $preventRedirect=false;
if(isset($_GET['id'])) $rowID = $_GET['id']; if(isset($_GET['id'])) $rowID = $_GET['id'];
if(isset($_GET['part'])) $partID = $_GET['part']; if(isset($_GET['part'])) $partID = $_GET['part'];
@ -2279,6 +2279,7 @@ class mail_ui
$linkData = array $linkData = array
( (
'menuaction' => 'mail.mail_ui.displayMessage', 'menuaction' => 'mail.mail_ui.displayMessage',
//'mode' => 'display', //message/rfc822 attachments should be opened in display mode
'id' => $rowID, 'id' => $rowID,
'part' => $value['partID'], 'part' => $value['partID'],
'is_winmail' => $value['is_winmail'] 'is_winmail' => $value['is_winmail']

1
mail/js/app.js
View File

@ -2012,6 +2012,7 @@ app.classes.mail = AppJS.extend(
{ {
case 'MESSAGE/RFC822': case 'MESSAGE/RFC822':
url += 'menuaction=mail.mail_ui.displayMessage'; // todo compose for Draft folder url += 'menuaction=mail.mail_ui.displayMessage'; // todo compose for Draft folder
url += '&mode=display';//message/rfc822 attachments should be opened in display mode
url += '&id='+mailid; url += '&id='+mailid;
url += '&part='+attgrid.partID; url += '&part='+attgrid.partID;
url += '&is_winmail='+attgrid.winmailFlag; url += '&is_winmail='+attgrid.winmailFlag;