From f7aad28d2c84cd26cf6dd20cd00996aac93037d0 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 5 Feb 2016 15:18:31 +0900 Subject: [PATCH] Remove remaining references to getDBInfo() --- classes/module/ModuleHandler.class.php | 7 +++---- classes/security/EmbedFilter.class.php | 10 ++++------ modules/admin/admin.admin.model.php | 7 +++---- modules/admin/admin.admin.view.php | 17 ++--------------- modules/document/document.class.php | 5 ++--- modules/importer/importer.admin.controller.php | 3 +-- modules/member/member.admin.model.php | 4 +--- modules/member/member.model.php | 6 ++---- modules/menu/menu.admin.controller.php | 5 ++--- modules/module/module.admin.controller.php | 5 ++--- modules/module/module.class.php | 6 ++---- modules/module/module.model.php | 3 +-- 12 files changed, 25 insertions(+), 53 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index dfff58125..afe01ad47 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -136,7 +136,7 @@ class ModuleHandler extends Handler $urlInfo = parse_url($url); $host = $urlInfo['host']; - $defaultUrl = Context::getDBInfo()->default_url; + $defaultUrl = Context::getDefaultUrl(); if($defaultUrl) { $defaultUrlInfo = parse_url($defaultUrl); @@ -240,8 +240,7 @@ class ModuleHandler extends Handler } else { - $db_info = Context::getDBInfo(); - if(!$db_info->default_url) + if(!Context::getDefaultUrl()) { return Context::getLang('msg_default_url_is_not_defined'); } @@ -250,7 +249,7 @@ class ModuleHandler extends Handler $redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid', Context::get('mid'), 'document_srl', Context::get('document_srl'), 'module_srl', Context::get('module_srl'), 'entry', Context::get('entry')); } } - header("location:" . $redirect_url); + header("Location: $redirect_url"); return FALSE; } diff --git a/classes/security/EmbedFilter.class.php b/classes/security/EmbedFilter.class.php index f82bdc0f5..12c98da94 100644 --- a/classes/security/EmbedFilter.class.php +++ b/classes/security/EmbedFilter.class.php @@ -394,18 +394,16 @@ class EmbedFilter { $this->whiteIframeUrlList[] = $prefix; } - - $db_info = Context::getDBInfo(); - if(isset($db_info->embed_white_object) && count($db_info->embed_white_object)) + if ($embedfilter_object = config('embedfilter.object')) { - foreach ($db_info->embed_white_object as $prefix) + foreach ($embedfilter_object as $prefix) { $this->whiteUrlList[] = preg_match('@^https?://(.*)$@i', $prefix, $matches) ? $matches[1] : $prefix; } } - if(isset($db_info->embed_white_iframe) && count($db_info->embed_white_iframe)) + if ($embedfilter_iframe = config('embedfilter.iframe')) { - foreach ($db_info->embed_white_iframe as $prefix) + foreach ($embedfilter_iframe as $prefix) { $this->whiteIframeUrlList[] = preg_match('@^https?://(.*)$@i', $prefix, $matches) ? $matches[1] : $prefix; } diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 10cffb366..55e2b2e61 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -401,7 +401,6 @@ class adminAdminModel extends admin , 'widgetstyle' => array(), ); $info = array(); - $db_info = Context::getDBInfo(); $info['type'] = ($type != 'INSTALL' ? 'WORKING' : 'INSTALL'); $info['location'] = _XE_LOCATION_; @@ -412,9 +411,9 @@ class adminAdminModel extends admin $info['php'] = phpversion(); $info['db_type'] = Context::getDBType(); - $info['use_rewrite'] = $db_info->use_rewrite; - $info['use_db_session'] = $db_info->use_db_session == 'Y' ? 'Y' : 'N'; - $info['use_ssl'] = $db_info->use_ssl; + $info['use_rewrite'] = config('use_rewrite') ? 'Y' : 'N'; + $info['use_db_session'] = config('session.use_db') ? 'Y' : 'N'; + $info['use_ssl'] = config('url.ssl') ?: 'none'; $info['phpext'] = ''; foreach(get_loaded_extensions() as $ext) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 7992d3dbc..c5692752b 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -26,17 +26,7 @@ class adminAdminView extends admin function __construct() { - $db_info = Context::getDBInfo(); - - if(strpos($db_info->default_url, 'xn--') !== FALSE) - { - $xe_default_url = Context::decodeIdna($db_info->default_url); - } - else - { - $xe_default_url = $db_info->default_url; - } - Context::set('xe_default_url', $xe_default_url); + Context::set('xe_default_url', Context::getDefaultUrl()); } /** @@ -238,9 +228,6 @@ class adminAdminView extends admin */ function dispAdminIndex() { - $db_info = Context::getDBInfo(); - Context::set('db_info',$db_info); - // Get statistics $args = new stdClass(); $args->date = date("Ymd000000", $_SERVER['REQUEST_TIME'] - 60 * 60 * 24); @@ -410,7 +397,7 @@ class adminAdminView extends admin Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone')); // Mobile view - Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N'); + Context::set('use_mobile_view', config('use_mobile_view') ? 'Y' : 'N'); // Favicon and mobicon $oAdminModel = getAdminModel('admin'); diff --git a/modules/document/document.class.php b/modules/document/document.class.php index 278f540f4..17d9d0530 100644 --- a/modules/document/document.class.php +++ b/modules/document/document.class.php @@ -208,9 +208,8 @@ class document extends ModuleObject // 2009. 03. 09 Add a column(lang_code) to the documnets table if(!$oDB->isColumnExists("documents","lang_code")) { - $db_info = Context::getDBInfo(); - $oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code); - $obj->lang_code = $db_info->lang_type; + $oDB->addColumn('documents',"lang_code","varchar",10, config('locale.default_lang')); + $obj->lang_code = config('locale.default_lang'); executeQuery('document.updateDocumentsLangCode', $obj); } // 2009. 03. 11 Check the index in the document_extra_vars table diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index 0c48b430d..f0ac7f915 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -107,8 +107,7 @@ class importerAdminController extends importer /* DBMS가 CUBRID인 경우 MySQL과 동일한 방법으로는 문서 및 댓글에 대한 사용자 정보를 동기화 할 수 없으므로 예외 처리 합니다. CUBRID를 사용하지 않는 경우에만 보편적인 기존 질의문을 사용합니다. */ - $db_info = Context::getDBInfo (); - if($db_info->db_type != "cubrid") + if(config('db.master.type') !== 'cubrid') { $output = executeQuery('importer.updateDocumentSync'.$postFix); $output = executeQuery('importer.updateCommentSync'.$postFix); diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php index c17237d23..4c9f6db87 100644 --- a/modules/member/member.admin.model.php +++ b/modules/member/member.admin.model.php @@ -296,10 +296,8 @@ class memberAdminModel extends member */ function getMemberAdminIPCheck() { - $db_info = Context::getDBInfo(); - $admin_ip_list = $db_info->admin_ip_list; + $admin_ip_list = config('admin.allow'); if(!$admin_ip_list) return true; - if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list); if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true; else return false; } diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 3a38c2f72..684fc6e17 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -92,8 +92,7 @@ class memberModel extends member return FileHandler::readFile($agreement_file); } - $db_info = Context::getDBInfo(); - $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt'; + $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . config('locale.default_lang') . '.txt'; if(is_readable($agreement_file)) { return FileHandler::readFile($agreement_file); @@ -295,8 +294,7 @@ class memberModel extends member $args = new stdClass(); - $db_info = Context::getDBInfo (); - if($db_info->master_db['db_type'] == "cubrid") + if(config('db.master.type') == 'cubrid') { $args->email_address = strtolower($email_address); $output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args); diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 84a6cbfaf..011b09128 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1608,7 +1608,6 @@ class menuAdminController extends menu $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index); if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act); if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin'); - $dbInfo = Context::getDBInfo(); $args = new stdClass(); $args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl; @@ -1618,11 +1617,11 @@ class menuAdminController extends menu //if now page is https... if(strpos($url, 'https') !== false) { - $args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url); + $args->url = str_replace('https'.substr(Context::getDefaultUrl(), 4), '', $url); } else { - $args->url = str_replace($dbInfo->default_url, '', $url); + $args->url = str_replace(Context::getDefaultUrl(), '', $url); } $args->open_window = 'N'; $args->expand = 'N'; diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index c12dd10fd..671a86027 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -868,9 +868,8 @@ class moduleAdminController extends module $langMap[$val->lang_code][$val->name] = $val->value; } - $lang_supported = Context::get('lang_supported'); - $dbInfo = Context::getDBInfo(); - $defaultLang = $dbInfo->lang_type; + $lang_supported = Context::loadLangSelected(); + $defaultLang = config('locale.default_lang'); if(!is_array($langMap[$defaultLang])) { diff --git a/modules/module/module.class.php b/modules/module/module.class.php index b02c8c448..f7c656af2 100644 --- a/modules/module/module.class.php +++ b/modules/module/module.class.php @@ -29,7 +29,6 @@ class module extends ModuleObject $output = $oDB->executeQuery('module.getSite', $args); if(!$output->data || !$output->data->index_module_srl) { - $db_info = Context::getDBInfo(); $domain = Context::getDefaultUrl(); $url_info = parse_url($domain); $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path']; @@ -38,7 +37,7 @@ class module extends ModuleObject $site_args->site_srl = 0; $site_args->index_module_srl = 0; $site_args->domain = $domain; - $site_args->default_language = $db_info->lang_type; + $site_args->default_language = config('locale.default_lang'); $output = executeQuery('module.insertSite', $site_args); if(!$output->toBool()) return $output; @@ -328,14 +327,13 @@ class module extends ModuleObject { // Basic mid, language Wanted $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args); - $db_info = Context::getDBInfo(); $domain = Context::getDefaultUrl(); $url_info = parse_url($domain); $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path']; $site_args->site_srl = 0; $site_args->index_module_srl = $mid_output->data->module_srl; $site_args->domain = $domain; - $site_args->default_language = $db_info->lang_type; + $site_args->default_language = config('locale.default_lang'); $output = executeQuery('module.insertSite', $site_args); if(!$output->toBool()) return $output; diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 3d2b01827..fa1116397 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -171,7 +171,6 @@ class moduleModel extends module // Get mid, language $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args); - $db_info = Context::getDBInfo(); $domain = Context::getDefaultUrl(); $url_info = parse_url($domain); $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path']; @@ -180,7 +179,7 @@ class moduleModel extends module $site_args->site_srl = 0; $site_args->index_module_srl = $mid_output->data->module_srl; $site_args->domain = $domain; - $site_args->default_language = $db_info->lang_type; + $site_args->default_language = config('locale.default_lang'); if($output->data && !$output->data->index_module_srl) {