diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-16 17:32:52 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-16 17:32:52 +0000 |
| commit | 4475cbe0d686f7103499ea8e2576896e2087ae1f (patch) | |
| tree | f779983f69d876c2e9ab12e9908ea566e0dec846 /roundcubemail/program/steps/mail | |
| parent | 6fbc166c8d3ba440027d560611ade5eeeb409dd3 (diff) | |
- Fix/simplify email regexp to prevent "no valid recipients" SMTP error (#1488040)
git-svn-id: https://svn.roundcube.net/trunk@5073 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index aee498221..f81c1529d 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/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'); |