friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

[phpmailer] Fixes Double Message ID #1020

Merged
nupplaphil merged 2 commits from bug/9142-message-id into 2020.09-rc 2020-09-20 04:11:15 +02:00
Conversation 0 Commits 2 Files changed 2 +9 -4
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpmailer/phpmailer.php
View file

@ -90,9 +90,14 @@ function phpmailer_emailer_send_prepare(App $a, IEmail &$email)
// additional headers // additional headers
if (!empty($email->getAdditionalMailHeader())) { if (!empty($email->getAdditionalMailHeader())) {
foreach (explode("\n", trim($email->getAdditionalMailHeader())) as $header_line) { foreach ($email->getAdditionalMailHeader() as $name => $values) {
list($name, $value) = explode(':', $header_line, 2); // Set the "Message-ID" header for PHP-Mailer directly
$mailer->addCustomHeader(trim($name), trim($value)); if ($name == 'Message-Id') {
// implode all values to one entry, because there's only one value possible
$mailer->MessageID = trim(implode("", $values));
} else {
$mailer->addCustomHeader(trim($name), trim(implode("\n", $values)));
}
} }
} }

2
securemail/SecureTestEmail.php
View file

@ -54,6 +54,6 @@ class SecureTestEmail extends Email
parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'], parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'],
$subject, "<p>{$message}</p>", $message, $subject, "<p>{$message}</p>", $message,
'', local_user()); [], local_user());
} }
} }