fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1292 from kijin/pr/object-cleanup

Browse source 
모듈 클래스 인스턴스를 직접 생성할 수 있도록 개선
This commit is contained in:
Kijin Sung 2020-05-20 21:34:41 +09:00 • committed by GitHub
commit 4f1264dee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 304 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

19
classes/context/Context.class.php
View file

@ -266,7 +266,7 @@ class Context
define('RX_BASEURL', parse_url($default_url, PHP_URL_PATH));
}
}
$oModuleModel = getModel('module');
$oModuleModel = ModuleModel::getInstance();
$site_module_info = $oModuleModel->getDefaultMid() ?: new stdClass;
self::set('site_module_info', $site_module_info);
self::set('_default_timezone', ($site_module_info->settings && $site_module_info->settings->timezone) ? $site_module_info->settings->timezone : null);
@ -358,8 +358,8 @@ class Context
// set session handler
if(self::isInstalled() && config('session.use_db'))
{
$oSessionModel = getModel('session');
$oSessionController = getController('session');
$oSessionModel = SessionModel::getInstance();
$oSessionController = SessionController::getInstance();
ini_set('session.serialize_handler', 'php');
session_set_save_handler(
array(&$oSessionController, 'open'), array(&$oSessionController, 'close'), array(&$oSessionModel, 'read'), array(&$oSessionController, 'write'), array(&$oSessionController, 'destroy'), array(&$oSessionController, 'gc')
@ -380,12 +380,11 @@ class Context
// set authentication information in Context and session
if (self::isInstalled())
{
$oModuleModel = getModel('module');
$oModuleModel->loadModuleExtends();
if (Rhymix\Framework\Session::getMemberSrl())
{
getController('member')->setSessionInfo();
MemberController::getInstance()->setSessionInfo();
}
else
{
@ -803,7 +802,7 @@ class Context
{
return '';
}
getController('module')->replaceDefinedLangCode(self::$_instance->browser_title);
ModuleController::getInstance()->replaceDefinedLangCode(self::$_instance->browser_title);
return htmlspecialchars(self::$_instance->browser_title, ENT_QUOTES, 'UTF-8', FALSE);
}
@ -818,7 +817,7 @@ class Context
if ($domain_info && $domain_info->settings && $domain_info->settings->title)
{
$title = trim($domain_info->settings->title);
getController('module')->replaceDefinedLangCode($title);
ModuleController::getInstance()->replaceDefinedLangCode($title);
return $title;
}
else
@ -838,7 +837,7 @@ class Context
if ($domain_info && $domain_info->settings && $domain_info->settings->subtitle)
{
$subtitle = trim($domain_info->settings->subtitle);
getController('module')->replaceDefinedLangCode($subtitle);
ModuleController::getInstance()->replaceDefinedLangCode($subtitle);
return $subtitle;
}
else
@ -1863,7 +1862,7 @@ class Context
{
if (!isset($domain_infos[$domain]))
{
$domain_infos[$domain] = getModel('module')->getSiteInfoByDomain($domain);
$domain_infos[$domain] = ModuleModel::getInstance()->getSiteInfoByDomain($domain);
}
$site_module_info = $domain_infos[$domain] ?: $site_module_info;
}
@ -2744,7 +2743,7 @@ class Context
*/
public static function addMetaTag($name, $content, $is_http_equiv = false)
{
getController('module')->replaceDefinedLangCode($content);
ModuleController::getInstance()->replaceDefinedLangCode($content);
self::$_instance->meta_tags[$name] = array('is_http_equiv' => (bool)$is_http_equiv, 'content' => $content);
}