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

Bugfix: application/pgp-encrypted attachments not listed

Browse source
This commit is contained in:
the-djmaze 2024-08-30 00:39:00 +02:00
parent ed7a2bd239
commit 366ca05200
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,9 +172,10 @@ class BodyStructure implements \JsonSerializable
);
}
public function IsAttachment() : bool
protected function IsAttachment(/*BodyStructure*/ $oParent) : bool
{
return 'application/pgp-encrypted' !== $this->sContentType
// return 'application/pgp-encrypted' !== $this->sContentType
return (!$oParent || !$oParent->isPgpEncrypted())
&& (
'attachment' === $this->sDisposition || (
!\str_starts_with($this->sContentType, 'multipart/')
@ -194,8 +195,8 @@ class BodyStructure implements \JsonSerializable
{
$aParts = [];
$gParts = $this->SearchByCallback(function ($oItem) {
return $oItem->isText() && !$oItem->IsAttachment();
$gParts = $this->SearchByCallback(function ($oItem, $oParent) {
return $oItem->isText() && !$oItem->IsAttachment($oParent);
});
foreach ($gParts as $oPart) {
$aParts[] = $oPart;
@ -232,13 +233,13 @@ class BodyStructure implements \JsonSerializable
public function SearchCharset() : string
{
$gParts = $this->SearchByCallback(function ($oPart) {
return $oPart->Charset() && $oPart->isText() && !$oPart->IsAttachment();
$gParts = $this->SearchByCallback(function ($oPart, $oParent) {
return $oPart->Charset() && $oPart->isText() && !$oPart->IsAttachment($oParent);
});
if (!$gParts->valid()) {
$gParts = $this->SearchByCallback(function ($oPart) {
return $oPart->Charset() && $oPart->IsAttachment();
$gParts = $this->SearchByCallback(function ($oPart, $oParent) {
return $oPart->Charset() && $oPart->IsAttachment($oParent);
});
}
@ -259,7 +260,7 @@ class BodyStructure implements \JsonSerializable
{
return $this->SearchByCallback(function ($oItem, $oParent) {
// return $oItem->IsAttachment();
return $oItem->IsAttachment() && (!$oParent || !$oParent->isPgpEncrypted());
return $oItem->IsAttachment($oParent) && (!$oParent || !$oParent->isPgpEncrypted());
});
}