Merge branch 'pu/ccheng/rt_247850' into '2024.11'

fix(Felamimail/Message): detech strict encoding from msg message See merge request tine20/tine20!6654
tine-groupware · Feb 27, 2025 · 1196741 · 1196741
2 parents 5aebf52 + d2ed7fc
commit 1196741
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/tests/tine20/Felamimail/Frontend/JsonTest.php b/tests/tine20/Felamimail/Frontend/JsonTest.php
@@ -2867,9 +2867,7 @@ public function testGetMessageFromNodeMsg()
             dirname(__FILE__) . '/../files/multipart_related_recipients.msg'
         );
 
-        // TODO make encodingCheck work again (in PHP 8.3+)
-        $encodingCheck = PHP_VERSION_ID < 80300;
-        $message = $this->_assertMessageFromNode($result[0]['id'], $encodingCheck);
+        $message = $this->_assertMessageFromNode($result[0]['id'], true);
         self::assertEquals(2, count($message['cc']));
         self::assertEquals('[email protected]', $message['cc'][0]['email']);
         self::assertEquals('[email protected]', $message['cc'][1]['email']);

diff --git a/tine20/Felamimail/Controller/Message.php b/tine20/Felamimail/Controller/Message.php
@@ -1502,8 +1502,8 @@ public function getMessageFromNode($nodeId, $mimeType = null): Felamimail_Model_
             }
 
             if ($message['body_content_type'] === 'text/html') {
-                $encoding = mb_detect_encoding($message['body']);
-                if (! $encoding) {
+                $encoding = mb_detect_encoding($message['body'], 'UTF-8', true);
+                if (!$encoding) {
                     $message['body'] = mb_convert_encoding($message['body'], 'UTF-8', 'ISO-8859-1');
                 }
                 $message->body = str_replace("\r", '', $message['body']);