00

Author: francescobianco

src/Functions.php

@@ -84,7 +84,7 @@ public static function getMailboxName($mailbox)
      *
      * @return string
      */
-    public static function sanitizeAddress($address, $defaultHost = 'localhost')
+    public static function sanitizeAddress($address, $defaultHost = 'UNKNOWN')
     {
         $addressList = imap_rfc822_parse_adrlist($address, $defaultHost);
 
@@ -95,4 +95,17 @@ public static function sanitizeAddress($address, $defaultHost = 'localhost')
 
         return implode(', ', $sanitizedAddress);
     }
+
+    /**
+     *
+     */
+    public static function writeAddressFromEnvelope($addressList)
+    {
+        $sanitizedAddress = [];
+        foreach ($addressList as $addressEntry) {
+            $sanitizedAddress[] = imap_rfc822_write_address($addressEntry[2], $addressEntry[3], $addressEntry[0]);
+        }
+
+        return implode(', ', $sanitizedAddress);
+    }
 }

src/HeaderInfo.php

@@ -18,30 +18,38 @@ public static function fromMessage($message, $defaultHost)
     {
         file_put_contents('t3.json', json_encode($message, JSON_PRETTY_PRINT));
 
-        $replyTo = $message->replyto ?: $message->from;
+        $to = Functions::writeAddressFromEnvelope($message->envelope[5]);
+        $from = Functions::writeAddressFromEnvelope($message->envelope[2]);
+        $sender = Functions::writeAddressFromEnvelope($message->envelope[3]);
+
+        if (empty($message->replyto)) {
+            $replyTo = $from;
+        } else {
+            $replyTo = Functions::writeAddressFromEnvelope($message->envelope[4]);
+        }
 
         return (object) [
             'date' => $message->date,
             'Date' => $message->date,
-            'subject' => $message->subject,
-            'Subject' => $message->subject,
+            'subject' => $message->envelope[1],
+            'Subject' => $message->envelope[1],
             'message_id' => $message->envelope[9],
-            'toaddress' => Functions::sanitizeAddress($message->to, $defaultHost),
-            'to' => self::parseAddressList($message->to, $defaultHost),
-            'fromaddress' => Functions::sanitizeAddress($message->from, $defaultHost),
-            'from' => self::parseAddressList($message->from, $defaultHost),
-            'reply_toaddress' => Functions::sanitizeAddress($replyTo, $defaultHost),
+            'toaddress' => $to,
+            'to' => self::parseAddressList($to, $defaultHost),
+            'fromaddress' => $from,
+            'from' => self::parseAddressList($from, $defaultHost),
+            'reply_toaddress' => $replyTo,
             'reply_to' => self::parseAddressList($replyTo, $defaultHost),
-            'senderaddress' => Functions::sanitizeAddress($message->from, $defaultHost),
-            'sender' => self::parseAddressList($message->from, $defaultHost),
+            'senderaddress' => $sender,
+            'sender' => self::parseAddressList($sender, $defaultHost),
             'Recent' => ' ',
             'Unseen' => ' ',
             'Flagged' => ' ',
             'Answered' => ' ',
             'Deleted' => ' ',
             'Draft' => ' ',
             'Msgno' => str_pad($message->id, 4, ' ', STR_PAD_LEFT),
-            'MailDate' => $message->internaldate,
+            'MailDate' => self::sanitizeMailDate($message->internaldate),
             'Size' => strval($message->size),
             'udate' => strtotime($message->internaldate)
         ];
@@ -68,5 +76,14 @@ protected static function parseAddressList($address, $defaultHost)
 
         return $customAddressList;
     }
+
+    public static function sanitizeMailDate($mailDate)
+    {
+        if ($mailDate[0] == '0') {
+            $mailDate = ' '.substr($mailDate, 1);
+        }
+
+        return $mailDate;
+    }
 }
 

tests/CompatibilityTest.php

@@ -467,7 +467,7 @@ public function testHeaderInfo()
             #file_put_contents('t1.json', json_encode($headerInfo1, JSON_PRETTY_PRINT));
             #file_put_contents('t2.json', json_encode($headerInfo2, JSON_PRETTY_PRINT));
             #die();
-            $this->assertEquals($headerInfo1, $headerInfo2);
+            $this->assertEquals($headerInfo1, $headerInfo2, 'Problem with $messageNum = '.$messageNum);
         }
 
         imap_close($imap1);