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

Add a Message-ID header if none is set in Util\Emailer 

- Address anti-spam detection rule
This commit is contained in:
Hypolite Petovan 2023-08-14 17:17:25 -04:00
parent 07cdc1fc97
commit 735835193d
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 * @return bool
* @throws InternalServerErrorException * @throws InternalServerErrorException
*/ */
public function send(IEmail $email) public function send(IEmail $email): bool
{ {
Hook::callAll('emailer_send_prepare', $email); Hook::callAll('emailer_send_prepare', $email);
@ -161,8 +161,13 @@ class Emailer
. rand(100000000, 999999999) . '=:' . rand(100000000, 999999999) . '=:'
. rand(10000, 99999); . 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 // generate a multipart/alternative message header
$messageHeader = $email->getAdditionalMailHeaderString() . $messageHeader .=
"From: $fromName <{$fromAddress}>\r\n" . "From: $fromName <{$fromAddress}>\r\n" .
"Reply-To: $fromName <{$replyTo}>\r\n" . "Reply-To: $fromName <{$replyTo}>\r\n" .
"MIME-Version: 1.0\r\n" . "MIME-Version: 1.0\r\n" .