devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

f_config/DB.php 제거

Browse Source 
class_exists('RootDB')로 대체 가능
This commit is contained in:
Hide_D
2018-03-25 00:21:06 +09:00
parent 9e1aadf486
commit d777ca97c6
23 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
f_config/DB.php
-8
View File
@@ -1,8 +0,0 @@
<?php
namespace sammo;
if(AppConf::getRoot()->isExists()) {
require_once(AppConf::getRoot()->getSettingFile());
} else {
Error('설정 파일이 없습니다. 설정을 먼저 하십시요!');
}
f_config/config.php
+1 -1
View File
@@ -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');
f_install/j_create_admin.php
+1 -2
View File
@@ -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();
//초기 관리자 계정은 딱 하나만 있어야하므로, 중요함.
f_install/j_install_status.php
+1 -2
View File
@@ -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;
f_install/j_setup_db.php
+1 -1
View File
@@ -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 파일이 있습니다'
i_entrance/admin_userlist.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
$db = RootDB::db();
i_entrance/entrance.php
+1 -1
View File
@@ -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');
i_entrance/j_change_password.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
i_entrance/j_delete_me.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
i_entrance/j_get_user_info.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
i_entrance/j_icon_change.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
i_entrance/j_icon_delete.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
i_entrance/j_logout.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
// 외부 파라미터
i_entrance/j_server_change_status.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
i_entrance/j_server_get_admin_status.php
-1
View File
@@ -4,7 +4,6 @@ namespace sammo;
// 외부 파라미터
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
$result = [];
i_entrance/j_server_get_status.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
// 외부 파라미터
$response['server'] = [];
i_entrance/member/Get.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
i_entrance/member/Post.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::requireLogin();
// 외부 파라미터
index.php
+1 -3
View File
@@ -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();
j_login.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
oauth_kakao/j_change_pw.php
-1
View File
@@ -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;
oauth_kakao/j_login_oauth.php
-2
View File
@@ -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;
src/sammo/AppConf.php
+23 -5
View File
@@ -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();
}
}