From 577fca417a44f55db611bfb2545a93f613f899c9 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 18 Feb 2014 12:12:13 -0600
Subject: [PATCH] fetch: Consider all delivered-to headers
---
include/class.mailfetch.php | 3 ++-
include/class.mailparse.php | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 82991a012..efddf6404 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -292,7 +292,8 @@ class MailFetcher {
//Add delivered-to address to list.
if (stripos($header['header'], 'delivered-to:') !==false
- && ($dt = Mail_Parse::findHeaderEntry($header['header'], 'delivered-to'))) {
+ && ($dt = Mail_Parse::findHeaderEntry($header['header'],
+ 'delivered-to', true))) {
if (($delivered_to = Mail_Parse::parseAddressList($dt)))
$tolist['delivered-to'] = $delivered_to;
}
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 12d1b2428..26c3b1ea4 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -140,9 +140,9 @@ class Mail_Parse {
}
/* static */
- function findHeaderEntry($headers, $name) {
+ function findHeaderEntry($headers, $name, $allEntries=false) {
if (!is_array($headers))
- $headers = self::splitHeaders($headers);
+ $headers = self::splitHeaders($headers, $allEntries);
foreach ($headers as $key=>$val)
if (strcasecmp($key, $name) === 0)
return $val;
--
GitLab