diff --git a/f_config/DB.php b/f_config/DB.php index 0f474331..492b0dae 100644 --- a/f_config/DB.php +++ b/f_config/DB.php @@ -2,7 +2,7 @@ require_once('_common.php'); require_once(ROOT.'/f_config/SETTING.php'); -if($SETTING->isExist()) { +if($SETTING->isExists()) { require_once($SETTING->getSettingFile()); } else { Error('설정 파일이 없습니다. 설정을 먼저 하십시요!'); diff --git a/f_config/MAIL.php b/f_config/MAIL.php index ab5da471..a9b55b2f 100644 --- a/f_config/MAIL.php +++ b/f_config/MAIL.php @@ -3,7 +3,7 @@ require_once('_common.php'); require_once(ROOT.'/f_func/class._Mail.php'); require_once(ROOT.'/f_config/SETTING.php'); -if($SETTING->isExist()) { +if($SETTING->isExists()) { $MAIL = new _Mail(); } else { Error('설정 파일이 없습니다. 설정을 먼저 하십시요!'); diff --git a/f_config/app.php b/f_config/app.php index f4177a50..074af660 100644 --- a/f_config/app.php +++ b/f_config/app.php @@ -17,10 +17,17 @@ define('MEMBER', 'member'); define('MANAGE', 'manage'); define('ICON', 'icon'); -$serverList = [ - 'che'=>['체', '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')] -]; +function getServerConfigList(){ + static $serverList = null; + if($serverList !== null){ + return $serverList; + } + $serverList = [ + 'che'=>['체', '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_func/class._Setting.php b/f_func/class._Setting.php index 830cdf5c..5a043c2f 100644 --- a/f_func/class._Setting.php +++ b/f_func/class._Setting.php @@ -17,7 +17,7 @@ class _Setting { } } - public function isExist() { + public function isExists() { return $this->exist; } diff --git a/f_install/j_create_admin.php b/f_install/j_create_admin.php index 73d01937..7a40dab7 100644 --- a/f_install/j_create_admin.php +++ b/f_install/j_create_admin.php @@ -27,7 +27,7 @@ if(strlen($password)!=128){ ]); } -if(!$SETTING->isExist()){ +if(!$SETTING->isExists()){ returnJson([ 'result'=>false, 'reason'=>'DB 설정이 완료되지 않았습니다.' diff --git a/f_install/j_install_status.php b/f_install/j_install_status.php index 1b9f2078..fb60f7c4 100644 --- a/f_install/j_install_status.php +++ b/f_install/j_install_status.php @@ -17,7 +17,7 @@ function dbSQLFail($params){ ]); } -if(!$SETTING->isExist()){ +if(!$SETTING->isExists()){ returnJson([ 'step'=>'config' ]); diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index c30341cb..41c639ee 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -48,7 +48,7 @@ if(file_exists(ROOT.'/d_setting/conf.php') && is_dir(ROOT.'/d_setting/conf.php') ]); } -if($SETTING->isExist()){ +if($SETTING->isExists()){ returnJson([ 'result'=>false, 'reason'=>'이미 conf.php 파일이 있습니다' diff --git a/i_entrance/adminPost.php b/i_entrance/adminPost.php index 38bdb460..bb6ff2ad 100644 --- a/i_entrance/adminPost.php +++ b/i_entrance/adminPost.php @@ -25,7 +25,7 @@ $db = getRootDB(); $member = $db->queryFirstRow('SELECT `GRADE` FROM `MEMBER` WHERE `NO` = %i', $SESSION->NoMember()); function doServerModeSet($server, $select, &$response){ - global $serverList; + $serverList = getServerConfigList(); $settingObj = $serverList[$server][2]; $serverDir = $settingObj->getShortName(); diff --git a/i_entrance/serverListPost.php b/i_entrance/serverListPost.php index 402496ff..da50350d 100644 --- a/i_entrance/serverListPost.php +++ b/i_entrance/serverListPost.php @@ -6,14 +6,14 @@ require_once(ROOT.'/f_config/SESSION.php'); // 외부 파라미터 $response['server'] = []; -foreach($serverList as $serverInfo){ +foreach(getServerConfigList() as $serverInfo){ list($serverKorName, $serverColor, $setting) = $serverInfo; $serverObj = [ 'color'=>$serverColor, 'korName'=>$serverKorName, 'name'=>$setting->getShortName(), - 'enable'=>$setting->isExist() + 'enable'=>$setting->isExists() ]; $response['server'][] = $serverObj; diff --git a/index.php b/index.php index d0d8779c..b00aac17 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ require('_common.php'); require(ROOT.'/f_config/SETTING.php'); -if(!$SETTING->isExist()){ +if(!$SETTING->isExists()){ header ('Location:install.php'); die(); }