Changeset 1576 in subversion

Timestamp:

Jun 25, 2008 2:33:10 AM (5 years ago)

Author:

alec

Message:

Patched Mail/mimePart.php (​http://pear.php.net/bugs/bug.php?id=14232)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/Mail/mimePart.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/24 (alec)
+----------
+- Patched Mail/MimePart.php (http://pear.php.net/bugs/bug.php?id=14232)
 
 2008/06/24 (alec)

trunk/roundcubemail/program/lib/Mail/mimePart.php

@@ -399 +399 @@
         $shouldEncode = 0;
         $secondAsterisk = '';
-        if (preg_match('#([\x80-\xFF]){1}#', $value)) {
+        if (preg_match('#([ \x80-\xFF \*\'\\%\t(\)\<\>\@\,\;\:\\\"/\[\]\?\=]){1}#', $value)) {
             $shouldEncode = 1;
         } elseif ($charset && (strtolower($charset) != 'us-ascii')) {
@@ -407 +407 @@
         }
         if ($shouldEncode) {
-            $search  = array('%',   ' ',   "\t");
-            $replace = array('%25', '%20', '%09');
-            $encValue = str_replace($search, $replace, $value);
-            $encValue = preg_replace('#([\x80-\xFF])#e', '"%" . strtoupper(dechex(ord("\1")))', $encValue);
+            $encValue = preg_replace('#([\x80-\xFF \*\'\%\t\(\)\<\>\@\,\;\:\\\"/\[\]\?\=])#e', '"%" . strtoupper(dechex(ord("\1")))', $value);
             $value = "$charset'$language'$encValue";
             $secondAsterisk = '*';