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

removed checkPort feature from email validator

Browse Source 
fixes #1246
This commit is contained in:
Carsten Brandt
2013-11-20 18:57:29 +01:00
parent 45d92f1cef
commit 070bd9625c
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
framework/yii/validators/EmailValidator.php
View File

@@ -41,24 +41,8 @@ class EmailValidator extends Validator
* @var boolean whether to check whether the emails domain exists and has either an A or MX record. * @var boolean whether to check whether the emails domain exists and has either an A or MX record.
* Be aware of the fact that this check can fail due to temporary DNS problems even if the email address is * Be aware of the fact that this check can fail due to temporary DNS problems even if the email address is
* valid and an email would be deliverable. Defaults to false. * valid and an email would be deliverable. Defaults to false.
* @see dnsMessage
*/ */
public $checkDNS = false; public $checkDNS = false;
/**
* @var string the error message to display when the domain of the email does not exist.
* It may contain the following placeholders which will be replaced accordingly by the validator:
*
* - `{attribute}`: the label of the attribute being validated
* - `{value}`: the value of the attribute being validated
*
* @see checkDNS
*/
public $dnsMessage;
/**
* @var boolean whether to check port 25 for the email address.
* Defaults to false.
*/
public $checkPort = false;
/** /**
* @var boolean whether validation process should take into account IDN (internationalized domain * @var boolean whether validation process should take into account IDN (internationalized domain
* names). Defaults to false meaning that validation of emails containing IDN will always fail. * names). Defaults to false meaning that validation of emails containing IDN will always fail.
@@ -80,9 +64,6 @@ class EmailValidator extends Validator
if ($this->message === null) { if ($this->message === null) {
$this->message = Yii::t('yii', '{attribute} is not a valid email address.'); $this->message = Yii::t('yii', '{attribute} is not a valid email address.');
} }
if ($this->dnsMessage === null) {
$this->dnsMessage = Yii::t('yii', 'The domain of this email address does not seem to exist.');
}
} }
/** /**
@@ -118,14 +99,9 @@ class EmailValidator extends Validator
$value = $matches[1] . idn_to_ascii($matches[2]) . '@' . idn_to_ascii($domain) . $matches[4]; $value = $matches[1] . idn_to_ascii($matches[2]) . '@' . idn_to_ascii($domain) . $matches[4];
} }
$valid = preg_match($this->pattern, $value) || $this->allowName && preg_match($this->fullPattern, $value); $valid = preg_match($this->pattern, $value) || $this->allowName && preg_match($this->fullPattern, $value);
if ($valid) { if ($valid && $this->checkDNS) {
if ($this->checkDNS) {
$valid = checkdnsrr($domain, 'MX') || checkdnsrr($domain, 'A'); $valid = checkdnsrr($domain, 'MX') || checkdnsrr($domain, 'A');
} }
if ($valid && $this->checkPort && function_exists('fsockopen')) {
$valid = fsockopen($domain, 25) !== false;
}
}
return $valid; return $valid;
} }