clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13346 from MrPetovan/bug/13343-add-message-id 

Add a Message-ID header if none is set in Util\Emailer
This commit is contained in:
Michael Vogel 2023-08-15 14:08:29 +02:00 committed by GitHub
parent b5f33124be 735835193d
commit 66b7253986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Util/Emailer.php
View File

@ -126,7 +126,7 @@ class Emailer
* @return bool
* @throws InternalServerErrorException
*/
public function send(IEmail $email)
public function send(IEmail $email): bool
{
Hook::callAll('emailer_send_prepare', $email);
@ -161,8 +161,13 @@ class Emailer
. rand(100000000, 999999999) . '=:'
. rand(10000, 99999);
$messageHeader = $email->getAdditionalMailHeaderString();
if ($countMessageId === 0) {
$messageHeader .= 'Message-ID: <Friendica-Util-Emailer-' . Strings::getRandomHex() . '@' . $this->baseUrl->getHost() . '>' . "\r\n";
}
// generate a multipart/alternative message header
$messageHeader = $email->getAdditionalMailHeaderString() .
$messageHeader .=
"From: $fromName <{$fromAddress}>\r\n" .
"Reply-To: $fromName <{$replyTo}>\r\n" .
"MIME-Version: 1.0\r\n" .