|
@@ -28,36 +28,31 @@ class PasswordsValidator extends BaseValidator
|
|
|
*/
|
|
*/
|
|
|
protected function validate($data, $additionalData = null)
|
|
protected function validate($data, $additionalData = null)
|
|
|
{
|
|
{
|
|
|
- $validateError = null;
|
|
|
|
|
if(strlen($data) < 8)
|
|
if(strlen($data) < 8)
|
|
|
{
|
|
{
|
|
|
$this->addValidationError('passwordCharsLengthError');
|
|
$this->addValidationError('passwordCharsLengthError');
|
|
|
- $validateError = true;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!preg_match('#[0-9]+#', $data)) {
|
|
if (!preg_match('#[0-9]+#', $data)) {
|
|
|
$this->addValidationError('passwordNumberError');
|
|
$this->addValidationError('passwordNumberError');
|
|
|
- $validateError = true;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!preg_match('#[A-Z]+#', $data)) {
|
|
if (!preg_match('#[A-Z]+#', $data)) {
|
|
|
$this->addValidationError('passwordUpperError');
|
|
$this->addValidationError('passwordUpperError');
|
|
|
- $validateError = true;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!preg_match('#[a-z]+#', $data)) {
|
|
if (!preg_match('#[a-z]+#', $data)) {
|
|
|
$this->addValidationError('passwordLowerError');
|
|
$this->addValidationError('passwordLowerError');
|
|
|
- $validateError = true;
|
|
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (!preg_match('#[^\w]+#', $data)) {
|
|
if (!preg_match('#[^\w]+#', $data)) {
|
|
|
$this->addValidationError('passwordSpecialError');
|
|
$this->addValidationError('passwordSpecialError');
|
|
|
- $validateError = true;
|
|
|
|
|
- }
|
|
|
|
|
- if ($validateError == true) {
|
|
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|