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

Fixed apps rules

Browse Source
This commit is contained in:
slavcodev
2013-11-13 11:41:25 +02:00
parent 2adcd16e0d
commit f57b3536a2
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,9 @@ class LoginForm extends Model
// username and password are both required // username and password are both required
[['username', 'password'], 'required'], [['username', 'password'], 'required'],
// password is validated by validatePassword() // password is validated by validatePassword()
[['password'], 'validatePassword'], ['password', 'validatePassword'],
// rememberMe must be a boolean value // rememberMe must be a boolean value
[['rememberMe'], 'boolean'], ['rememberMe', 'boolean'],
]; ];
} }

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

@@ -104,18 +104,18 @@ class User extends ActiveRecord implements IdentityInterface
public function rules() public function rules()
{ {
return [ return [
[['username'], 'filter', 'filter' => 'trim'], ['username', 'filter', 'filter' => 'trim'],
[['username'], 'required'], ['username', 'required'],
[['username'], 'string', 'min' => 2, 'max' => 255], ['username', 'string', 'min' => 2, 'max' => 255],
[['email'], 'filter', 'filter' => 'trim'], ['email', 'filter', 'filter' => 'trim'],
[['email'], 'required'], ['email', 'required'],
[['email'], 'email'], ['email', 'email'],
[['email'], 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'], ['email', 'unique', 'message' => 'This email address has already been taken.', 'on' => 'signup'],
[['email'], 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'], ['email', 'exist', 'message' => 'There is no user with such email.', 'on' => 'requestPasswordResetToken'],
[['password'], 'required'], ['password', 'required'],
[['password'], 'string', 'min' => 6], ['password', 'string', 'min' => 6],
]; ];
} }

4
apps/advanced/frontend/models/ContactForm.php
View File

@@ -25,9 +25,9 @@ class ContactForm extends Model
// name, email, subject and body are required // name, email, subject and body are required
[['name', 'email', 'subject', 'body'], 'required'], [['name', 'email', 'subject', 'body'], 'required'],
// email has to be a valid email address // email has to be a valid email address
[['email'], 'email'], ['email', 'email'],
// verifyCode needs to be entered correctly // verifyCode needs to be entered correctly
[['verifyCode'], 'captcha'], ['verifyCode', 'captcha'],
]; ];
} }

4
apps/basic/models/ContactForm.php
View File

@@ -25,9 +25,9 @@ class ContactForm extends Model
// name, email, subject and body are required // name, email, subject and body are required
[['name', 'email', 'subject', 'body'], 'required'], [['name', 'email', 'subject', 'body'], 'required'],
// email has to be a valid email address // email has to be a valid email address
[['email'], 'email'], ['email', 'email'],
// verifyCode needs to be entered correctly // verifyCode needs to be entered correctly
[['verifyCode'], 'captcha'], ['verifyCode', 'captcha'],
]; ];
} }

4
apps/basic/models/LoginForm.php
View File

@@ -23,9 +23,9 @@ class LoginForm extends Model
// username and password are both required // username and password are both required
[['username', 'password'], 'required'], [['username', 'password'], 'required'],
// password is validated by validatePassword() // password is validated by validatePassword()
[['password'], 'validatePassword'], ['password', 'validatePassword'],
// rememberMe must be a boolean value // rememberMe must be a boolean value
[['rememberMe'], 'boolean'], ['rememberMe', 'boolean'],
]; ];
} }