composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7925 Fix incorrectly formatted In-Reply-To email header

Browse Source
This commit is contained in:
Stephen Abello
2024-11-04 14:38:31 +01:00
parent 58e964fb8c
commit 9371bc6d7b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/email.class.inc.php
View File

@@ -145,7 +145,7 @@ class EMail implements iEMail
*/ */
public function SetInReplyTo(string $sMessageId) public function SetInReplyTo(string $sMessageId)
{ {
$this->AddToHeader('In-Reply-To', $sMessageId); $this->oMailer->SetInReplyTo($sMessageId);
} }
public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null) public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)

7
sources/Core/Email/EmailLaminas.php
View File

@@ -8,6 +8,7 @@
use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory; use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory;
use Laminas\Mail\Header\ContentType; use Laminas\Mail\Header\ContentType;
use Laminas\Mail\Header\InReplyTo;
use Laminas\Mail\Header\MessageId; use Laminas\Mail\Header\MessageId;
use Laminas\Mail\Message; use Laminas\Mail\Message;
use Laminas\Mail\Protocol\Smtp\Auth\Oauth; use Laminas\Mail\Protocol\Smtp\Auth\Oauth;
@@ -355,7 +356,11 @@ class EMailLaminas extends Email
*/ */
public function SetInReplyTo(string $sMessageId) public function SetInReplyTo(string $sMessageId)
{ {
$this->AddToHeader('In-Reply-To', $sMessageId); // Note: Laminas will add the angle brackets for you
// so let's remove the angle brackets if present, for historical reasons
$sId = str_replace(array('<', '>'), '', $sMessageId);
$this->m_oMessage->getHeaders()->addHeader((new InReplyTo())->setIds([$sId]));
} }
/** /**