summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-08-21 18:08:26 +0200
committerAleksander Machniak <alec@alec.pl>2014-08-21 18:12:37 +0200
commitdbf70cc7db3c5574f7a89e069591523363db709b (patch)
tree246503c90b67996e749503822c0e2a97655b707c /program
parente6f21118b8d63de797c2af889c710d33ce908c8c (diff)
Fix handling of email addresses with quoted domain part (#1490040)
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_mime.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 091b2fae8..4d43a898e 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -394,6 +394,7 @@ class rcube_mime
}
if ($address) {
+ $address = self::fix_email($address);
$result[$key] = array('name' => $name, 'address' => $address);
}
}
@@ -889,4 +890,19 @@ class rcube_mime
return 'image/' . $type;
}
+ /**
+ * Try to fix invalid email addresses
+ */
+ public static function fix_email($email)
+ {
+ $parts = rcube_utils::explode_quoted_string('@', $email);
+ foreach ($parts as $idx => $part) {
+ // remove redundant quoting (#1490040)
+ if ($part[0] == '"' && preg_match('/^"([a-zA-Z0-9._+=-]+)"$/', $part, $m)) {
+ $parts[$idx] = $m[1];
+ }
+ }
+
+ return implode('@', $parts);
+ }
}