Encoding / Decoding improved and exception fallback added

Author: Webklex

CHANGELOG.md

@@ -6,7 +6,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [UNRELEASED]
 ### Fixed
-- NaN 
+- Encoding / Decoding improved and exception fallback added
 
 ### Added
 - NaN 
@@ -15,7 +15,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - NaN 
 
 ### Affected Classes
-- NaN 
+- [Message::class](src/Message.php)
 
 ## [1.6.2] - 2020-09-07
 ### Fixed

src/IMAP/Message.php

@@ -386,6 +386,9 @@ private function parseHeader() {
         if (property_exists($header, 'subject')) {
             if($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = \imap_utf8($header->subject);
+                if (Str::startsWith(mb_strtolower($this->subject), '=?utf-8?')) {
+                    $this->subject = mb_decode_mimeheader($header->subject);
+                }
             }elseif($this->config['decoder']['message']['subject'] === 'iconv') {
                 $this->subject = iconv_mime_decode($header->subject);
             }else{
@@ -866,13 +869,22 @@ public function convertEncoding($str, $from = "ISO-8859-2", $to = "UTF-8") {
             return $str;
         }
 
-        if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
-            return @iconv($from, $to.'//IGNORE', $str);
-        } else {
-            if (!$from) {
-                return mb_convert_encoding($str, $to);
+        try {
+            if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
+                return iconv($from, $to, $str);
+            } else {
+                if (!$from) {
+                    return mb_convert_encoding($str, $to);
+                }
+                return mb_convert_encoding($str, $to, $from);
+            }
+        } catch (\Exception $e) {
+            if (strstr($from, '-')) {
+                $from = str_replace('-', '', $from);
+                return $this->convertEncoding($str, $from, $to);
+            } else {
+                return $str;
             }
-            return mb_convert_encoding($str, $to, $from);
         }
     }