diff --git a/app/Config/Constants.php b/app/Config/Constants.php index b24722f..5bd5c74 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -140,7 +140,7 @@ define('SESSION_NAMES', [ 'ISLOGIN' => "islogined", 'AUTH' => 'auth' ]); -define('AUTH_FIELDS', ['id', 'title', 'role']); +define('AUTH_FIELDS', ['ID' => 'id', 'TITLE' => 'title', 'ROLE' => 'role']); //인증 관련 define('AUTH_ADAPTERS', [ diff --git a/app/Filters/AuthFilter.php b/app/Filters/AuthFilter.php index 211d8f5..48180b9 100644 --- a/app/Filters/AuthFilter.php +++ b/app/Filters/AuthFilter.php @@ -30,11 +30,13 @@ class AuthFilter implements FilterInterface $auth = session()->get(SESSION_NAMES['AUTH']); // dd($auth); // 회원 ROLE이 필요ROLE 목록에 존재하지 않으면(ACL) - if (!in_array($auth['role'], $arguments)) { + if (!in_array($auth[AUTH_FIELDS['ROLE']], $arguments)) { return redirect()->to('/login')->with( 'error', sprintf( - "{$auth['role']},{$$auth['title']}회원님은 접속에 필요한 권한[%s]이 없습니다. ", + "%s,%s회원님은 접속에 필요한 권한[%s]이 없습니다. ", + $auth[AUTH_FIELDS['ROLE']], + $auth[AUTH_FIELDS['TITLE']], implode(",", $arguments) ) ); diff --git a/app/Libraries/Adapter/Auth/Adapter.php b/app/Libraries/Adapter/Auth/Adapter.php index 7b2ec5f..0497d75 100644 --- a/app/Libraries/Adapter/Auth/Adapter.php +++ b/app/Libraries/Adapter/Auth/Adapter.php @@ -50,7 +50,7 @@ abstract class Adapter { $this->_session->set(SESSION_NAMES['ISLOGIN'], true); $auths = []; - foreach (AUTH_FIELDS as $field) { + foreach (AUTH_FIELDS as $key => $field) { switch ($field) { case 'id': $auths[$field] = $entity->getPrimaryKey(); diff --git a/app/Models/BoardModel.php b/app/Models/BoardModel.php index 801948d..a4e4677 100644 --- a/app/Models/BoardModel.php +++ b/app/Models/BoardModel.php @@ -67,7 +67,7 @@ class BoardModel extends CommonModel //로그인 여부 확인후 필요한 데이터 저장 if (session()->get(SESSION_NAMES['ISLOGIN'])) { $auth = session()->get(SESSION_NAMES['AUTH']); - $entity->user_uid = $auth['id']; + $entity->user_uid = $auth[AUTH_FIELDS['ID']]; } foreach ($formDatas as $field => $value) { $entity->$field = $this->changeFormData($field, $value); diff --git a/app/Models/LoggerModel.php b/app/Models/LoggerModel.php index cb91808..5b98918 100644 --- a/app/Models/LoggerModel.php +++ b/app/Models/LoggerModel.php @@ -45,7 +45,7 @@ class LoggerModel extends CommonModel //로그인 여부 확인후 필요한 데이터 저장 if (session()->get(SESSION_NAMES['ISLOGIN'])) { $auth = session()->get(SESSION_NAMES['AUTH']); - $entity->user_uid = $auth['id']; + $entity->user_uid = $auth[AUTH_FIELDS['ID']]; } return parent::create_process($entity); } diff --git a/app/Views/layouts/admin/member_link.php b/app/Views/layouts/admin/member_link.php index a0b5297..ff72dbf 100644 --- a/app/Views/layouts/admin/member_link.php +++ b/app/Views/layouts/admin/member_link.php @@ -3,10 +3,10 @@