Skip to content

Y
yii2
Commit ca122418 by Johnny Theill
Options

Fixed minor consistency bugs in apps

* Added 'return' to goHome() calls in actions * Changed $_POST to Yii::$app->request->post()
parent 94576de9
Showing with 8 additions and 8 deletions
apps/advanced/backend/controllers/SiteController.php
...@@ -54,11 +54,11 @@ class SiteController extends Controller ...@@ -54,11 +54,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', [
......
apps/advanced/frontend/controllers/SiteController.php
...@@ -65,7 +65,7 @@ class SiteController extends Controller ...@@ -65,7 +65,7 @@ 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();
...@@ -87,7 +87,7 @@ class SiteController extends Controller ...@@ -87,7 +87,7 @@ 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('success', 'Thank you for contacting us. We will respond to you as soon as possible.'); Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
return $this->refresh(); return $this->refresh();
} else { } else {
...@@ -144,7 +144,7 @@ class SiteController extends Controller ...@@ -144,7 +144,7 @@ class SiteController extends Controller
throw new BadRequestHttpException($e->getMessage()); throw new BadRequestHttpException($e->getMessage());
} }
if ($model->load($_POST) && $model->resetPassword()) { if ($model->load(Yii::$app->request->post()) && $model->resetPassword()) {
Yii::$app->getSession()->setFlash('success', 'New password was saved.'); Yii::$app->getSession()->setFlash('success', 'New password was saved.');
return $this->goHome(); return $this->goHome();
} }
......
apps/basic/controllers/SiteController.php
...@@ -55,11 +55,11 @@ class SiteController extends Controller ...@@ -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', [
...@@ -77,7 +77,7 @@ class SiteController extends Controller ...@@ -77,7 +77,7 @@ 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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment