Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add plain part to HTML message (fix MIME_HTML_ONLY) (fixed #69)

Browse source
This commit is contained in:
RainLoop Team 2014-02-08 03:46:41 +04:00
parent 93e09effba
commit 012bea8938
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -3859,17 +3859,17 @@ class Actions
$oMessage->SetBcc($oBccEmails); $oMessage->SetBcc($oBccEmails);
} }
if ($bWithDraftInfo && is_array($aDraftInfo) && !empty($aDraftInfo[0]) && !empty($aDraftInfo[1]) && !empty($aDraftInfo[2])) if ($bWithDraftInfo && \is_array($aDraftInfo) && !empty($aDraftInfo[0]) && !empty($aDraftInfo[1]) && !empty($aDraftInfo[2]))
{ {
$oMessage->SetDraftInfo($aDraftInfo[0], $aDraftInfo[1], $aDraftInfo[2]); $oMessage->SetDraftInfo($aDraftInfo[0], $aDraftInfo[1], $aDraftInfo[2]);
} }
if (0 < strlen($sInReplyTo)) if (0 < \strlen($sInReplyTo))
{ {
$oMessage->SetInReplyTo($sInReplyTo); $oMessage->SetInReplyTo($sInReplyTo);
} }
if (0 < strlen($sReferences)) if (0 < \strlen($sReferences))
{ {
$oMessage->SetReferences($sReferences); $oMessage->SetReferences($sReferences);
} }
@ -3881,13 +3881,19 @@ class Actions
$sTextToAdd = $bTextIsHtml ? $sTextToAdd = $bTextIsHtml ?
\MailSo\Base\HtmlUtils::BuildHtml($sText, $aFoundedCids, $mFoundDataURL, $aFoundedContentLocationUrls) : $sText; \MailSo\Base\HtmlUtils::BuildHtml($sText, $aFoundedCids, $mFoundDataURL, $aFoundedContentLocationUrls) : $sText;
$this->Plugins()->RunHook( $this->Plugins()->RunHook($bTextIsHtml ? 'filter.message-html' : 'filter.message-plain',
$bTextIsHtml ? 'filter.message-html' : 'filter.message-plain',
array($oAccount, &$oMessage, &$sTextToAdd)); array($oAccount, &$oMessage, &$sTextToAdd));
if ($bTextIsHtml && 0 < \strlen($sTextToAdd))
{
$sTextConverted = \MailSo\Base\HtmlUtils::ConvertHtmlToPlain($sTextToAdd);
$this->Plugins()->RunHook('filter.message-plain', array($oAccount, &$oMessage, &$sTextConverted));
$oMessage->AddText($sTextConverted, false);
}
$oMessage->AddText($sTextToAdd, $bTextIsHtml); $oMessage->AddText($sTextToAdd, $bTextIsHtml);
if (is_array($aAttachments)) if (\is_array($aAttachments))
{ {
foreach ($aAttachments as $sTempName => $aData) foreach ($aAttachments as $sTempName => $aData)
{ {