Decode header value in rcube_mime::get() by default (#1488511)

2 files changed, 26 insertions, 7 deletions

diff --git a/program/include/rcube_message_header.php b/program/include/rcube_message_header.php
index f2f91674e..378fb98c9 100644
--- a/program/include/rcube_message_header.php
+++ b/program/include/rcube_message_header.php
@@ -205,15 +205,18 @@ class rcube_message_header
     /**
      * Returns header value
      */
-    public function get($name)
+    public function get($name, $decode = true)
     {
         $name = strtolower($name);
 
         if (isset($this->obj_headers[$name])) {
-            return $this->{$this->obj_headers[$name]};
+            $value = $this->{$this->obj_headers[$name]};
+        }
+        else {
+            $value = $this->others[$name];
         }
 
-        return $this->others[$name];
+        return $decode ? rcube_mime::decode_header($value, $this->charset) : $value;
     }
 
     /**
diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php
index 9a594f3ee..53655a9cb 100644
--- a/program/include/rcube_mime.php
+++ b/program/include/rcube_mime.php
@@ -42,9 +42,25 @@ class rcube_mime
         if ($default_charset) {
             self::$default_charset = $default_charset;
         }
-        else {
-            self::$default_charset = rcube::get_instance()->config->get('default_charset', RCMAIL_CHARSET);
+    }
+
+
+    /**
+     * Returns message/object character set name
+     *
+     * @return string Characted set name
+     */
+    public static function get_charset()
+    {
+        if (self::$default_charset) {
+            return self::$default_charset;
         }
+
+        if ($charset = rcube::get_instance()->config->get('default_charset')) {
+            return $charset;
+        }
+
+        return RCMAIL_CHARSET;
     }
 
 
@@ -89,7 +105,7 @@ class rcube_mime
         if ($part->ctype_parameters['charset'])
             $struct->charset = $part->ctype_parameters['charset'];
 
-        $part_charset = $struct->charset ? $struct->charset : self::$default_charset;
+        $part_charset = $struct->charset ? $struct->charset : self::get_charset();
 
         // determine filename
         if (($filename = $part->d_parameters['filename']) || ($filename = $part->ctype_parameters['name'])) {
@@ -183,7 +199,7 @@ class rcube_mime
      */
     public static function decode_mime_string($input, $fallback = null)
     {
-        $default_charset = !empty($fallback) ? $fallback : self::$default_charset;
+        $default_charset = !empty($fallback) ? $fallback : self::get_charset();
 
         // rfc: all line breaks or other characters not found
         // in the Base64 Alphabet must be ignored by decoding software