diff --git a/f_config/DB.php b/f_config/DB.php deleted file mode 100644 index b7839b58..00000000 --- a/f_config/DB.php +++ /dev/null @@ -1,8 +0,0 @@ -isExists()) { - require_once(AppConf::getRoot()->getSettingFile()); -} else { - Error('설정 파일이 없습니다. 설정을 먼저 하십시요!'); -} diff --git a/f_config/config.php b/f_config/config.php index 47940f91..78dbd4eb 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -3,7 +3,7 @@ namespace sammo; ob_start(); require(__dir__.'/../vendor/autoload.php'); -require_once(__dir__.'/func.php'); +require_once(__dir__.'/../f_func/func.php'); diff --git a/f_install/j_create_admin.php b/f_install/j_create_admin.php index 2a2d36c0..02bf93ca 100644 --- a/f_install/j_create_admin.php +++ b/f_install/j_create_admin.php @@ -25,14 +25,13 @@ if(strlen($password)!=128){ ]); } -if(!AppConf::getRoot()->isExists()){ +if(!class_exists('RootDB')){ Json::die([ 'result'=>false, 'reason'=>'DB 설정이 완료되지 않았습니다.' ]); } -require(__DIR__.'/../f_config/DB.php'); $rootDB = RootDB::db(); //초기 관리자 계정은 딱 하나만 있어야하므로, 중요함. diff --git a/f_install/j_install_status.php b/f_install/j_install_status.php index e3d91703..cdda4c26 100644 --- a/f_install/j_install_status.php +++ b/f_install/j_install_status.php @@ -16,13 +16,12 @@ function dbSQLFail($params){ ]); } -if(!AppConf::getRoot()->isExists()){ +if(!class_exists('RootDB')){ Json::die([ 'step'=>'config' ]); } -require(__DIR__.'/../f_config/DB.php'); $rootDB = RootDB::db(); $rootDB->throw_exception_on_nonsql_error = false; diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index 9d3afffd..b8f177b7 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -45,7 +45,7 @@ if(file_exists(ROOT.'/d_setting/RootDB.php') && is_dir(ROOT.'/d_setting/RootDB.p ]); } -if(AppConf::getRoot()->isExists()){ +if(class_exists('RootDB')){ Json::die([ 'result'=>false, 'reason'=>'이미 RootDB.php 파일이 있습니다' diff --git a/i_entrance/admin_userlist.php b/i_entrance/admin_userlist.php index a8462738..d149a938 100644 --- a/i_entrance/admin_userlist.php +++ b/i_entrance/admin_userlist.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::requireLogin(); $db = RootDB::db(); diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index 75c4a988..e04eb3ea 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -2,7 +2,7 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); + $session = Session::requireLogin(); $templates = new \League\Plates\Engine('templates'); diff --git a/i_entrance/j_change_password.php b/i_entrance/j_change_password.php index a00b3f29..dd02cc7f 100644 --- a/i_entrance/j_change_password.php +++ b/i_entrance/j_change_password.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::Instance(); diff --git a/i_entrance/j_delete_me.php b/i_entrance/j_delete_me.php index cbf7d165..f9ee7408 100644 --- a/i_entrance/j_delete_me.php +++ b/i_entrance/j_delete_me.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::Instance(); diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php index 1b1f5b72..9c9dfb24 100644 --- a/i_entrance/j_get_user_info.php +++ b/i_entrance/j_get_user_info.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::Instance(); diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index 45f93cc1..bedb2c2e 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::Instance(); diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index 80ea67ae..f86a2079 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::Instance(); diff --git a/i_entrance/j_logout.php b/i_entrance/j_logout.php index fc02c9fb..746cb035 100644 --- a/i_entrance/j_logout.php +++ b/i_entrance/j_logout.php @@ -2,7 +2,7 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); + $session = Session::requireLogin(); // 외부 파라미터 diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php index c73d63ae..e0541bdf 100644 --- a/i_entrance/j_server_change_status.php +++ b/i_entrance/j_server_change_status.php @@ -2,7 +2,7 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); + $session = Session::requireLogin(); diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index 8d98eddd..574ae28c 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -4,7 +4,6 @@ namespace sammo; // 외부 파라미터 require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::requireLogin(); $result = []; diff --git a/i_entrance/j_server_get_status.php b/i_entrance/j_server_get_status.php index 997f968d..ec1f1d76 100644 --- a/i_entrance/j_server_get_status.php +++ b/i_entrance/j_server_get_status.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); // 외부 파라미터 $response['server'] = []; diff --git a/i_entrance/member/Get.php b/i_entrance/member/Get.php index 430d0215..4dd05c29 100644 --- a/i_entrance/member/Get.php +++ b/i_entrance/member/Get.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::requireLogin(); diff --git a/i_entrance/member/Post.php b/i_entrance/member/Post.php index d0386fb2..de211d0f 100644 --- a/i_entrance/member/Post.php +++ b/i_entrance/member/Post.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); $session = Session::requireLogin(); // 외부 파라미터 diff --git a/index.php b/index.php index e6845d7a..05f23bc1 100644 --- a/index.php +++ b/index.php @@ -3,13 +3,11 @@ namespace sammo; require('_common.php'); -if(!AppConf::getRoot()->isExists()){ +if(!class_exists('RootDB')){ header ('Location:install.php'); die(); } -require(ROOT.'/f_config/DB.php'); - $session = Session::Instance(); diff --git a/j_login.php b/j_login.php index a24352e3..460799e2 100644 --- a/j_login.php +++ b/j_login.php @@ -2,7 +2,6 @@ namespace sammo; require_once('_common.php'); -require_once(ROOT.'/f_config/DB.php'); diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php index 0693c635..e0ad9076 100644 --- a/oauth_kakao/j_change_pw.php +++ b/oauth_kakao/j_change_pw.php @@ -2,7 +2,6 @@ namespace sammo; require('_common.php'); -require(ROOT.'/f_config/DB.php'); use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php index 94de4d4b..15938654 100644 --- a/oauth_kakao/j_login_oauth.php +++ b/oauth_kakao/j_login_oauth.php @@ -2,8 +2,6 @@ namespace sammo; require('_common.php'); -require(ROOT.'/f_config/DB.php'); -require('kakao.php'); use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; diff --git a/src/sammo/AppConf.php b/src/sammo/AppConf.php index a4a5a139..d88fdb0a 100644 --- a/src/sammo/AppConf.php +++ b/src/sammo/AppConf.php @@ -7,7 +7,6 @@ if(!defined('ROOT')){ class AppConf{ private static $serverList = null; - private static $rootSetting = null; public static function getList(){ if(self::$serverList === null){ @@ -22,10 +21,29 @@ class AppConf{ return self::$serverList; } - public static function getRoot(){ - if(self::$rootSetting === null){ - self::$rootSetting = new Setting(ROOT); + /** + * DB 객체 생성 + * + * @return \MeekroDB + */ + public static function requireRootDB(){ + if(!class_exists('RootDB')){ + trigger_error('RootDB.php가 설정되지 않았습니다.', E_USER_ERROR); + die(); } - return self::$rootSetting; + return RootDB::db(); + } + + /** + * DB 객체 생성 + * + * @return \MeekroDB + */ + public static function requireDB(){ + if(!class_exists('DB')){ + trigger_error('DB.php가 설정되지 않았습니다.', E_USER_ERROR); + die(); + } + return DB::db(); } } \ No newline at end of file