Ticket #1485151: tspecials.patch

program/lib/Mail/mimePart.php

@@ -398 +398 @@
         //is not any of the defaults, we need to encode the value.
         $shouldEncode = 0;
         $secondAsterisk = '';
-        if (preg_match('#([ \x80-\xFF \*\'\\%\t(\)\<\>\@\,\;\:\\\"/\[\]\?\=]){1}#', $value)) {
+        if (preg_match('#([\x80-\xFF]){1}#', $value)) {
             $shouldEncode = 1;
         } elseif ($charset && (strtolower($charset) != 'us-ascii')) {
             $shouldEncode = 1;
@@ -406 +406 @@
             $shouldEncode = 1;
         }
         if ($shouldEncode) {
-            $encValue = preg_replace('#([\x80-\xFF \*\'\%\t\(\)\<\>\@\,\;\:\\\"/\[\]\?\=])#e', '"%" . strtoupper(dechex(ord("\1")))', $value);
+            $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);
             $value = "$charset'$language'$encValue";
             $secondAsterisk = '*';
-        }
+        } else {
+            $value = preg_replace('#([\(\)\<\>\@\,\;\:\\\"\/\[\[\?\=])#', '\\\\\\1', $value);
+        }
         $header = " {$name}{$secondAsterisk}=\"{$value}\"; ";
         if (strlen($header) <= $maxLength) {
             return $header;