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

* Mail: fix for cascading forward problem (problem when forwarding mails with forwarded messages attached in inline mode)

Browse Source
This commit is contained in:
Klaus Leithoff 2015-11-03 13:06:47 +00:00
parent c8c4980d3e
commit bb466cd20d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2334,6 +2334,7 @@ class mail_compose
//error_log(__METHOD__.__LINE__.array2string($_formData['attachments'])); //error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
$tnfattachments = null; $tnfattachments = null;
foreach((array)$_formData['attachments'] as $attachment) { foreach((array)$_formData['attachments'] as $attachment) {
//error_log(__METHOD__.__LINE__.array2string($attachment));
if(is_array($attachment)) if(is_array($attachment))
{ {
if (!empty($attachment['uid']) && !empty($attachment['folder'])) { if (!empty($attachment['uid']) && !empty($attachment['folder'])) {
@ -2348,19 +2349,21 @@ class mail_compose
*/ */
if (!$connection_opened) if (!$connection_opened)
{ {
$mail_bo->openConnection(); $mail_bo->openConnection($mail_bo->profileID);
$connection_opened = true; $connection_opened = true;
} }
$mail_bo->reopen($attachment['folder']); $mail_bo->reopen($attachment['folder']);
switch(strtoupper($attachment['type'])) { switch(strtoupper($attachment['type'])) {
case 'MESSAGE/RFC': case 'MESSAGE/RFC':
case 'MESSAGE/RFC822': case 'MESSAGE/RFC822':
$rawHeader=''; $rawBody='';
if (isset($attachment['partID'])) { if (isset($attachment['partID'])) {
$rawHeader = $mail_bo->getMessageRawHeader($attachment['uid'], $attachment['partID'],$attachment['folder']); $eml = $mail_bo->getAttachment($attachment['uid'],$attachment['partID'],0,false,true,$attachment['folder']);
$rawBody=$eml['attachment'];
} else {
$rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
} }
$rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']); $_mailObject->addStringAttachment($rawBody, $attachment['name'], 'message/rfc822');
$_mailObject->addStringAttachment($rawHeader.$rawBody, $attachment['name'], 'message/rfc822');
break; break;
default: default:
$attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false); $attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);