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

Displaying format=flowed e-mails (#276)

Browse source
This commit is contained in:
RainLoop Team 2015-05-08 02:30:03 +04:00
parent 7a9ff78051
commit f63edfa7cc
5 changed files with 61 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -751,8 +751,8 @@ class Message
$sCharset = \MailSo\Base\Enumerations\Charset::UTF_8;
}
$sHtmlParts = array();
$sPlainParts = array();
$aHtmlParts = array();
$aPlainParts = array();
foreach ($aTextParts as $oPart)
{
@ -782,22 +782,27 @@ class Message
if ('text/html' === $oPart->ContentType())
{
$sHtmlParts[] = $sText;
$aHtmlParts[] = $sText;
}
else
{
$sPlainParts[] = $sText;
if ($oPart->IsFlowedFormat())
{
$sText = \MailSo\Base\Utils::DecodeFlowedFormat($sText);
}
$aPlainParts[] = $sText;
}
}
}
if (0 < \count($sHtmlParts))
if (0 < \count($aHtmlParts))
{
$this->sHtml = \implode('<br />', $sHtmlParts);
$this->sHtml = \implode('<br />', $aHtmlParts);
}
else
{
$this->sPlain = \trim(\implode("\n", $sPlainParts));
$this->sPlain = \trim(\implode("\n", $aPlainParts));
}
$aMatch = array();
@ -813,7 +818,7 @@ class Message
$this->bPgpEncrypted = true;
}
unset($sHtmlParts, $sPlainParts, $aMatch);
unset($aHtmlParts, $aPlainParts, $aMatch);
}
// if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) &&