Merge pull request #565 from protich/feature/delivered-to+mailfetch

Add delivered-to detection to mail fetcher

Reviewed-By: Jared Hancock <jared@osticket.com>

include/class.mailfetch.php

@@ -290,10 +290,21 @@ class MailFetcher {
         if($headerinfo->cc)
             $tolist['cc'] = $headerinfo->cc;
 
+        //Add delivered-to address to list.
+        if (stripos($header['header'], 'delivered-to:') !==false
+                && ($dt = Mail_Parse::findHeaderEntry($header['header'],
+                     'delivered-to', true))) {
+            if (($delivered_to = Mail_Parse::parseAddressList($dt)))
+                $tolist['delivered-to'] = $delivered_to;
+        }
+
         $header['recipients'] = array();
         foreach($tolist as $source => $list) {
             foreach($list as $addr) {
-                if(!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
+                if (!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
+                    //Skip virtual Delivered-To addresses
+                    if ($source == 'delivered-to') continue;
+
                     $header['recipients'][] = array(
                             'source' => "Email ($source)",
                             'name' => $this->mime_decode(@$addr->personal),
@@ -304,6 +315,16 @@ class MailFetcher {
             }
         }
 
+        //See if any of the recipients is a delivered to address
+        if ($tolist['delivered-to']) {
+            foreach ($tolist['delivered-to'] as $addr) {
+                foreach ($header['recipients'] as $i => $r) {
+                    if (strcasecmp($r['email'], $addr->mailbox.'@'.$addr->host) === 0)
+                        $header['recipients'][$i]['source'] = 'delivered-to';
+                }
+            }
+        }
+
         //BCCed?
         if(!$header['emailId']) {
             if ($headerinfo->bcc) {

include/class.mailparse.php

@@ -163,9 +163,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;