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

Resolve #799 due to wrong implementation of RFC 8474

Browse source
This commit is contained in:
the-djmaze 2022-12-27 10:11:54 +01:00
parent c522daf866
commit 3f2d193bf6
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -131,11 +131,12 @@ class Message implements \JsonSerializable
$oFetchResponse->GetFetchValue(FetchType::INTERNALDATE)
);
$oMessage->sEmailId = $oFetchResponse->GetFetchValue(FetchType::EMAILID)
// ?: $oFetchResponse->GetFetchValue('X-GUID')
?: $oFetchResponse->GetFetchValue('X-GM-MSGID');
$oMessage->sThreadId = $oFetchResponse->GetFetchValue(FetchType::THREADID)
?: $oFetchResponse->GetFetchValue('X-GM-THRID');
// https://www.rfc-editor.org/rfc/rfc8474
$aEmailId = $oFetchResponse->GetFetchValue(FetchType::EMAILID);
$oMessage->sEmailId = $aEmailId ? $aEmailId[0] : $oFetchResponse->GetFetchValue('X-GM-MSGID');
// $oMessage->sEmailId = $oMessage->sEmailId ?: $oFetchResponse->GetFetchValue('X-GUID');
$aThreadId = $oFetchResponse->GetFetchValue(FetchType::THREADID);
$oMessage->sThreadId = $aThreadId ? $aThreadId[0] : $oFetchResponse->GetFetchValue('X-GM-THRID');
$sCharset = $oBodyStructure ? Utils::NormalizeCharset($oBodyStructure->SearchCharset()) : '';