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

Replace some usages of getModel(), getController(), etc. in the Rhymix Framework

Browse source
This commit is contained in:
Kijin Sung 2020-05-18 21:51:36 +09:00
parent 052930a6d4
commit 786c9c9b8c
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/helpers/confighelper.php
View file

@ -68,7 +68,7 @@ class ConfigHelper
{ {
if (!isset(self::$_config_cache[$option[0]])) if (!isset(self::$_config_cache[$option[0]]))
{ {
self::$_config_cache[$option[0]] = getModel('module')->getModuleConfig($option[0]) ?: new stdClass; self::$_config_cache[$option[0]] = \ModuleModel::getInstance()->getModuleConfig($option[0]) ?: new \stdClass;
} }
$options = explode('.', $option[1]); $options = explode('.', $option[1]);
$temp = self::$_config_cache[$option[0]]; $temp = self::$_config_cache[$option[0]];

4
common/framework/helpers/sessionhelper.php
View file

@ -27,7 +27,7 @@ class SessionHelper
$member_srl = intval($member_srl); $member_srl = intval($member_srl);
if ($member_srl) if ($member_srl)
{ {
$oMemberModel = getModel('member'); $oMemberModel = \MemberModel::getInstance();
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
if (intval($member_info->member_srl) === $member_srl) if (intval($member_info->member_srl) === $member_srl)
{ {
@ -69,7 +69,7 @@ class SessionHelper
*/ */
public function isModuleAdmin($module_srl = null) public function isModuleAdmin($module_srl = null)
{ {
return $this->is_admin === 'Y' || getModel('module')->isModuleAdmin($this, $module_srl); return $this->is_admin === 'Y' || \ModuleModel::getInstance()->isModuleAdmin($this, $module_srl);
} }
/** /**

8
common/framework/password.php
View file

@ -112,9 +112,9 @@ class Password
*/ */
public static function getDefaultAlgorithm() public static function getDefaultAlgorithm()
{ {
if (function_exists('getModel')) if (class_exists('\MemberModel'))
{ {
$config = getModel('member')->getMemberConfig(); $config = \MemberModel::getInstance()->getMemberConfig();
$algorithm = $config->password_hashing_algorithm; $algorithm = $config->password_hashing_algorithm;
if (strval($algorithm) === '') if (strval($algorithm) === '')
{ {
@ -135,9 +135,9 @@ class Password
*/ */
public static function getWorkFactor() public static function getWorkFactor()
{ {
if (function_exists('getModel')) if (class_exists('\MemberModel'))
{ {
$config = getModel('member')->getMemberConfig(); $config = \MemberModel::getInstance()->getMemberConfig();
$work_factor = $config->password_hashing_work_factor; $work_factor = $config->password_hashing_work_factor;
if (!$work_factor || $work_factor < 4 || $work_factor > 31) if (!$work_factor || $work_factor < 4 || $work_factor > 31)
{ {

6
common/framework/session.php
View file

@ -313,7 +313,7 @@ class Session
{ {
$current_domain = $site_module_info->domain; $current_domain = $site_module_info->domain;
$current_url = URL::getCurrentUrl(); $current_url = URL::getCurrentUrl();
$default_domain = getModel('module')->getDefaultDomainInfo(); $default_domain = \ModuleModel::getInstance()->getDefaultDomainInfo();
$default_url = \Context::getDefaultUrl($default_domain); $default_url = \Context::getDefaultUrl($default_domain);
} }
@ -431,7 +431,7 @@ class Session
// Try autologin. // Try autologin.
if (!$member_srl && self::$_autologin_key) if (!$member_srl && self::$_autologin_key)
{ {
$member_srl = getController('member')->doAutologin(self::$_autologin_key); $member_srl = \MemberController::getInstance()->doAutologin(self::$_autologin_key);
if ($member_srl && self::isValid($member_srl)) if ($member_srl && self::isValid($member_srl))
{ {
self::login($member_srl, false); self::login($member_srl, false);
@ -697,7 +697,7 @@ class Session
} }
// Check member information to see if denied or limited. // Check member information to see if denied or limited.
$member_info = getModel('member')->getMemberInfoByMemberSrl($member_srl); $member_info = \MemberModel::getInstance()->getMemberInfoByMemberSrl($member_srl);
if ($member_info->denied === 'Y') if ($member_info->denied === 'Y')
{ {
trigger_error('Session is invalid for member_srl=' . intval($_SESSION['RHYMIX']['login']) . ' (denied)', \E_USER_WARNING); trigger_error('Session is invalid for member_srl=' . intval($_SESSION['RHYMIX']['login']) . ' (denied)', \E_USER_WARNING);

2
common/framework/url.php
View file

@ -99,7 +99,7 @@ class URL
return true; return true;
} }
if (getModel('module')->getSiteInfoByDomain($domain)) if (\ModuleModel::getInstance()->getSiteInfoByDomain($domain))
{ {
return true; return true;
} }