From 72a2a653b7c68f01afd5be7b6e6a13d8fc5a6662 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 2 Mar 2012 13:09:05 +0000 Subject: - Fixed double-quotes handling in recipient names git-svn-id: https://svn.roundcube.net/trunk@5945 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/sendmail.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/steps') 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; -- cgit v1.2.3