the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 23:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve #190

Browse source
This commit is contained in:
the-djmaze 2022-01-28 16:43:50 +01:00
parent f8da8b5135
commit 58d02fa2e7
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
View file

@ -218,27 +218,30 @@ class BodyStructure
public function GetHtmlAndPlainParts() : array
{
$aParts = $this->SearchByCallback(function ($oItem) {
$aParts = [];
$gParts = $this->SearchByCallback(function ($oItem) {
return ('text/html' === $oItem->sContentType || 'text/plain' === $oItem->sContentType)
&& !$oItem->IsAttachBodyPart();
});
if ($aParts->valid()) {
return \array_merge([$aParts->current()], \iterator_to_array($aParts));
foreach ($gParts as $oPart) {
$aParts[] = $oPart;
}
/**
* No text found, is it encrypted?
* If so, just return that.
*/
if (!$aParts) {
$gEncryptedParts = $this->SearchByContentType('multipart/encrypted');
foreach ($gEncryptedParts as $oPart) {
if ($oPart->IsPgpEncrypted() && $oPart->SubParts()[1]->IsInline()) {
return array($oPart->SubParts()[1]);
}
}
}
return [];
return $aParts;
}
public function SearchCharset() : string