diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php index 8094773..46ce858 100644 --- a/app/Controllers/Admin/AdminController.php +++ b/app/Controllers/Admin/AdminController.php @@ -12,8 +12,7 @@ class AdminController extends BASEController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= 'Admin'; - $this->_viewPath = strtolower($this->_className); + $this->_viewPath = strtolower('Admin/'); $this->_viewDatas['layout'] = LAYOUTS['admin']; $this->_viewDatas['title'] = "관리자페이지"; } diff --git a/app/Controllers/Admin/AdminHierarchyController.php b/app/Controllers/Admin/AdminHierarchyController.php index 18a5501..6d5f9ed 100644 --- a/app/Controllers/Admin/AdminHierarchyController.php +++ b/app/Controllers/Admin/AdminHierarchyController.php @@ -5,7 +5,6 @@ namespace App\Controllers\Admin; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; -use App\Libraries\Log\Log; abstract class AdminHierarchyController extends AdminController { diff --git a/app/Controllers/Admin/BoardConfigController.php b/app/Controllers/Admin/BoardConfigController.php index 8779e10..7eace82 100644 --- a/app/Controllers/Admin/BoardConfigController.php +++ b/app/Controllers/Admin/BoardConfigController.php @@ -12,10 +12,10 @@ class BoardConfigController extends AdminController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= '/BoardConfig'; + $this->_className .= 'BoardConfig'; $this->_model = new BoardConfigModel(); helper($this->_className); - $this->_viewPath = strtolower($this->_className); + $this->_viewPath .= strtolower($this->_className); $this->_viewDatas['title'] = lang($this->_className . '.title'); $this->_viewDatas['className'] = $this->_className; } diff --git a/app/Controllers/Admin/BoardController.php b/app/Controllers/Admin/BoardController.php index ff5c886..739945e 100644 --- a/app/Controllers/Admin/BoardController.php +++ b/app/Controllers/Admin/BoardController.php @@ -15,10 +15,10 @@ class BoardController extends AdminHierarchyController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= '/Board'; + $this->_className .= 'Board'; $this->_model = new BoardModel(); helper($this->_className); - $this->_viewPath = strtolower($this->_className); + $this->_viewPath .= strtolower($this->_className); $this->_viewDatas['title'] = lang($this->_className . '.title'); $this->_viewDatas['className'] = $this->_className; } diff --git a/app/Controllers/Admin/HPILOController.php b/app/Controllers/Admin/HPILOController.php index 60ff711..0e7836b 100644 --- a/app/Controllers/Admin/HPILOController.php +++ b/app/Controllers/Admin/HPILOController.php @@ -15,10 +15,10 @@ class HPILOController extends \App\Controllers\Admin\AdminController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= '/HPILO'; + $this->_className .= 'HPILO'; $this->_model = new HPILOModel(); helper($this->_className); - $this->_viewPath = strtolower($this->_className); + $this->_viewPath .= strtolower($this->_className); $this->_viewDatas['title'] = lang($this->_className . '.title'); $this->_viewDatas['className'] = $this->_className; } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 00ebf45..0a316e2 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -12,10 +12,10 @@ class UserController extends AdminController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= '/User'; + $this->_className .= 'User'; $this->_model = new UserModel(); helper($this->_className); - $this->_viewPath = strtolower($this->_className); + $this->_viewPath .= strtolower($this->_className); $this->_viewDatas['title'] = lang($this->_className . '.title'); $this->_viewDatas['className'] = $this->_className; } diff --git a/app/Controllers/Admin/UserSNSController.php b/app/Controllers/Admin/UserSNSController.php index 0fe6602..eaad763 100644 --- a/app/Controllers/Admin/UserSNSController.php +++ b/app/Controllers/Admin/UserSNSController.php @@ -12,10 +12,10 @@ class UserSNSController extends AdminController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_className .= '/UserSNS'; + $this->_className .= 'UserSNS'; $this->_model = new UserSNSModel(); helper($this->_className); - $this->_viewPath = strtolower($this->_className); + $this->_viewPath .= strtolower($this->_className); $this->_viewDatas['title'] = lang($this->_className . '.title'); $this->_viewDatas['className'] = $this->_className; } diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 924e29f..2202f0f 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -51,8 +51,8 @@ abstract class BaseController extends Controller private $_userModel = null; private $_user_uids = array(); protected $_model = null; - protected $_className = ''; - protected $_viewPath = ''; + protected $_className = '/'; + protected $_viewPath = '/'; protected $_viewDatas = array(); protected $_session = null; public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) diff --git a/app/Controllers/Front/FrontController.php b/app/Controllers/Front/FrontController.php index 89d5312..6c64e8e 100644 --- a/app/Controllers/Front/FrontController.php +++ b/app/Controllers/Front/FrontController.php @@ -12,7 +12,7 @@ class FrontController extends BASEController public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { parent::initController($request, $response, $logger); - $this->_viewPath = $this->_viewPath . '/front'; + $this->_viewPath = strtolower('Front/'); $this->_viewDatas['layout'] = LAYOUTS['front']; $this->_viewDatas['title'] = "사용자페이지"; } diff --git a/app/Helpers/Admin/BoardConfig_helper.php b/app/Helpers/BoardConfig_helper.php similarity index 100% rename from app/Helpers/Admin/BoardConfig_helper.php rename to app/Helpers/BoardConfig_helper.php diff --git a/app/Helpers/Admin/Board_helper.php b/app/Helpers/Board_helper.php similarity index 100% rename from app/Helpers/Admin/Board_helper.php rename to app/Helpers/Board_helper.php diff --git a/app/Helpers/Admin/HPILO_helper.php b/app/Helpers/HPILO_helper.php similarity index 100% rename from app/Helpers/Admin/HPILO_helper.php rename to app/Helpers/HPILO_helper.php diff --git a/app/Helpers/Admin/UserSNS_helper.php b/app/Helpers/UserSNS_helper.php similarity index 100% rename from app/Helpers/Admin/UserSNS_helper.php rename to app/Helpers/UserSNS_helper.php diff --git a/app/Helpers/Admin/User_helper.php b/app/Helpers/User_helper.php similarity index 100% rename from app/Helpers/Admin/User_helper.php rename to app/Helpers/User_helper.php diff --git a/app/Language/kr/Admin/Board.php b/app/Language/kr/Board.php similarity index 100% rename from app/Language/kr/Admin/Board.php rename to app/Language/kr/Board.php diff --git a/app/Language/kr/Admin/BoardConfig.php b/app/Language/kr/BoardConfig.php similarity index 100% rename from app/Language/kr/Admin/BoardConfig.php rename to app/Language/kr/BoardConfig.php diff --git a/app/Language/kr/Admin/HPILO.php b/app/Language/kr/HPILO.php similarity index 100% rename from app/Language/kr/Admin/HPILO.php rename to app/Language/kr/HPILO.php diff --git a/app/Language/kr/Admin/User.php b/app/Language/kr/User.php similarity index 100% rename from app/Language/kr/Admin/User.php rename to app/Language/kr/User.php diff --git a/app/Language/kr/Admin/UserSNS.php b/app/Language/kr/UserSNS.php similarity index 100% rename from app/Language/kr/Admin/UserSNS.php rename to app/Language/kr/UserSNS.php diff --git a/app/Language/kr/Admin/Validation.php b/app/Language/kr/Validation.php similarity index 100% rename from app/Language/kr/Admin/Validation.php rename to app/Language/kr/Validation.php