Merge pull request #694 from greezybacon/issue/message-id-bugs

Fixup for the message-id tracking feature

Reviewed-By: Peter Rotich <peter@osticket.com>

include/api.tickets.php

@@ -20,7 +20,8 @@ class TicketApiController extends ApiController {
 
         if(!strcasecmp($format, 'email'))
             $supported = array_merge($supported, array('header', 'mid',
-                'emailId', 'ticketId', 'reply-to', 'reply-to-name'));
+                'emailId', 'ticketId', 'reply-to', 'reply-to-name',
+                'in-reply-to', 'references'));
 
         return $supported;
     }
@@ -115,7 +116,7 @@ class TicketApiController extends ApiController {
 
         if (($thread = ThreadEntry::lookupByEmailHeaders($data))
                 && $thread->postEmail($data)) {
-            return true;
+            return $thread->getTicket();
         }
         return $this->createTicket($data);
     }

include/class.mailparse.php

@@ -264,6 +264,8 @@ class Mail_Parse {
     }
 
     function parseAddressList($address){
+        if (!$address)
+            return false;
         return Mail_RFC822::parseAddressList($address, null, null,false);
     }
 
@@ -341,6 +343,9 @@ class EmailDataParser {
         $data['priorityId'] = $parser->getPriority();
         $data['emailId'] = $emailId;
 
+        $data['in-reply-to'] = $parser->struct->headers['in-reply-to'];
+        $data['references'] = $parser->struct->headers['references'];
+
         if ($replyto = $parser->getReplyTo()) {
             $replyto = $replyto[0];
             $data['reply-to'] = $replyto->mailbox.'@'.$replyto->host;