00

Author: francescobianco

bootstrap.php

@@ -879,6 +879,10 @@ function imap_fetch_overview($imap, $sequence, $flags = 0)
 if (!function_exists('imap2_fetch_overview')) {
     function imap2_fetch_overview($imap, $sequence, $flags = 0)
     {
+        if (IMAP2_RETROFIT_MODE && is_resource($imap) && get_resource_type($imap) == 'imap') {
+           return imap_fetch_overview($imap, $sequence, $flags);
+        }
+
         return Message::fetchOverview($imap, $sequence, $flags);
     }
 }

src/Functions.php

@@ -76,4 +76,23 @@ public static function getMailboxName($mailbox)
 
         return empty($mailboxParts[1]) ? 'INBOX' : $mailboxParts[1];
     }
+
+    /**
+     *
+     * @param $address
+     * @param $defaultHost
+     *
+     * @return string
+     */
+    public static function sanitizeAddress($address, $defaultHost = 'localhost')
+    {
+        $addressList = imap_rfc822_parse_adrlist($address, $defaultHost);
+
+        $sanitizedAddress = [];
+        foreach ($addressList as $addressEntry) {
+            $sanitizedAddress[] = imap_rfc822_write_address($addressEntry->mailbox, $addressEntry->host, $addressEntry->personal);
+        }
+
+        return implode(', ', $sanitizedAddress);
+    }
 }

src/HeaderInfo.php

@@ -26,13 +26,13 @@ public static function fromMessage($message, $defaultHost)
             'subject' => $message->subject,
             'Subject' => $message->subject,
             'message_id' => $message->envelope[9],
-            'toaddress' => self::sanitizeAddress($message->to, $defaultHost),
+            'toaddress' => Functions::sanitizeAddress($message->to, $defaultHost),
             'to' => self::parseAddressList($message->to, $defaultHost),
-            'fromaddress' => self::sanitizeAddress($message->from, $defaultHost),
+            'fromaddress' => Functions::sanitizeAddress($message->from, $defaultHost),
             'from' => self::parseAddressList($message->from, $defaultHost),
-            'reply_toaddress' => self::sanitizeAddress($replyTo, $defaultHost),
+            'reply_toaddress' => Functions::sanitizeAddress($replyTo, $defaultHost),
             'reply_to' => self::parseAddressList($replyTo, $defaultHost),
-            'senderaddress' => self::sanitizeAddress($message->from, $defaultHost),
+            'senderaddress' => Functions::sanitizeAddress($message->from, $defaultHost),
             'sender' => self::parseAddressList($message->from, $defaultHost),
             'Recent' => ' ',
             'Unseen' => ' ',
@@ -68,17 +68,5 @@ protected static function parseAddressList($address, $defaultHost)
 
         return $customAddressList;
     }
-
-    public static function sanitizeAddress($address, $defaultHost)
-    {
-        $addressList = imap_rfc822_parse_adrlist($address, $defaultHost);
-
-        $sanitizedAddress = [];
-        foreach ($addressList as $addressEntry) {
-            $sanitizedAddress[] = imap_rfc822_write_address($addressEntry->mailbox, $addressEntry->host, $addressEntry->personal);
-        }
-
-        return implode(', ', $sanitizedAddress);
-    }
 }
 

src/Message.php

@@ -251,7 +251,7 @@ public static function fetchOverview($imap, $sequence, $flags = 0)
                 #die();
                 $messageEntry = (object) [
                     'subject' => $message->get('subject'),
-                    'from' => $message->get('from'),
+                    'from' => Functions::sanitizeAddress($message->get('from')),
                     'to' => $message->get('to'),
                     'date' => $message->envelope[0],
                     'message_id' => $message->envelope[9],