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

Change method calls to static in many core modules

Browse source
This commit is contained in:
Kijin Sung 2020-05-24 20:43:52 +09:00
parent 89ec44152e
commit c90d529c74
15 changed files with 361 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

57
modules/module/module.controller.php
View file

@ -185,7 +185,7 @@ class moduleController extends module
function updateModuleConfig($module, $config, $site_srl = 0)
{
$origin_config = getModel('module')->getModuleConfig($module, $site_srl);
$origin_config = ModuleModel::getModuleConfig($module, $site_srl);
foreach($config as $key => $val)
{
@ -197,7 +197,7 @@ class moduleController extends module
function updateModulePartConfig($module, $module_srl, $config)
{
$origin_config = getModel('module')->getModulePartConfig($module, $module_srl);
$origin_config = ModuleModel::getModulePartConfig($module, $module_srl);
foreach($config as $key => $val)
{
@ -256,8 +256,7 @@ class moduleController extends module
{
if(isSiteID($domain))
{
$oModuleModel = getModel('module');
if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
if(ModuleModel::isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
}
else
{
@ -271,8 +270,7 @@ class moduleController extends module
$args->default_language = Context::getLangType();
$columnList = array('modules.site_srl');
$oModuleModel = getModel('module');
$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
$output = ModuleModel::getSiteInfoByDomain($args->domain, $columnList);
if($output) return new BaseObject(-1,'msg_already_registed_vid');
$output = executeQuery('module.insertSite', $args);
@ -287,9 +285,8 @@ class moduleController extends module
*/
function updateSite($args)
{
$oModuleModel = getModel('module');
$columnList = array('sites.site_srl', 'sites.domain');
$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
$site_info = ModuleModel::getSiteInfo($args->site_srl, $columnList);
if(!$args->domain && $site_info->site_srl == $args->site_srl)
{
@ -298,9 +295,9 @@ class moduleController extends module
if($site_info->domain != $args->domain)
{
$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
$info = ModuleModel::getSiteInfoByDomain($args->domain, $columnList);
if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain');
if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid');
if(isSiteID($args->domain) && ModuleModel::isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid');
if($args->domain && !isSiteID($args->domain))
{
@ -312,7 +309,7 @@ class moduleController extends module
if($args->site_srl == 0) $vid='';
else $vid=$args->domain;
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($args->index_module_srl);
$mid = $module_info->mid;
Rhymix\Framework\Cache::clearGroup('site_and_module');
@ -376,15 +373,14 @@ class moduleController extends module
if(!$output->toBool()) return $output;
// Check whether the module name already exists
if(!$args->site_srl) $args->site_srl = 0;
$oModuleModel = getModel('module');
if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
if(ModuleModel::isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
// begin transaction
$oDB = &DB::getInstance();
$oDB->begin();
// Get colorset from the skin information
$module_path = ModuleHandler::getModulePath($args->module);
$skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin);
$skin_info = ModuleModel::loadSkinInfo($module_path, $args->skin);
$skin_vars = new stdClass();
$skin_vars->colorset = $skin_info->colorset[0]->name;
// Arrange variables and then execute a query
@ -436,8 +432,6 @@ class moduleController extends module
// if menu is not created, create menu also. and does not supported that in virtual site.
if(!$menuOutput->data && !$args->site_srl)
{
$oMenuAdminModel = getAdminModel('menu');
$oMenuAdminController = getAdminController('menu');
$menuSrl = $oMenuAdminController->getUnlinkedMenu();
@ -502,9 +496,7 @@ class moduleController extends module
$oDB = &DB::getInstance();
$oDB->begin();
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl);
if(!$args->site_srl || !$args->browser_title)
{
@ -645,8 +637,7 @@ class moduleController extends module
$site_module_info = Context::get('site_module_info');
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$output = ModuleModel::getModuleInfoByModuleSrl($module_srl);
$args = new stdClass();
$args->url = $output->mid;
@ -707,9 +698,8 @@ class moduleController extends module
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
// check start module
$oModuleModel = getModel('module');
$columnList = array('sites.index_module_srl');
$start_module = $oModuleModel->getSiteInfo(0, $columnList);
$start_module = ModuleModel::getSiteInfo(0, $columnList);
if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
// Call a trigger (before)
@ -803,13 +793,12 @@ class moduleController extends module
*/
function insertAdminId($module_srl, $admin_id)
{
$oMemberModel = getModel('member');
$member_config = $oMemberModel->getMemberConfig();
$member_config = MemberModel::getMemberConfig();
if($member_config->identifier == 'email_address')
$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
$member_info = MemberModel::getMemberInfoByEmailAddress($admin_id);
else
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
$member_info = MemberModel::getMemberInfoByUserID($admin_id);
if(!$member_info->member_srl) return;
@ -831,8 +820,7 @@ class moduleController extends module
if($admin_id)
{
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
$member_info = MemberModel::getMemberInfoByUserID($admin_id);
if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
}
@ -1156,11 +1144,10 @@ class moduleController extends module
// have file
if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
{
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
$output = ModuleModel::getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename);
$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
$path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path);
$random = Rhymix\Framework\Security::getRandom(32, 'hex');
@ -1196,8 +1183,7 @@ class moduleController extends module
$vars->module_filebox_srl = getNextSequence();
// get file path
$oModuleModel = getModel('module');
$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
$path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path);
$random = Rhymix\Framework\Security::getRandom(32, 'hex');
@ -1252,8 +1238,7 @@ class moduleController extends module
function deleteModuleFileBox($vars)
{
// delete real file
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
$output = ModuleModel::getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename);
$args = new stdClass();

15
modules/module/module.model.php
View file

@ -2190,15 +2190,15 @@ class moduleModel extends module
{
if($type == 'document')
{
$target_srl = getModel('document')->getDocument($target_srl, false, false)->get('module_srl');
$target_srl = DocumentModel::getDocument($target_srl, false, false)->get('module_srl');
}
else if($type == 'comment')
{
$target_srl = getModel('comment')->getComment($target_srl)->get('module_srl');
$target_srl = CommentModel::getComment($target_srl)->get('module_srl');
}
else if($type == 'file')
{
$target_srl = getModel('file')->getFile($target_srl)->module_srl;
$target_srl = FileModel::getFile($target_srl)->module_srl;
}
else if($type == 'module')
{
@ -2340,8 +2340,7 @@ class moduleModel extends module
if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
$output = self::getModuleFileBoxList();
Context::set('filebox_list', $output->data);
$page = Context::get('page');
@ -2360,7 +2359,7 @@ class moduleModel extends module
public static function getModuleFileBoxPath($module_filebox_srl)
{
return getController('file')->getStoragePath('filebox', 0, $module_filebox_srl, 0, '', false);
return FileController::getStoragePath('filebox', 0, $module_filebox_srl, 0, '', false);
}
/**
@ -2444,9 +2443,7 @@ class moduleModel extends module
$langCode = Context::get('langCode');
if (!$langCode) return;
$oModuleController = getController('module');
$oModuleController->replaceDefinedLangCode($langCode);
ModuleController::getInstance()->replaceDefinedLangCode($langCode);
$this->add('lang', $langCode);
}
}

11
modules/module/module.view.php
View file

@ -31,8 +31,7 @@ class moduleView extends module
$skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
if(!file_exists($skin_info_xml)) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
$skin_info = ModuleModel::loadSkinInfo($module_path, $skin);
Context::set('skin_info',$skin_info);
$this->setLayoutFile("popup_layout");
@ -49,11 +48,10 @@ class moduleView extends module
$output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args);
$mid_list = array();
$oModuleModel = getModel('module');
foreach($output->data as $key => $val)
{
if(!$oModuleModel->getGrant($val, Context::get('logged_info'))->manager)
if(!ModuleModel::getGrant($val, Context::get('logged_info'))->manager)
{
continue;
}
@ -69,7 +67,7 @@ class moduleView extends module
$obj->browser_title = $val->browser_title;
$mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj;
$mid_list[$val->module]->title = $oModuleModel->getModuleInfoXml($val->module)->title;
$mid_list[$val->module]->title = ModuleModel::getModuleInfoXml($val->module)->title;
}
Context::set('mid_list', $mid_list);
@ -118,8 +116,7 @@ class moduleView extends module
//]]></script>',$input_name);
Context::addHtmlHeader($addscript);
$oModuleModel = getModel('module');
$output = $oModuleModel->getModuleFileBoxList();
$output = ModuleModel::getModuleFileBoxList();
Context::set('filebox_list', $output->data);
$filter = Context::get('filter');