Merge pull request #10 from srdjanmarjanovic/bug/1090-errors

Resolve headers related errors, mb_strtoupper related error

Author: ilijastuden

src/ActiveCollab/EmailReplyExtractor.php

@@ -149,11 +149,11 @@ private static function getHeadersRelevantForMailerDetectionEml(Parser &$parser)
     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'],
-        'user-agent' => $headers['User-Agent'],
+        'x-mailer' => !empty($headers['x-mailer']) ? $headers['x-mailer'] : '',
+        'message-id' => !empty($headers['message_id']) ? $headers['message_id'] : '',
+        'received' => !empty($headers['Received']) ? $headers['Received'] : '',
+        'mime-version' => !empty($headers['Mime-Version']) ? $headers['Mime-Version'] : '',
+        'user-agent' => !empty($headers['User-Agent']) ? $headers['User-Agent'] : '',
       ]);
     }
 

src/ActiveCollab/EmailReplyExtractor/Extractor/Extractor.php

@@ -400,7 +400,7 @@ static function toPlainText($html) {
       // other table tags
       $plain = (string) preg_replace('/<td[^>]*>(.*?)<\/td>/i', "\t\\1\n", $plain); // <td>
       $plain = (string) preg_replace_callback('/<th[^>]*>(.*?)<\/th>/i', function($matches) {
-        return "\t\t" . mb_strtoupper($matches) . "\n";
+        return "\t\t" . mb_strtoupper($matches[0]) . "\n";
       }, $plain); // <th>
 
       // list elements