Changeset 1787 in subversion

Timestamp:

Sep 13, 2008 2:57:37 PM (5 years ago)

Author:

thomasb

Message:

Fix broken quoted-printable encoding

Location:

trunk/roundcubemail/program/include

Files:

• main.inc (modified) (1 diff)
• rcube_mail_mime.php (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -644 +644 @@
 {
   $out = html_entity_decode(html_entity_decode($content));
-  $out = preg_replace('/\\\([a-z0-9]{4})/ie', "chr(hexdec('\\1'))", $out);
+  $out = preg_replace('/\\\([0-9a-f]{4})/ie', "chr(hexdec('\\1'))", $out);
   $out = preg_replace('#/\*.*\*/#Um', '', $out);
   return $out;

trunk/roundcubemail/program/include/rcube_mail_mime.php

@@ -142 +142 @@
 
         //This header contains non ASCII chars and should be encoded.
-        if (preg_match('#[\x00-\x1F\x80-\xFF]{1}#', $value)) {
+        if (preg_match('/[\x80-\xFF]{1}/', $value)) {
           $suffix = '';
           // Don't encode e-mail address
@@ -161 +161 @@
             // quoted-printable encoding has been selected
             $mode = 'Q';
-            $encoded = preg_replace('/([\x3F\x00-\x1F\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $value);
-            // replace spaces with _
-            $encoded = str_replace(' ', '_', $encoded);
+            // replace ?, =, _ and spaces
+            $encoded = str_replace(array('=','_','?',' '), array('=3D','=5F','=3F','_'), $value);
+            $encoded = preg_replace('/([\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $encoded);
           }