Fix for #48: Mail adresses are accepted in a broader range.

This commit is contained in:
azett 2019-12-25 22:40:11 +01:00
parent 23c4c33ee1
commit a9eeb2f408

View File

@ -25,28 +25,29 @@
* @package SmartyValidate * @package SmartyValidate
*/ */
/** /**
* test if a value is a valid e-mail address * test if a value is a valid e-mail address
* *
* @param string $value the value being tested * @param string $value
* @param boolean $empty if field can be empty * the value being tested
* @param array params validate parameter values * @param boolean $empty
* @param array formvars form var values * if field can be empty
* @param
* array params validate parameter values
* @param
* array formvars form var values
*/ */
function smarty_validate_criteria_isEmail($value, $empty, &$params, &$formvars) { function smarty_validate_criteria_isEmail($value, $empty, &$params, &$formvars) {
if (strlen($value) == 0)
if(strlen($value) == 0)
return $empty; return $empty;
// in case value is several addresses separated by newlines // in case value is several addresses separated by newlines
$_addresses = preg_split('![\n\r]+!', $value); $_addresses = preg_split('![\n\r]+!', $value);
foreach($_addresses as $_address) { foreach ($_addresses as $_address) {
$_is_valid = !(preg_match('!@.*@|\.\.|\,|\;!', $_address) || $_is_valid = !(preg_match('!@.*@|\.\.|\,|\;!', $_address) || !preg_match('!^.+\@(\[?)[a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,}|[0-9]{1,})(\]?)$!', $_address));
!preg_match('!^.+\@(\[?)[a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$!', $_address));
if(!$_is_valid) if (!$_is_valid)
return false; return false;
} }
return true; return true;