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

pull origin

Browse Source
This commit is contained in:
RichWeber
2014-08-01 00:32:08 +03:00
parent 5a8bd4747d
commit 92cd13a913
411 changed files with 4872 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/advanced/common/models/LoginForm.php
View File

@@ -33,13 +33,16 @@ class LoginForm extends Model
/**
* Validates the password.
* This method serves as the inline validation for password.
*
* @param string $attribute the attribute currently being validated
* @param array $params the additional name-value pairs given in the rule
*/
public function validatePassword()
public function validatePassword($attribute, $params)
{
if (!$this->hasErrors()) {
$user = $this->getUser();
if (!$user || !$user->validatePassword($this->password)) {
$this->addError('password', 'Incorrect username or password.');
$this->addError($attribute, 'Incorrect username or password.');
}
}
}

4
apps/advanced/common/models/User.php
View File

@@ -159,7 +159,7 @@ class User extends ActiveRecord implements IdentityInterface
*/
public function generateAuthKey()
{
$this->auth_key = Yii::$app->security->generateRandomKey();
$this->auth_key = Yii::$app->security->generateRandomString();
}
/**
@@ -167,7 +167,7 @@ class User extends ActiveRecord implements IdentityInterface
*/
public function generatePasswordResetToken()
{
$this->password_reset_token = Yii::$app->security->generateRandomKey() . '_' . time();
$this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
}
/**

4
apps/advanced/common/tests/templates/fixtures/user.php
View File

@@ -3,7 +3,7 @@
return [
'username' => 'userName',
'auth_key' => function ($fixture, $faker, $index) {
$fixture['auth_key'] = Yii::$app->getSecurity()->generateRandomKey();
$fixture['auth_key'] = Yii::$app->getSecurity()->generateRandomString();
return $fixture;
},
@@ -13,7 +13,7 @@ return [
return $fixture;
},
'password_reset_token' => function ($fixture, $faker, $index) {
$fixture['password_reset_token'] = Yii::$app->getSecurity()->generateRandomKey() . '_' . time();
$fixture['password_reset_token'] = Yii::$app->getSecurity()->generateRandomString() . '_' . time();
return $fixture;
},