summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-16 17:32:52 +0000
committeralecpl <alec@alec.pl>2011-08-16 17:32:52 +0000
commit5c2ac5f528ef39c3e4ae6aab81e4ff93eabc6ac5 (patch)
tree55de1d68f7ce064478df3de90da6933b5a40bf90 /program
parent5c9d1ffe8eb4d53c378720e745e54f2a4bdecb28 (diff)
- Fix/simplify email regexp to prevent "no valid recipients" SMTP error (#1488040)
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/sendmail.inc2
1 files changed, 1 insertions, 1 deletions
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');