From 0c6f4b88648879cf12342d16c83bdd0d3a11672f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 21 Mar 2008 09:29:12 -0400
Subject: [PATCH] Better patch to correctly quote email recipient strings (from #1484191)
---
program/include/main.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 3a1d647..cb25fbd 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1567,7 +1567,10 @@
function format_email_recipient($email, $name='')
{
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;
}
--
Gitblit v1.9.1