summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-02-23 14:20:43 +0100
committerAleksander Machniak <alec@alec.pl>2014-02-23 14:20:43 +0100
commit2b8f033bcbd5581ff7b27b396f308b77058c09dc (patch)
tree03f08cc1600e3ca5c1a055f244dad57557f11fe9 /program
parent7e4d15ff4349111d232882fc5a539ae30eccc178 (diff)
Improvement in handling invalid email address strings
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_mime.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 55b70f67c..091b2fae8 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -366,6 +366,9 @@ class rcube_mime
$address = 'MAILER-DAEMON';
$name = substr($val, 0, -strlen($m[1]));
}
+ else if (preg_match('/('.$email_rx.')/', $val, $m)) {
+ $name = $m[1];
+ }
else {
$name = $val;
}
@@ -387,6 +390,7 @@ class rcube_mime
if (!$address && $name) {
$address = $name;
+ $name = '';
}
if ($address) {