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

supply mailbox param for get_mailcontent

Browse Source
This commit is contained in:
Klaus Leithoff 2014-10-16 15:19:26 +00:00
parent 46fc241138
commit 43c015694c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -5296,7 +5296,7 @@ class emailadmin_imapbase
} }
} }
//error_log(array2string($bodyParts)); //error_log(array2string($bodyParts));
$attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid):array(); $attachments = $includeAttachments?$mailClass->getMessageAttachments($uid,$partid,null,true,false,true,$mailbox):array();
if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO']; if ($mailClass->isSentFolder($mailbox)) $mailaddress = $headers['TO'];
elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM']; elseif (isset($headers['FROM'])) $mailaddress = $headers['FROM'];
@ -5320,7 +5320,7 @@ class emailadmin_imapbase
//_debug_array($mailClass->getMessageHeader($uid, $attachment['partID'])); //_debug_array($mailClass->getMessageHeader($uid, $attachment['partID']));
//_debug_array($mailClass->getMessageBody($uid,'', $attachment['partID'])); //_debug_array($mailClass->getMessageBody($uid,'', $attachment['partID']));
//_debug_array($mailClass->getMessageAttachments($uid, $attachment['partID'])); //_debug_array($mailClass->getMessageAttachments($uid, $attachment['partID']));
$mailcontent = self::get_mailcontent($mailClass,$uid,$attachment['partID']); $mailcontent = self::get_mailcontent($mailClass,$uid,$attachment['partID'],$mailbox);
$headdata =''; $headdata ='';
if ($mailcontent['headers']) if ($mailcontent['headers'])
{ {