From 2cf6d0f01ae2b7c4cbb2a96b8878340824bbfc6c Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 24 Mar 2018 22:50:46 +0900 Subject: [PATCH] =?UTF-8?q?f=5Fconfig/app.php=20=EC=82=AD=EC=A0=9C,=20AppC?= =?UTF-8?q?onf=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _common.php | 2 -- d_setting/_common.php | 2 -- f_config/DB.php | 7 ++---- f_config/MAIL.php | 14 ----------- f_config/SETTING.php | 8 ------ f_config/_common.php | 2 -- f_config/app.php | 21 ---------------- f_config/config.php | 6 +++-- f_func/_common.php | 2 -- f_install/_common.php | 2 -- f_install/j_create_admin.php | 5 +--- f_install/j_install_status.php | 5 +--- f_install/j_setup_db.php | 5 +--- f_retrival/_common.php | 3 --- i_entrance/_common.php | 2 -- i_entrance/j_icon_change.php | 2 +- i_entrance/j_icon_delete.php | 2 +- i_entrance/j_server_change_status.php | 2 +- i_entrance/j_server_get_admin_status.php | 2 +- i_entrance/j_server_get_status.php | 2 +- i_entrance/member/_common.php | 3 --- i_entrance/templates/_common.php | 2 -- i_other/_common.php | 2 -- i_popup/_common.php | 2 -- index.php | 3 +-- oauth_kakao/_common.php | 2 -- oauth_kakao/lib.join.php | 1 - src/sammo/AppConf.php | 31 ++++++++++++++++++++++++ src/sammo/Lock.php | 2 +- src/sammo/Session.php | 2 +- src/sammo/Setting.php | 2 +- twe/d_setting/_common.php | 3 +-- twe/j_get_scenario_map.php | 2 +- 33 files changed, 51 insertions(+), 102 deletions(-) delete mode 100644 f_config/MAIL.php delete mode 100644 f_config/SETTING.php delete mode 100644 f_config/app.php create mode 100644 src/sammo/AppConf.php diff --git a/_common.php b/_common.php index 6d97a2ce..8995fdb1 100644 --- a/_common.php +++ b/_common.php @@ -5,7 +5,5 @@ if(!defined('ROOT')){ define('ROOT', '.'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/d_setting/_common.php b/d_setting/_common.php index eda7793e..3f61761b 100644 --- a/d_setting/_common.php +++ b/d_setting/_common.php @@ -5,7 +5,5 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/f_config/DB.php b/f_config/DB.php index f1195da0..b7839b58 100644 --- a/f_config/DB.php +++ b/f_config/DB.php @@ -1,11 +1,8 @@ isExists()) { - require_once($SETTING->getSettingFile()); +if(AppConf::getRoot()->isExists()) { + require_once(AppConf::getRoot()->getSettingFile()); } else { Error('설정 파일이 없습니다. 설정을 먼저 하십시요!'); } diff --git a/f_config/MAIL.php b/f_config/MAIL.php deleted file mode 100644 index 92f842ec..00000000 --- a/f_config/MAIL.php +++ /dev/null @@ -1,14 +0,0 @@ -isExists()) { - $MAIL = new _Mail(); -} else { - Error('설정 파일이 없습니다. 설정을 먼저 하십시요!'); -} - - diff --git a/f_config/SETTING.php b/f_config/SETTING.php deleted file mode 100644 index ec98498f..00000000 --- a/f_config/SETTING.php +++ /dev/null @@ -1,8 +0,0 @@ -['체', 'white', new Setting(__DIR__.'/../che')], - 'kwe'=>['퀘', 'yellow', new Setting(__DIR__.'/../kwe')], - 'pwe'=>['풰', 'orange', new Setting(__DIR__.'/../pwe')], - 'twe'=>['퉤', 'magenta', new Setting(__DIR__.'/../twe')], - 'hwe'=>['훼', 'red', new Setting(__DIR__.'/../hwe')] - ]; - return $serverList; -} \ No newline at end of file diff --git a/f_config/config.php b/f_config/config.php index 2a18d862..47940f91 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -3,9 +3,11 @@ namespace sammo; ob_start(); require(__dir__.'/../vendor/autoload.php'); +require_once(__dir__.'/func.php'); + + + define('__LINE__',__FILE__." ".__FUNCTION__." ".__LINE__." : "); - - define('IMAGE', '../../image'); define('IMAGES', '../../images'); //define('IMAGE', 'http://115.68.28.99/image'); diff --git a/f_func/_common.php b/f_func/_common.php index 65a25333..3b772d94 100644 --- a/f_func/_common.php +++ b/f_func/_common.php @@ -5,8 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/f_install/_common.php b/f_install/_common.php index 65a25333..3b772d94 100644 --- a/f_install/_common.php +++ b/f_install/_common.php @@ -5,8 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/f_install/j_create_admin.php b/f_install/j_create_admin.php index 96cac77d..b923d3db 100644 --- a/f_install/j_create_admin.php +++ b/f_install/j_create_admin.php @@ -3,9 +3,6 @@ namespace sammo; require('_common.php'); -require(__DIR__.'/../f_config/SETTING.php'); - - session_start(); session_destroy(); @@ -28,7 +25,7 @@ if(strlen($password)!=128){ ]); } -if(!$SETTING->isExists()){ +if(!AppConf::getRoot()->isExists()){ Json::die([ 'result'=>false, 'reason'=>'DB 설정이 완료되지 않았습니다.' diff --git a/f_install/j_install_status.php b/f_install/j_install_status.php index 93b8f66c..3925b1df 100644 --- a/f_install/j_install_status.php +++ b/f_install/j_install_status.php @@ -3,9 +3,6 @@ namespace sammo; require('_common.php'); -require(__DIR__.'/../f_config/SETTING.php'); - - function dbConnFail($params){ Json::die([ @@ -19,7 +16,7 @@ function dbSQLFail($params){ ]); } -if(!$SETTING->isExists()){ +if(!AppConf::getRoot()->isExists()){ Json::die([ 'step'=>'config' ]); diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index af16ffae..0549fca8 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -2,9 +2,6 @@ namespace sammo; require('_common.php'); -require(__DIR__.'/../f_config/SETTING.php'); - - function dbConnFail($params){ Json::die([ @@ -48,7 +45,7 @@ if(file_exists(ROOT.'/d_setting/conf.php') && is_dir(ROOT.'/d_setting/conf.php') ]); } -if($SETTING->isExists()){ +if(AppConf::getRoot()->isExists()){ Json::die([ 'result'=>false, 'reason'=>'이미 conf.php 파일이 있습니다' diff --git a/f_retrival/_common.php b/f_retrival/_common.php index 0ae420c4..d30e09aa 100644 --- a/f_retrival/_common.php +++ b/f_retrival/_common.php @@ -5,8 +5,5 @@ if(!defined('ROOT')){ define('ROOT', '.'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); - CustomHeader(); diff --git a/i_entrance/_common.php b/i_entrance/_common.php index 0ad8a1c4..fd0be5ff 100644 --- a/i_entrance/_common.php +++ b/i_entrance/_common.php @@ -6,8 +6,6 @@ if(!defined('ROOT')){ } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index ffc180f9..322a53c4 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -91,7 +91,7 @@ if(!is_uploaded_file($image['tmp_name'])) { $servers = []; - foreach(getServerConfigList() as $key=>$server){ + foreach(AppConf::getList() as $key=>$server){ $setting = $server[2]; if($setting->isExists()){ $servers[] = $key; diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index f9da4a7d..04d27524 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -46,7 +46,7 @@ if($dt == $rf) { $servers = []; - foreach(getServerConfigList() as $key=>$server){ + foreach(AppConf::getList() as $key=>$server){ $setting = $server[2]; if($setting->isExists()){ $servers[] = $key; diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php index 4ca987a6..12c3fb1c 100644 --- a/i_entrance/j_server_change_status.php +++ b/i_entrance/j_server_change_status.php @@ -32,7 +32,7 @@ if($userGrade < 6) { } function doServerModeSet($server, $action, &$response){ - $serverList = getServerConfigList(); + $serverList = AppConf::getList(); $settingObj = $serverList[$server][2]; $serverDir = $settingObj->getShortName(); diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index b78577b4..8d98eddd 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -11,7 +11,7 @@ $result = []; session_write_close(); -foreach (getServerConfigList() as $server) { +foreach (AppConf::getList() as $server) { list($serverKorName, $serverColor, $setting) = $server; $serverPath = $setting->getBasePath(); diff --git a/i_entrance/j_server_get_status.php b/i_entrance/j_server_get_status.php index 29597ba4..997f968d 100644 --- a/i_entrance/j_server_get_status.php +++ b/i_entrance/j_server_get_status.php @@ -7,7 +7,7 @@ require_once(ROOT.'/f_config/DB.php'); // 외부 파라미터 $response['server'] = []; -foreach(getServerConfigList() as $serverInfo){ +foreach(AppConf::getList() as $serverInfo){ list($serverKorName, $serverColor, $setting) = $serverInfo; $serverObj = [ diff --git a/i_entrance/member/_common.php b/i_entrance/member/_common.php index 46675331..98363885 100644 --- a/i_entrance/member/_common.php +++ b/i_entrance/member/_common.php @@ -5,8 +5,5 @@ if(!defined('ROOT')){ define('ROOT', '../..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); - CustomHeader(); diff --git a/i_entrance/templates/_common.php b/i_entrance/templates/_common.php index d605ef38..be0bb3e7 100644 --- a/i_entrance/templates/_common.php +++ b/i_entrance/templates/_common.php @@ -6,8 +6,6 @@ if(!defined('ROOT')){ } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/i_other/_common.php b/i_other/_common.php index 65a25333..3b772d94 100644 --- a/i_other/_common.php +++ b/i_other/_common.php @@ -5,8 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/i_popup/_common.php b/i_popup/_common.php index 65a25333..3b772d94 100644 --- a/i_popup/_common.php +++ b/i_popup/_common.php @@ -5,8 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/index.php b/index.php index 2baae005..c2d41615 100644 --- a/index.php +++ b/index.php @@ -3,9 +3,8 @@ namespace sammo; require('d_setting/conf_kakao.php'); require('_common.php'); -require(ROOT.'/f_config/SETTING.php'); -if(!$SETTING->isExists()){ +if(!AppConf::getRoot()->isExists()){ header ('Location:install.php'); die(); } diff --git a/oauth_kakao/_common.php b/oauth_kakao/_common.php index 65a25333..3b772d94 100644 --- a/oauth_kakao/_common.php +++ b/oauth_kakao/_common.php @@ -5,8 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); CustomHeader(); diff --git a/oauth_kakao/lib.join.php b/oauth_kakao/lib.join.php index 786c95b5..f6f7e245 100644 --- a/oauth_kakao/lib.join.php +++ b/oauth_kakao/lib.join.php @@ -3,7 +3,6 @@ namespace sammo; require_once('_common.php'); require_once(__dir__.'/../d_setting/conf.php'); -require_once(__dir__.'/../f_func/func.php'); function checkUsernameDup($username){ if(!$username){ diff --git a/src/sammo/AppConf.php b/src/sammo/AppConf.php new file mode 100644 index 00000000..a4a5a139 --- /dev/null +++ b/src/sammo/AppConf.php @@ -0,0 +1,31 @@ +['체', 'white', new Setting(ROOT.'/che')], + 'kwe'=>['퀘', 'yellow', new Setting(ROOT.'/kwe')], + 'pwe'=>['풰', 'orange', new Setting(ROOT.'/pwe')], + 'twe'=>['퉤', 'magenta', new Setting(ROOT.'/twe')], + 'hwe'=>['훼', 'red', new Setting(ROOT.'/hwe')] + ]; + } + return self::$serverList; + } + + public static function getRoot(){ + if(self::$rootSetting === null){ + self::$rootSetting = new Setting(ROOT); + } + return self::$rootSetting; + } +} \ No newline at end of file diff --git a/src/sammo/Lock.php b/src/sammo/Lock.php index 72e5c6d6..fa2aed00 100644 --- a/src/sammo/Lock.php +++ b/src/sammo/Lock.php @@ -2,7 +2,7 @@ namespace sammo; if(!defined('ROOT')){ - define('ROOT', '..'); + define('ROOT', '../..'); } class Lock { private static $l = ROOT.'/d_log/lock.txt'; diff --git a/src/sammo/Session.php b/src/sammo/Session.php index 116c098f..71a6774b 100644 --- a/src/sammo/Session.php +++ b/src/sammo/Session.php @@ -2,7 +2,7 @@ namespace sammo; if(!defined('ROOT')){ - define('ROOT', '..'); + define('ROOT', '../..'); } class Session { diff --git a/src/sammo/Setting.php b/src/sammo/Setting.php index 04234f42..51c5d744 100644 --- a/src/sammo/Setting.php +++ b/src/sammo/Setting.php @@ -6,7 +6,7 @@ class Setting { private $settingFile; private $exist = false; - public function __construct($basepath) { + public function __construct($basepath = __DIR__.'/../..') { $this->basepath = $basepath; $this->settingFile = realpath($basepath.'/d_setting/conf.php'); diff --git a/twe/d_setting/_common.php b/twe/d_setting/_common.php index 3dced746..7d110f05 100644 --- a/twe/d_setting/_common.php +++ b/twe/d_setting/_common.php @@ -5,7 +5,6 @@ if(!defined('ROOT')){ define('ROOT', '../..'); } require_once(ROOT.'/f_config/config.php'); -require_once(ROOT.'/f_config/app.php'); -require_once(ROOT.'/f_func/func.php'); + CustomHeader(); diff --git a/twe/j_get_scenario_map.php b/twe/j_get_scenario_map.php index ec3034ee..e3f2b4fb 100644 --- a/twe/j_get_scenario_map.php +++ b/twe/j_get_scenario_map.php @@ -2,7 +2,7 @@ namespace sammo; -require(__DIR__.'/../f_func/func.php'); +require(__DIR__.'/../f_func/config.php'); require('func_install.php'); $session = Session::requireLogin();