From f2484fd6160a4be003e86da368f69b4545aea38c Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 7 Nov 2013 01:19:36 +0400 Subject: [PATCH] Modified application templates so when trying to log in when already logged in it just redirects to homepage instead of throwing exceptions --- apps/advanced/backend/controllers/SiteController.php | 11 +++++------ apps/advanced/frontend/controllers/SiteController.php | 8 ++++++-- apps/basic/controllers/SiteController.php | 11 +++++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/advanced/backend/controllers/SiteController.php b/apps/advanced/backend/controllers/SiteController.php index a21f33a..6850fe9 100644 --- a/apps/advanced/backend/controllers/SiteController.php +++ b/apps/advanced/backend/controllers/SiteController.php @@ -15,15 +15,10 @@ class SiteController extends Controller 'class' => \yii\web\AccessControl::className(), 'rules' => [ [ - 'actions' => ['error'], + 'actions' => ['login', 'error'], 'allow' => true, ], [ - 'actions' => ['login'], - 'allow' => true, - 'roles' => ['?'], - ], - [ 'actions' => ['logout', 'index'], 'allow' => true, 'roles' => ['@'], @@ -49,6 +44,10 @@ class SiteController extends Controller public function actionLogin() { + if (!\Yii::$app->user->isGuest) { + $this->goHome(); + } + $model = new LoginForm(); if ($model->load($_POST) && $model->login()) { return $this->goHome(); diff --git a/apps/advanced/frontend/controllers/SiteController.php b/apps/advanced/frontend/controllers/SiteController.php index 26aa300..ae41744 100644 --- a/apps/advanced/frontend/controllers/SiteController.php +++ b/apps/advanced/frontend/controllers/SiteController.php @@ -17,10 +17,10 @@ class SiteController extends Controller return [ 'access' => [ 'class' => \yii\web\AccessControl::className(), - 'only' => ['login', 'logout', 'signup'], + 'only' => ['logout', 'signup'], 'rules' => [ [ - 'actions' => ['login', 'signup'], + 'actions' => ['signup'], 'allow' => true, 'roles' => ['?'], ], @@ -54,6 +54,10 @@ class SiteController extends Controller public function actionLogin() { + if (!\Yii::$app->user->isGuest) { + $this->goHome(); + } + $model = new LoginForm(); if ($model->load($_POST) && $model->login()) { return $this->goHome(); diff --git a/apps/basic/controllers/SiteController.php b/apps/basic/controllers/SiteController.php index f369e3b..e3ca29b 100644 --- a/apps/basic/controllers/SiteController.php +++ b/apps/basic/controllers/SiteController.php @@ -16,14 +16,9 @@ class SiteController extends Controller return [ 'access' => [ 'class' => AccessControl::className(), - 'only' => ['login', 'logout'], + 'only' => ['logout'], 'rules' => [ [ - 'actions' => ['login'], - 'allow' => true, - 'roles' => ['?'], - ], - [ 'actions' => ['logout'], 'allow' => true, 'roles' => ['@'], @@ -59,6 +54,10 @@ class SiteController extends Controller public function actionLogin() { + if (!\Yii::$app->user->isGuest) { + $this->goHome(); + } + $model = new LoginForm(); if ($model->load($_POST) && $model->login()) { return $this->goBack();