Ticket system improvements for import encoding, ticket system limited display of html elements (strip_tags)

2023-01-12 00:01:20 +01:00
parent 1fdd6dbf95
commit 613d45b1cc
4 changed files with 80 additions and 12 deletions
@@ -22,12 +22,22 @@ class TicketFormatter
     */
    public function encodeToUtf8(string $string): string
    {
-        $encoding = mb_detect_encoding($string, 'UTF-8, ISO-8859-1, ISO-8859-15', true);

-        return mb_convert_encoding(
+        $converted = mb_convert_encoding(
            $string,
            'UTF-8',
-            $encoding
+            'auto'
        );
+
+        // Fallback
+        if ($converted === false) {
+            $converted = mb_convert_encoding(
+                $string,
+                'UTF-8',
+                'iso-8859-1'
+            );
+        }
+
+        return ($converted);
    }
 }