extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: on save as zip: always fetch all attachments, even inline (images); do not fatally fail on empty attachments

Browse Source
This commit is contained in:
Klaus Leithoff 2014-11-06 11:42:44 +00:00
parent 2232895b39
commit 1d48bf67d5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2612,6 +2612,7 @@ class mail_ui
*/ */
function download_zip($message_id=null) function download_zip($message_id=null)
{ {
//error_log(__METHOD__.__LINE__.array2string($_GET));
// First, get all attachment IDs // First, get all attachment IDs
if(isset($_GET['id'])) $message_id = $_GET['id']; if(isset($_GET['id'])) $message_id = $_GET['id'];
//error_log(__METHOD__.__LINE__.$message_id); //error_log(__METHOD__.__LINE__.$message_id);
@ -2625,9 +2626,9 @@ class mail_ui
{ {
$mailbox = $this->mail_bo->sessionData['mailbox']; $mailbox = $this->mail_bo->sessionData['mailbox'];
} }
// always fetch all, even inline (images)
$attachments = $this->mail_bo->getMessageAttachments($message_id,null, null, false, true,true,$mailbox); $fetchEmbeddedImages = true;
$attachments = $this->mail_bo->getMessageAttachments($message_id,null, null, $fetchEmbeddedImages, true,true,$mailbox);
// put them in VFS so they can be zipped // put them in VFS so they can be zipped
$header = $this->mail_bo->getMessageHeader($message_id,'',true,false,$mailbox); $header = $this->mail_bo->getMessageHeader($message_id,'',true,false,$mailbox);
//get_home_dir may fetch the users startfolder if set; if not writeable, action will fail. TODO: use temp_dir //get_home_dir may fetch the users startfolder if set; if not writeable, action will fail. TODO: use temp_dir
@ -2648,13 +2649,14 @@ class mail_ui
foreach($attachments as $file) foreach($attachments as $file)
{ {
$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false); $attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false);
$success=true;
if (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) || if (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) ||
!fwrite($fp,$attachment['attachment'])) !fwrite($fp,$attachment['attachment']))
{ {
$success=false;
egw_framework::message("Unable to zip {$file['filename']}",'error'); egw_framework::message("Unable to zip {$file['filename']}",'error');
} }
$file_list[] = $path.$file['filename']; if (/*$attachment['attachment'] && */$success) $file_list[] = $path.$file['filename'];
if ($fp) fclose($fp); if ($fp) fclose($fp);
} }
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();