Browse Source

Modified application templates so when trying to log in when already logged in it just redirects to homepage instead of throwing exceptions

tags/2.0.0-beta
Alexander Makarov 11 years ago
parent
commit
f2484fd616
  1. 11
      apps/advanced/backend/controllers/SiteController.php
  2. 8
      apps/advanced/frontend/controllers/SiteController.php
  3. 11
      apps/basic/controllers/SiteController.php

11
apps/advanced/backend/controllers/SiteController.php

@ -15,15 +15,10 @@ class SiteController extends Controller
'class' => \yii\web\AccessControl::className(), 'class' => \yii\web\AccessControl::className(),
'rules' => [ 'rules' => [
[ [
'actions' => ['error'], 'actions' => ['login', 'error'],
'allow' => true, 'allow' => true,
], ],
[ [
'actions' => ['login'],
'allow' => true,
'roles' => ['?'],
],
[
'actions' => ['logout', 'index'], 'actions' => ['logout', 'index'],
'allow' => true, 'allow' => true,
'roles' => ['@'], 'roles' => ['@'],
@ -49,6 +44,10 @@ class SiteController extends Controller
public function actionLogin() public function actionLogin()
{ {
if (!\Yii::$app->user->isGuest) {
$this->goHome();
}
$model = new LoginForm(); $model = new LoginForm();
if ($model->load($_POST) && $model->login()) { if ($model->load($_POST) && $model->login()) {
return $this->goHome(); return $this->goHome();

8
apps/advanced/frontend/controllers/SiteController.php

@ -17,10 +17,10 @@ class SiteController extends Controller
return [ return [
'access' => [ 'access' => [
'class' => \yii\web\AccessControl::className(), 'class' => \yii\web\AccessControl::className(),
'only' => ['login', 'logout', 'signup'], 'only' => ['logout', 'signup'],
'rules' => [ 'rules' => [
[ [
'actions' => ['login', 'signup'], 'actions' => ['signup'],
'allow' => true, 'allow' => true,
'roles' => ['?'], 'roles' => ['?'],
], ],
@ -54,6 +54,10 @@ class SiteController extends Controller
public function actionLogin() public function actionLogin()
{ {
if (!\Yii::$app->user->isGuest) {
$this->goHome();
}
$model = new LoginForm(); $model = new LoginForm();
if ($model->load($_POST) && $model->login()) { if ($model->load($_POST) && $model->login()) {
return $this->goHome(); return $this->goHome();

11
apps/basic/controllers/SiteController.php

@ -16,14 +16,9 @@ class SiteController extends Controller
return [ return [
'access' => [ 'access' => [
'class' => AccessControl::className(), 'class' => AccessControl::className(),
'only' => ['login', 'logout'], 'only' => ['logout'],
'rules' => [ 'rules' => [
[ [
'actions' => ['login'],
'allow' => true,
'roles' => ['?'],
],
[
'actions' => ['logout'], 'actions' => ['logout'],
'allow' => true, 'allow' => true,
'roles' => ['@'], 'roles' => ['@'],
@ -59,6 +54,10 @@ class SiteController extends Controller
public function actionLogin() public function actionLogin()
{ {
if (!\Yii::$app->user->isGuest) {
$this->goHome();
}
$model = new LoginForm(); $model = new LoginForm();
if ($model->load($_POST) && $model->login()) { if ($model->load($_POST) && $model->login()) {
return $this->goBack(); return $this->goBack();

Loading…
Cancel
Save