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

* Mail/ActiveSync: fix wrong mime-type / broken mail when AS smart-forward is used e.g. by gmail app

Browse Source
This commit is contained in:
ralf 2023-08-23 14:56:22 +02:00
parent 1ed3306ac5
commit 3897e84fcd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/inc/class.mail_zpush.inc.php
View File

@ -643,16 +643,13 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
(isset($smartdata->replacemime) && $smartdata->replacemime == false))) (isset($smartdata->replacemime) && $smartdata->replacemime == false)))
{ {
//force the default for the forwarding -> asmail //force the default for the forwarding -> asmail
if (is_array($preferencesArray)) { if (empty($preferencesArray['message_forwarding']))
if (!array_key_exists('message_forwarding',$preferencesArray) {
|| !isset($preferencesArray['message_forwarding'])
|| empty($preferencesArray['message_forwarding'])) $preferencesArray['message_forwarding'] = 'asmail';
} else {
$preferencesArray['message_forwarding'] = 'asmail'; $preferencesArray['message_forwarding'] = 'asmail';
} }
// construct the uid of the message out of the itemid - seems to be the uid, no construction needed // construct the uid of the message out of the itemid - seems to be the uid, no construction needed
$uid = $smartdata->source->itemid; $uid = $smartdata->source->itemid;
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")IMAP Smartfordward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid); ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.")IMAP Smartforward is called with FolderID:".$smartdata->source->folderid.' and ItemID:'.$smartdata->source->itemid);
$this->splitID($smartdata->source->folderid, $account, $folder); $this->splitID($smartdata->source->folderid, $account, $folder);
$this->mail->reopen($folder); $this->mail->reopen($folder);
@ -665,6 +662,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
$rawHeader = $this->mail->getMessageRawHeader($smartdata->source->itemid, '',$folder); $rawHeader = $this->mail->getMessageRawHeader($smartdata->source->itemid, '',$folder);
$rawBody = $this->mail->getMessageRawBody($smartdata->source->itemid, '',$folder); $rawBody = $this->mail->getMessageRawBody($smartdata->source->itemid, '',$folder);
$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822'); $mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
$mailObject->addHeader('Content-Type', 'multipart/mixed');
$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml; $AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain; $Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
$isforward = true; $isforward = true;