Skip to content

Commit

Permalink
bigfix,Call to a member function validateCsrfToken() on string
Browse files Browse the repository at this point in the history
  • Loading branch information
fancyecommerce committed Jul 12, 2020
1 parent 4692f63 commit b4e3f92
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 50 deletions.
55 changes: 26 additions & 29 deletions app/appadmin/modules/Fecadmin/controllers/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,32 @@ class LoginController extends \fecadmin\controllers\LoginController
public $enableCsrfValidation = true;
public $blockNamespace;

/**
* init theme component property : $fecshopThemeDir and $layoutFile
* $fecshopThemeDir is appfront base theme directory.
* layoutFile is current layout relative path.
*/
public function init()
{
parent::init();
if (!Yii::$service->page->theme->fecshopThemeDir) {
Yii::$service->page->theme->fecshopThemeDir = Yii::getAlias(CConfig::param('appadminBaseTheme'));
}
if (!Yii::$service->page->theme->layoutFile) {
Yii::$service->page->theme->layoutFile = CConfig::param('appadminBaseLayoutName');
}
// 设置本地模板路径
$localThemeDir = Yii::$app->params['localThemeDir'];
if($localThemeDir){
Yii::$service->page->theme->setLocalThemeDir($localThemeDir);
}
/*
* set i18n translate category.
*/
Yii::$service->page->translate->category = 'appadmin';
Yii::$service->page->theme->layoutFile = 'login.php';
}

public function actionIndex()
{
$langCode = Yii::$app->request->get('lang');
Expand Down Expand Up @@ -79,35 +105,6 @@ public function actionChangelang(){
exit;
}



/**
* init theme component property : $fecshopThemeDir and $layoutFile
* $fecshopThemeDir is appfront base theme directory.
* layoutFile is current layout relative path.
*/
public function init()
{
if (!Yii::$service->page->theme->fecshopThemeDir) {
Yii::$service->page->theme->fecshopThemeDir = Yii::getAlias(CConfig::param('appadminBaseTheme'));
}
if (!Yii::$service->page->theme->layoutFile) {
Yii::$service->page->theme->layoutFile = CConfig::param('appadminBaseLayoutName');
}
// 设置本地模板路径
$localThemeDir = Yii::$app->params['localThemeDir'];
if($localThemeDir){
Yii::$service->page->theme->setLocalThemeDir($localThemeDir);
}
/*
* set i18n translate category.
*/
Yii::$service->page->translate->category = 'appadmin';
Yii::$service->page->theme->layoutFile = 'login.php';
}



/**
* @param $view|string , (only) view file name ,by this module id, this controller id , generate view relative path.
* @param $params|Array,
Expand Down
41 changes: 20 additions & 21 deletions app/appadmin/modules/Fecadmin/controllers/LogoutController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,6 @@ class LogoutController extends Controller
public $enableCsrfValidation = true;
public $blockNamespace;

public function actionIndex()
{
$currentLang = Yii::$service->admin->getCurrentLangCode();
$islogout = Yii::$app->request->post('islogout');
if (!$islogout) {
Yii::$service->admin->systemLog->save();
Yii::$service->url->redirectByUrlKey("/fecadmin/login/index", ['lang' => $currentLang]);
}
$isGuest = Yii::$app->user->isGuest;
if(!$isGuest){
Yii::$service->admin->systemLog->save();
Yii::$app->user->logout();
}
Yii::$service->admin->systemLog->save();
Yii::$service->url->redirectByUrlKey("/fecadmin/login/index", ['lang' => $currentLang]);

// Yii::$app->getResponse()->redirect()->send();
//$this->redirect("/fecadmin/login/index",200)->send();
}


/**
* init theme component property : $fecshopThemeDir and $layoutFile
Expand All @@ -54,6 +34,7 @@ public function actionIndex()
*/
public function init()
{
parent::init();
if (!Yii::$service->page->theme->fecshopThemeDir) {
Yii::$service->page->theme->fecshopThemeDir = Yii::getAlias(CConfig::param('appadminBaseTheme'));
}
Expand All @@ -73,9 +54,27 @@ public function init()
* 自定义Yii::$classMap,用于重写
*/
}


public function actionIndex()
{
$currentLang = Yii::$service->admin->getCurrentLangCode();
$islogout = Yii::$app->request->post('islogout');
if (!$islogout) {
Yii::$service->admin->systemLog->save();
Yii::$service->url->redirectByUrlKey("/fecadmin/login/index", ['lang' => $currentLang]);
}
$isGuest = Yii::$app->user->isGuest;
if(!$isGuest){
Yii::$service->admin->systemLog->save();
Yii::$app->user->logout();
}
Yii::$service->admin->systemLog->save();
Yii::$service->url->redirectByUrlKey("/fecadmin/login/index", ['lang' => $currentLang]);

// Yii::$app->getResponse()->redirect()->send();
//$this->redirect("/fecadmin/login/index",200)->send();
}

/**
* @param $view|string , (only) view file name ,by this module id, this controller id , generate view relative path.
* @param $params|Array,
Expand Down

0 comments on commit b4e3f92

Please sign in to comment.