From e9dda94a1eb9b2e19cfdbf1fc3719b375ef4b468 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Wed, 15 May 2019 11:24:46 -0500
Subject: [PATCH] Reformat Incorrect Reply-To Headers
In the event that we receive an email where the reply-to header is formatted with the name being an unquoted email, we should correct the name by inserting the quotes.
Incorrect Format:
adriane@enhancesoft.com <adriane@enhancesoft.com>
Correct Format:
"adriane@enhancesoft.com" <adriane@enhancesoft.com>
---
include/class.mailfetch.php | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 38ec03f9b..43f7aaa36 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -671,6 +671,18 @@ class MailFetcher {
// attachment. Download the body and pass it along to the mail
// parsing engine.
$info = Mail_Parse::splitHeaders($mailinfo['header']);
+
+ //make sure reply-to headers are correctly formatted
+ if ($mailinfo['reply-to'] && !Validator::is_email($mailinfo['reply-to']) && $info['Reply-To']) {
+ $replyto = Mail_Parse::parseAddressList($info['Reply-To']);
+ if ($replyto[0]) {
+ $mailinfo['reply-to'] = sprintf('%s@%s', $replyto[0]->mailbox, $replyto[0]->host);
+ $mailinfo['reply-to-name'] = $replyto[0]->personal;
+ } else {
+ $mailinfo['reply-to'] = null;
+ }
+ }
+
if (strtolower($info['Content-Type']) == 'message/rfc822') {
if ($wrapped = $this->getPart($mid, 'message/rfc822')) {
require_once INCLUDE_DIR.'api.tickets.php';
--
GitLab