Move procAdminLogout to Dashboard controller

This commit is contained in:
Kijin Sung 2022-12-27 00:03:03 +09:00
parent 5d6a16cdf9
commit 9c424f2d6f
3 changed files with 14 additions and 15 deletions

View file

@ -161,18 +161,6 @@ class AdminAdminController extends Admin
$this->setMessage('success_updated');
}
/**
* Logout
* @return void
*/
function procAdminLogout()
{
$oMemberController = getController('member');
$oMemberController->procMemberLogout();
header('Location: ' . getNotEncodedUrl(''));
}
public function procAdminInsertDefaultDesignInfo()
{
$vars = Context::getRequestVars();

View file

@ -3,6 +3,8 @@
<grants />
<actions>
<action name="dispAdminIndex" class="Controllers\Dashboard" index="true" />
<action name="procAdminLogout" class="Controllers\Dashboard" method="GET|POST" />
<action name="dispAdminConfigGeneral" type="view" menu_name="adminConfigurationGeneral" menu_index="true" />
<action name="dispAdminConfigNotification" type="view" menu_name="adminConfigurationGeneral" />
<action name="dispAdminConfigSecurity" type="view" menu_name="adminConfigurationGeneral" />
@ -22,7 +24,6 @@
<action name="procAdminRemoveIcons" type="controller" />
<action name="procAdminRecompileCacheFile" type="controller" />
<action name="procAdminLogout" type="controller" method="GET|POST" />
<action name="procAdminInsertDefaultDesignInfo" type="controller" />
<action name="procAdminToggleFavorite" type="controller" />
<action name="procAdminEnviromentGatheringAgreement" type="controller" />

View file

@ -9,6 +9,7 @@ use DocumentAdminModel;
use DocumentModel;
use CommentModel;
use MemberAdminModel;
use MemberController;
use ModuleModel;
class Dashboard extends Base
@ -16,12 +17,12 @@ class Dashboard extends Base
/**
* Easy install flag file
*/
const EASYINSTALL_FLAG_FILE = 'files/env/easyinstall_last';
public const EASYINSTALL_FLAG_FILE = 'files/env/easyinstall_last';
/**
* Display the dashboard.
*/
function dispAdminIndex()
public function dispAdminIndex()
{
// Get statistics
$args = new \stdClass;
@ -145,6 +146,15 @@ class Dashboard extends Base
Context::set('layout', 'none');
$this->setTemplateFile('index');
}
/**
* Admin logout action.
*/
public function procAdminLogout()
{
MemberController::getInstance()->procMemberLogout();
header('Location: ' . getNotEncodedUrl(''));
}
/**
* Check easy install.