summaryrefslogtreecommitdiff
path: root/program/include/rcube_imap.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-09 09:46:54 +0000
committeralecpl <alec@alec.pl>2011-08-09 09:46:54 +0000
commit6d0ada30d7847a509db10d819020ac653597d073 (patch)
treec14e28bc4a0f0699cf4eecb87e55a80836097351 /program/include/rcube_imap.php
parentefc24a5fb3d5d70e9066b1994f3b41b248e59ccd (diff)
- Fix handling of email addresses with quoted local part (#1487939)
Diffstat (limited to 'program/include/rcube_imap.php')
-rw-r--r--program/include/rcube_imap.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 3ba058988..5fbf3ad54 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -4760,12 +4760,15 @@ class rcube_imap
$str = self::explode_header_string(',;', $str, true);
$result = array();
+ // simplified regexp, supporting quoted local part
+ $email_rx = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+
foreach ($str as $key => $val) {
$name = '';
$address = '';
$val = trim($val);
- if (preg_match('/(.*)<(\S+@\S+)>$/', $val, $m)) {
+ if (preg_match('/(.*)<('.$email_rx.')>$/', $val, $m)) {
$address = $m[2];
$name = trim($m[1]);
}
@@ -4779,7 +4782,7 @@ class rcube_imap
// dequote and/or decode name
if ($name) {
- if ($name[0] == '"') {
+ if ($name[0] == '"' && $name[strlen($name)-1] == '"') {
$name = substr($name, 1, -1);
$name = stripslashes($name);
}