From 52f8caf7706cbdd6087ac9c555270604554db5ef Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 21 Mar 2008 12:36:21 +0000
Subject: Correctly quote email recipient string

---
 program/include/rcube_imap.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcube_imap.inc')

diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 94f5017b8..170e4a565 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -2285,7 +2285,7 @@ class rcube_imap
       $address = $val['address'];
       $name = preg_replace(array('/^[\'"]/', '/[\'"]$/'), '', trim($val['name']));
       if ($name && $address && $name != $address)
-        $string = sprintf('%s <%s>', strpos($name, ',')!==FALSE ? '"'.$name.'"' : $name, $address);
+        $string = sprintf('%s <%s>', preg_match('/[,;<>]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
       else if ($address)
         $string = $address;
       else if ($name)
-- 
cgit v1.2.3