php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring method per request

Browse Source
This commit is contained in:
Aaron Mueller
2021-03-31 15:15:46 -07:00
parent 3593696b93
commit 808c64d900
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
framework/validators/EmailValidator.php
View File

@ -77,21 +77,7 @@ class EmailValidator extends Validator
$valid = false; $valid = false;
} else { } else {
if ($this->enableIDN) { if ($this->enableIDN) {
// https://github.com/yiisoft/yii2/issues/18585 $matches['local'] = $this->validateIdnValue($matches['local']);
$localIDNTest = $this->idnToAscii($matches['local']);
if ($localIDNTest === false) {
$newPatternExploded = explode('@', $this->pattern);
$newPattern = $newPatternExploded[0] . "$/";
$newFullPatternExploded = explode('@', $this->fullPattern);
$newFullPattern = $newFullPatternExploded[0] . '@' . $newFullPatternExploded[1] ."$/";
if (!preg_match($newPattern, $matches['local']) || ($this->allowName && preg_match($newFullPattern, $matches['local']))) {
$matches['local'] = $localIDNTest;
}
} else {
$matches['local'] = $localIDNTest;
}
$matches['domain'] = $this->idnToAscii($matches['domain']); $matches['domain'] = $this->idnToAscii($matches['domain']);
$value = $matches['name'] . $matches['open'] . $matches['local'] . '@' . $matches['domain'] . $matches['close']; $value = $matches['name'] . $matches['open'] . $matches['local'] . '@' . $matches['domain'] . $matches['close'];
} }
@ -190,4 +176,28 @@ class EmailValidator extends Validator
return $options; return $options;
} }
/**
* @param string $value
* @return string|bool returns string if it is valid and/or can be converted, bool false if it can't be converted and/or is invalid
* @see https://github.com/yiisoft/yii2/issues/18585
*/
private function validateIdnValue ($value)
{
$idnTest = $this->idnToAscii($value);
if ($idnTest === false) {
$newPatternExploded = explode('@', $this->pattern);
$newPattern = $newPatternExploded[0] . "$/";
$newFullPatternExploded = explode('@', $this->fullPattern);
$newFullPattern = $newFullPatternExploded[0] . '@' . $newFullPatternExploded[1] ."$/";
if (preg_match($newPattern, $value) || ($this->allowName && preg_match($newFullPattern, $value))) {
return $value;
}
}
return $idnTest;
}
} }