From 5c2ac5f528ef39c3e4ae6aab81e4ff93eabc6ac5 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 16 Aug 2011 17:32:52 +0000 Subject: - Fix/simplify email regexp to prevent "no valid recipients" SMTP error (#1488040) --- program/steps/mail/sendmail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program/steps') diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index aee498221..f81c1529d 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -144,7 +144,7 @@ function rcmail_email_input_format($mailto, $count=false, $check=true) global $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT; // simplified email regexp, supporting quoted local part - $email_regexp = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+'; + $email_regexp = '(\S+|("[^"]+"))@\S+'; $regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<'.$email_regexp.'>)/U'); $replace = array(', ', ', ', '', ',', '\\1 \\2'); -- cgit v1.2.3