Changeset 0c6f4b8 in github

Timestamp:

Mar 21, 2008 9:29:12 AM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

846dd74

Parents:

46bc52b

Message:

Better patch to correctly quote email recipient strings (from #1484191)

Location:

program

Files:

• include/main.inc (modified) (1 diff)
• include/rcube_imap.inc (modified) (2 diffs)
• steps/mail/compose.inc (modified) (2 diffs)

program/include/main.inc

@@ -1568 +1568 @@
   {
   if ($name && $name != $email)
-    return sprintf('%s <%s>', strpos($name, ",") ? '"'.$name.'"' : $name, $email);
+    {
+    // Special chars as defined by RFC 822 need to in quoted string (or escaped).
+    return sprintf('%s <%s>', preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, $email);
+    }
   else
     return $email;

program/include/rcube_imap.inc

@@ -2273 +2273 @@
     $a = $this->_parse_address_list($input, $decode);
     $out = array();
+    // Special chars as defined by RFC 822 need to in quoted string (or escaped).
+    $special_chars = '[\(\)\<\>\\\.\[\]@,;:"]';
     
     if (!is_array($a))
@@ -2286 +2288 @@
       $name = preg_replace(array('/^[\'"]/', '/[\'"]$/'), '', trim($val['name']));
       if ($name && $address && $name != $address)
-        $string = sprintf('%s <%s>', preg_match('/[,;<>]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
+        $string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
       else if ($address)
         $string = $address;

program/steps/mail/compose.inc

@@ -894 +894 @@
   while ($sql_arr = $result->iterate())
     if ($sql_arr['email'])
-      $a_contacts[] = format_email_recipient($sql_arr['email'], JQ($sql_arr['name']));
+      $a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
   }
 if (isset($CONFIG['ldap_public']))
@@ -919 +919 @@
             $name = $results->records[$i]['name']; 
                  
-            $a_contacts[] = format_email_recipient($email, JQ($name)); 
+            $a_contacts[] = format_email_recipient($email, $name);
             } 
           }