diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php deleted file mode 100644 index 1d4aed6..0000000 --- a/app/Controllers/Admin/AdminController.php +++ /dev/null @@ -1,36 +0,0 @@ -_datas[SESSION['NAMES']['ISLOGIN']] = false; - $this->_datas['currentRoles'] = [DEFAULTS["ROLE"]]; - if ($this->_session->get(SESSION['NAMES']['ISLOGIN'])) { - $this->_datas[SESSION['NAMES']['ISLOGIN']] = true; - $this->_datas['auth'] = $this->_session->get(SESSION['NAMES']['AUTH']); - $currentRoles = explode(DEFAULTS['DELIMITER_ROLE'], $this->_datas['auth'][AUTH['FIELDS']['ROLE']]); - $this->_datas['currentRoles'] = is_array($currentRoles) ? $currentRoles : [DEFAULTS["ROLE"]]; - } - } - - final public function __get($name): array|null - { - if (!array_key_exists($name, $this->_datas)) { - return null; - } - return $this->_datas; - } - - final public function __set($name, $value): void - { - $this->_datas[$name] = $value; - } -} diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php deleted file mode 100644 index 9f5471d..0000000 --- a/app/Controllers/Admin/Home.php +++ /dev/null @@ -1,11 +0,0 @@ -_datas)) { + return null; + } + return $this->_datas; + } + + final public function __set($name, $value): void + { + $this->_datas[$name] = $value; + } +} diff --git a/app/Controllers/Mangboard/Admin/UserController.php b/app/Controllers/Mangboard/Admin/UserController.php index b1cbf4f..e82b487 100644 --- a/app/Controllers/Mangboard/Admin/UserController.php +++ b/app/Controllers/Mangboard/Admin/UserController.php @@ -2,13 +2,16 @@ namespace App\Controllers\Mangboard\Admin; -use App\Controllers\Admin\AdminController; +use App\Controllers\CommonController; use App\Models\Mangboard\UserModel; +use App\Trait\AuthTrait; -class UserController extends AdminController +class UserController extends CommonController { + use AuthTrait; public function __construct() { + $this->_datas['session'] = $this->login_check(); parent::__construct(); } diff --git a/app/Traits/AuthTrait.php b/app/Traits/AuthTrait.php new file mode 100644 index 0000000..3faed92 --- /dev/null +++ b/app/Traits/AuthTrait.php @@ -0,0 +1,21 @@ +_session->get(SESSION['NAMES']['ISLOGIN'])) { + $session[SESSION['NAMES']['ISLOGIN']] = true; + $session['auth'] = $this->_session->get(SESSION['NAMES']['AUTH']); + $currentRoles = explode(DEFAULTS['DELIMITER_ROLE'], $session['auth'][AUTH['FIELDS']['ROLE']]); + $session['currentRoles'] = is_array($currentRoles) ? $currentRoles : [DEFAULTS["ROLE"]]; + } + return $session; + } +}