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

Merge pull request #2446 from Theill11/update-apps

Browse Source 
Minor updates to apps
This commit is contained in:
Alexander Makarov 2014-02-16 13:42:13 +03:00
commit 1d58a83d8e
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/SiteController.php
View File

@ -55,11 +55,11 @@ class SiteController extends Controller
public function actionLogin() public function actionLogin()
{ {
if (!\Yii::$app->user->isGuest) { if (!\Yii::$app->user->isGuest) {
$this->goHome(); return $this->goHome();
} }
$model = new LoginForm(); $model = new LoginForm();
if ($model->load($_POST) && $model->login()) { if ($model->load(Yii::$app->request->post()) && $model->login()) {
return $this->goBack(); return $this->goBack();
} else { } else {
return $this->render('login', [ return $this->render('login', [
@ -76,8 +76,8 @@ class SiteController extends Controller
public function actionContact() public function actionContact()
{ {
$model = new ContactForm; $model = new ContactForm();
if ($model->load($_POST) && $model->contact(Yii::$app->params['adminEmail'])) { if ($model->load(Yii::$app->request->post()) && $model->contact(Yii::$app->params['adminEmail'])) {
Yii::$app->session->setFlash('contactFormSubmitted'); Yii::$app->session->setFlash('contactFormSubmitted');
return $this->refresh(); return $this->refresh();
} else { } else {

24
models/User.php
View File

@ -24,11 +24,20 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
], ],
]; ];
/**
* @inheritdoc
*/
public static function findIdentity($id) public static function findIdentity($id)
{ {
return isset(self::$users[$id]) ? new static(self::$users[$id]) : null; return isset(self::$users[$id]) ? new static(self::$users[$id]) : null;
} }
/**
* Finds user by username
*
* @param string $username
* @return static|null
*/
public static function findByUsername($username) public static function findByUsername($username)
{ {
foreach (self::$users as $user) { foreach (self::$users as $user) {
@ -39,21 +48,36 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
return null; return null;
} }
/**
* @inheritdoc
*/
public function getId() public function getId()
{ {
return $this->id; return $this->id;
} }
/**
* @inheritdoc
*/
public function getAuthKey() public function getAuthKey()
{ {
return $this->authKey; return $this->authKey;
} }
/**
* @inheritdoc
*/
public function validateAuthKey($authKey) public function validateAuthKey($authKey)
{ {
return $this->authKey === $authKey; return $this->authKey === $authKey;
} }
/**
* Validates password
*
* @param string $password password to validate
* @return bool if password provided is valid for current user
*/
public function validatePassword($password) public function validatePassword($password)
{ {
return $this->password === $password; return $this->password === $password;