Changeset 0f5dee0 in github

Timestamp:

Jun 6, 2012 3:22:15 AM (12 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

master, HEAD, pdo

Children:

eede510

Parents:

0b6d022

Message:

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

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_message_header.php (modified) (1 diff)
• program/include/rcube_mime.php (modified) (3 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Decode header value in rcube_mime::get() by default (#1488511)
 - Fix errors with enabled PHP magic_quotes_sybase option (#1488506)
 - Fix SQL query for contacts listing on MS SQL Server (#1488505)

program/include/rcube_message_header.php

@@ -206 +206 @@
      * 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]};
-        }
-
-        return $this->others[$name];
+            $value = $this->{$this->obj_headers[$name]};
+        }
+        else {
+            $value = $this->others[$name];
+        }
+
+        return $decode ? rcube_mime::decode_header($value, $this->charset) : $value;
     }
 

program/include/rcube_mime.php

@@ -43 +43 @@
             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;
     }
 
@@ -90 +106 @@
             $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
@@ -184 +200 @@
     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