summaryrefslogtreecommitdiff
path: root/program/include/rcube_mail_mime.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-09-12 14:31:36 +0000
committerthomascube <thomas@roundcube.net>2008-09-12 14:31:36 +0000
commit9bed2d86d55fe755f0bd0ba8c001bfc3889f6509 (patch)
treee745f03b6735bf7a45eb85b5834f63057ed4ce52 /program/include/rcube_mail_mime.php
parentcf17773654e1e3f2b09a8aee1058bda4ada3bed1 (diff)
Fix quoted-printable encoding according to RFC 2045
Diffstat (limited to 'program/include/rcube_mail_mime.php')
-rw-r--r--program/include/rcube_mail_mime.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_mail_mime.php b/program/include/rcube_mail_mime.php
index 79c80dd69..4669c4c53 100644
--- a/program/include/rcube_mail_mime.php
+++ b/program/include/rcube_mail_mime.php
@@ -141,7 +141,7 @@ class rcube_mail_mime extends Mail_mime
$value = trim($value);
//This header contains non ASCII chars and should be encoded.
- if (preg_match('#[\x80-\xFF]{1}#', $value)) {
+ if (preg_match('#[\x00-\x1F\x80-\xFF]{1}#', $value)) {
$suffix = '';
// Don't encode e-mail address
if (preg_match('/(.+)\s(<.+@[a-z0-9\-\.]+>)$/Ui', $value, $matches)) {
@@ -160,7 +160,7 @@ class rcube_mail_mime extends Mail_mime
default:
// quoted-printable encoding has been selected
$mode = 'Q';
- $encoded = preg_replace('/([\x2C\x3F\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $value);
+ $encoded = preg_replace('/([\x3F\x00-\x1F\x80-\xFF])/e', "'='.sprintf('%02X', ord('\\1'))", $value);
// replace spaces with _
$encoded = str_replace(' ', '_', $encoded);
}