Merge branch 'pu/ccheng/msg_emcode' into '2023.11'

fix(Felamimail/Message): improve encoding detection See merge request tine20/tine20!5220
tine-groupware · Apr 11, 2024 · 9fccbb0 · 9fccbb0
2 parents 9ca8586 + ee5b057
commit 9fccbb0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/tests/tine20/Felamimail/Controller/MessageTest.php b/tests/tine20/Felamimail/Controller/MessageTest.php
@@ -504,7 +504,7 @@ public function testGetBodyMultipartRelated()
 
         $this->assertStringContainsString('würde', $body);
     }
-    
+
     /**
      * test reading a message without setting the \Seen flag
      */
@@ -1478,6 +1478,7 @@ public function testMultipartRelatedAlternative()
         $cachedMessage = $this->messageTestHelper('multipart_alternative_related.eml');
         $message = $this->_getController()->getCompleteMessage($cachedMessage);
         $this->assertStringContainsString('some body contentsome body contentsome body content', $message->body);
+        $this->assertStringContainsString('TEI™ Study', $message->body);
     }
 
     /**

diff --git a/tests/tine20/Felamimail/files/multipart_alternative_related.eml b/tests/tine20/Felamimail/files/multipart_alternative_related.eml
@@ -179,6 +179,7 @@ some body contentsome body contentsome body content
 some body contentsome body contentsome body content
 some body contentsome body contentsome body content
 some body contentsome body contentsome body content
+Key insights from the Forrester TEI=E2=84=A2 Study
 </body></html>
 ------=_NextPart_001_018A_01CE0BA2.ABFF5D10--
 
@@ -202,4 +203,3 @@ Mvg/NOjJWruUOkfOOjYRPVxDr3RgL/QLpDzMZWLNXrPWbDMMJagXWkATKKro4L1tKxsn5VGmlcsv
 TRUNCATED
 
 ------=_NextPart_000_0189_01CE0BA2.ABFF5D10--
-
diff --git a/tine20/Tinebase/Helper.php b/tine20/Tinebase/Helper.php
@@ -264,7 +264,7 @@ public static function in_array_case($_arr, $_str)
     public static function mbConvertTo($string, $encodingTo = 'utf-8')
     {
         // try to fix bad encodings
-        $encoding = mb_detect_encoding((string)$string, array('utf-8', 'iso-8859-1', 'windows-1252', 'iso-8859-15'));
+        $encoding = mb_detect_encoding((string)$string, array('utf-8', 'iso-8859-1', 'iso-8859-15'));
         if ($encoding !== FALSE) {
             $string = @mb_convert_encoding((string)$string, $encodingTo, $encoding);
         }

diff --git a/tine20/library/StreamFilter/ConvertMbstring.php b/tine20/library/StreamFilter/ConvertMbstring.php
@@ -18,7 +18,7 @@ class StreamFilter_ConvertMbstring extends php_user_filter
      */
     function filter($in, $out, &$consumed, $closing): int {
         while ($bucket = stream_bucket_make_writeable($in)) {
-            $encoding = mb_detect_encoding($bucket->data, array('utf-8', 'iso-8859-1', 'windows-1252', 'iso-8859-15'));
+            $encoding = mb_detect_encoding($bucket->data, array('utf-8', 'iso-8859-1', 'iso-8859-15'));
             if ($encoding !== FALSE) {
                 $bucket->data = @mb_convert_encoding($bucket->data, 'utf-8', $encoding);
             }