Add a fallback when aliasing encodings for iconv (#325)

Author: Hokan22

src/IMAP/EncodingAliases.php

@@ -465,17 +465,20 @@ class EncodingAliases {
     ];        
 
     /**
-     * Returns proper encoding mapping, if exsists. If it doesn't, return unchanged $encoding
+     * Returns proper encoding mapping, if it exists. If it doesn't, return $fallback if it is not null.
+     * If neither a mapping was found nor $fallback was given return the unchanged $encoding
      * 
      * @param string $encoding
      * @return string
      */
-    public static function get($encoding) {
+    public static function get($encoding, $fallback = null) {
         if (isset(self::$aliases[strtolower($encoding)])) {
             return self::$aliases[strtolower($encoding)];
-        } else {
-            return $encoding;
         }
+        if ($fallback !== null) {
+            return $fallback;
+        }
+        return $encoding;
     }
 
 }

src/IMAP/Message.php

@@ -45,6 +45,7 @@
  * @property array reply_to
  * @property array in_reply_to
  * @property array sender
+ * @property string fallback_encoding
  *
  * @method integer getMsglist()
  * @method integer setMsglist(integer $msglist)
@@ -176,6 +177,12 @@ class Message {
     public $attachments = [];
     public $flags = [];
 
+    /**
+     * Fallback Encoding
+     * @var string
+     */
+    public $fallback_encoding = 'UTF-8';
+
     /**
      * A list of all available and supported flags
      *
@@ -590,8 +597,7 @@ private function parseAddresses($list) {
                 if(is_array($personalParts)) {
                     $address->personal = '';
                     foreach ($personalParts as $p) {
-                        $encoding = (property_exists($p, 'charset')) ? $p->charset : $this->getEncoding($p->text);
-                        $address->personal .= $this->convertEncoding($p->text, $encoding);
+                        $address->personal .= $this->convertEncoding($p->text, $this->getEncoding($p));
                     }
                 }
             }
@@ -853,8 +859,8 @@ public function decodeString($string, $encoding) {
      */
     public function convertEncoding($str, $from = "ISO-8859-2", $to = "UTF-8") {
 
-        $from = EncodingAliases::get($from);
-        $to = EncodingAliases::get($to);
+        $from = EncodingAliases::get($from, $this->fallback_encoding);
+        $to = EncodingAliases::get($to, $this->fallback_encoding);
 
         if ($from === $to) {
             return $str;
@@ -896,9 +902,11 @@ public function getEncoding($structure) {
         if (property_exists($structure, 'parameters')) {
             foreach ($structure->parameters as $parameter) {
                 if (strtolower($parameter->attribute) == "charset") {
-                    return EncodingAliases::get($parameter->value);
+                    return EncodingAliases::get($parameter->value, $this->fallback_encoding);
                 }
             }
+        }elseif (property_exists($structure, 'charset')) {
+            return EncodingAliases::get($structure->charset, $this->fallback_encoding);
         }elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }