summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-02 13:09:05 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-03-02 13:09:05 +0000
commit72a2a653b7c68f01afd5be7b6e6a13d8fc5a6662 (patch)
treedd33d45f9c9e523a506e5b78172fd607c6aac833 /roundcubemail/program
parent0fda92af77c33829bff8a7d82dc51343351e58a7 (diff)
- Fixed double-quotes handling in recipient names
git-svn-id: https://svn.roundcube.net/trunk@5945 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/steps/mail/sendmail.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 826f73135..bb2bd2732 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -179,7 +179,11 @@ function rcmail_email_input_format($mailto, $count=false, $check=true)
// address with name (handle name)
} else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
$address = $matches[0];
- $name = trim(str_replace($address, '', $item), '" ');
+ $name = trim(str_replace($address, '', $item));
+ if ($name[0] == '"' && $name[count($name)-1] == '"') {
+ $name = substr($name, 1, -1);
+ }
+ $name = stripcslashes($name);
$address = rcube_idn_to_ascii(trim($address, '<>'));
$result[] = format_email_recipient($address, $name);
$item = $address;