Merge pull request #3 from srdjanmarjanovic/impromevent/parsers-and-c…

…leaners-improved Recognize Outlook for Mac. Strip signature on Outlook for Mac
activecollab · Dec 16, 2015 · 0cb4ea9 · 0cb4ea9
2 parents 1ec1220 + ca4f8b2
commit 0cb4ea9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/ActiveCollab/EmailReplyExtractor.php b/src/ActiveCollab/EmailReplyExtractor.php
@@ -95,8 +95,11 @@ public static function detectMailer(array $headers)
         } else if (strpos($headers['x-mailer'], 'Apple Mail') !== false) {
           return self::APPLE_MAIL;
         }
+      } else if (isset($headers['user-agent'])) {
+        if (strpos($headers['user-agent'], 'Microsoft-MacOutlook') !== false) {
+          return self::OUTLOOK;
+        }
       } else if (isset($headers['message-id'])) {
-
         if (strpos($headers['message-id'], '@mail.gmail.com') !== false) {
           return self::GOOGLE_MAIL;
         } else if (strpos($headers['message-id'], '@smtp.hushmail.com')) {
@@ -115,6 +118,7 @@ public static function detectMailer(array $headers)
       } else if (isset($headers['mime-version']) && strpos($headers['mime-version'], 'Apple Message framework') !== false) {
         return self::APPLE_MAIL;
       }
+
       return self::GENERIC;
     }
 
@@ -127,8 +131,9 @@ private static function getHeadersRelevantForMailerDetectionEml(Parser &$parser)
       return self::filterHeaders([
         'x-mailer' => $parser->getHeader('x-mailer'),
         'message-id' => $parser->getHeader('message-id'),
-        'Received' => $parser->getHeader('received'),
-        'Mime-Version' => $parser->getHeader('mime-version'),
+        'received' => $parser->getHeader('received'),
+        'mime-version' => $parser->getHeader('mime-version'),
+        'user-agent' => $parser->getHeader('user-agent'),
       ]);
     }
 
@@ -141,8 +146,9 @@ private static function getHeadersRelevantForMailerDetection(array $headers)
       return self::filterHeaders([
         'x-mailer' => $headers['x-mailer'],
         'message-id' => $headers['message_id'],
-        'Received' => $headers['Received'],
-        'Mime-Version' => $headers['Mime-Version'],
+        'received' => $headers['Received'],
+        'mime-version' => $headers['Mime-Version'],
+        'user-agent' => $headers['User-Agent'],
       ]);
     }
 

diff --git a/src/ActiveCollab/EmailReplyExtractor/Extractor/OutlookExtractor.php b/src/ActiveCollab/EmailReplyExtractor/Extractor/OutlookExtractor.php
@@ -6,12 +6,6 @@
    */
   final class OutlookExtractor extends Extractor
   {
-    public function processLines()
-    {
-      parent::processLines();
-      self::stripSignature();
-    }
-
     /**
      * Overrides Extractor::stripSignature()
      */
@@ -46,4 +40,15 @@ protected function getOriginalMessageSplitters()
       ]);
     }
 
+    /**
+     * Strip default Outlook for Mac signature
+     * @param  string $html
+     * @return string
+     */
+    static function toPlainText($html)
+    {
+      $html = preg_replace('/<div id="MAC_OUTLOOK_SIGNATURE".+<\/div>/','', $html);
+      return parent::toPlainText($html);
+    }
+
   }