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

fix for failed bulk-download of attachments; bo functions for retrieving mail attachments (and header info for subject) NEED the folder information

Browse Source
This commit is contained in:
Klaus Leithoff 2014-07-08 10:20:19 +00:00
parent 3d79bae09a
commit 5b1ed6a756
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2133,7 +2133,7 @@ class mail_ui
$rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox); $rawheaders = $this->mail_bo->getMessageRawHeader($uid, $partID,$mailbox);
$fetchEmbeddedImages = false; $fetchEmbeddedImages = false;
if ($htmlOptions !='always_display') $fetchEmbeddedImages = true; if ($htmlOptions !='always_display') $fetchEmbeddedImages = true;
$attachments = $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages); $attachments = $this->mail_bo->getMessageAttachments($uid, $partID, null, $fetchEmbeddedImages,true,true,$mailbox);
//_debug_array($headers); //_debug_array($headers);
//error_log(__METHOD__.__LINE__.array2string($attachments)); //error_log(__METHOD__.__LINE__.array2string($attachments));
$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox); $attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
@ -2832,6 +2832,7 @@ class mail_ui
*/ */
function download_zip($message_id) function download_zip($message_id)
{ {
//error_log(__METHOD__.__LINE__.$message_id);
// First, get all attachment IDs // First, get all attachment IDs
if(!is_numeric($message_id)) if(!is_numeric($message_id))
{ {
@ -2844,10 +2845,10 @@ class mail_ui
$mailbox = $this->mail_bo->sessionData['mailbox']; $mailbox = $this->mail_bo->sessionData['mailbox'];
} }
$attachments = $this->mail_bo->getMessageAttachments($message_id); $attachments = $this->mail_bo->getMessageAttachments($message_id,null, null, false, 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); $header = $this->mail_bo->getMessageHeader($message_id,'',true,false,$mailbox);
$temp_path = egw_vfs::get_home_dir() . "/.mail_$message_id"; $temp_path = egw_vfs::get_home_dir() . "/.mail_$message_id";
if(egw_vfs::is_dir($temp_path)) egw_vfs::remove ($temp_path); if(egw_vfs::is_dir($temp_path)) egw_vfs::remove ($temp_path);