chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Validate login data only of there are no other errors

Browse Source
This commit is contained in:
Alexander Makarov 2014-02-21 00:57:29 +04:00
parent 1d58a83d8e
commit dca062e4e2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/LoginForm.php
View File

@ -24,10 +24,10 @@ class LoginForm extends Model
return [
// username and password are both required
[['username', 'password'], 'required'],
// password is validated by validatePassword()
['password', 'validatePassword'],
// rememberMe must be a boolean value
['rememberMe', 'boolean'],
// password is validated by validatePassword()
['password', 'validatePassword'],
];
}
@ -37,10 +37,12 @@ class LoginForm extends Model
*/
public function validatePassword()
{
$user = $this->getUser();
if (!$this->hasErrors()) {
$user = $this->getUser();
if (!$user || !$user->validatePassword($this->password)) {
$this->addError('password', 'Incorrect username or password.');
if (!$user || !$user->validatePassword($this->password)) {
$this->addError('password', 'Incorrect username or password.');
}
}
}