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

php7.2호환을 위해 변경한 클래스 Object 를 BaseObject으로 변경

Browse source
This commit is contained in:
BJRambo 2017-11-28 20:01:28 +09:00
parent f4c19a3e0f
commit f3f40f6859
109 changed files with 976 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/module/module.admin.controller.php
View file

@ -108,7 +108,7 @@ class moduleAdminController extends module
{
$mid = trim($args->{"mid_".$i});
if(!$mid) continue;
if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-1, 'msg_limit_mid');
$browser_title = $args->{"browser_title_".$i};
if(!$mid) continue;
if($mid && !$browser_title) $browser_title = $mid;
@ -266,7 +266,7 @@ class moduleAdminController extends module
return;
else
{
return new Object(-1, $msg);
return new BaseObject(-1, $msg);
}
}
@ -282,7 +282,7 @@ class moduleAdminController extends module
// Get information of the module
$columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if(!$module_info) return new Object(-1,'msg_invalid_request');
if(!$module_info) return new BaseObject(-1,'msg_invalid_request');
// Register Admin ID
$oModuleController->deleteAdminId($module_srl);
$admin_member = Context::get('admin_member');
@ -509,10 +509,10 @@ class moduleAdminController extends module
{
$vars = Context::getRequestVars();
if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
if(!$vars->module_srls) return new BaseObject(-1,'msg_invalid_request');
$module_srls = explode(',',$vars->module_srls);
if(count($module_srls) < 1) return new Object(-1,'msg_invalid_request');
if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
$oModuleModel = getModel('module');
$oModuleController= getController('module');
@ -564,10 +564,10 @@ class moduleAdminController extends module
function procModuleAdminModuleGrantSetup()
{
$module_srls = Context::get('module_srls');
if(!$module_srls) return new Object(-1,'msg_invalid_request');
if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
$modules = explode(',',$module_srls);
if(count($modules) < 1) return new Object(-1,'msg_invalid_request');
if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
$oModuleController = getController('module');
$oModuleModel = getModel('module');
@ -676,7 +676,7 @@ class moduleAdminController extends module
// if args->name is empty, random generate for user define language
if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
if(!$args->name) return new Object(-1,'msg_invalid_request');
if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
// Check whether a language code exists
$output = executeQueryArray('module.getLang', $args);
if(!$output->toBool()) return $output;
@ -723,7 +723,7 @@ class moduleAdminController extends module
$args->name = str_replace(' ','_',Context::get('name'));
$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
if(!empty($args->lang_name)) $args->name = $args->lang_name;
if(!$args->name) return new Object(-1,'msg_invalid_request');
if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
$output = executeQuery('module.deleteLang', $args);
if(!$output->toBool()) return $output;
@ -737,7 +737,7 @@ class moduleAdminController extends module
function procModuleAdminGetList()
{
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
$oModuleController = getController('module');
$oModuleModel = getModel('module');

8
modules/module/module.admin.model.php
View file

@ -26,7 +26,7 @@ class moduleAdminModel extends module
$args = new stdClass;
$args->module_srls = Context::get('module_srls');
$output = executeQueryArray('module.getModulesInfo', $args);
if(!$output->toBool() || !$output->data) return new Object();
if(!$output->toBool() || !$output->data) return new BaseObject();
foreach($output->data as $key => $val)
{
@ -215,12 +215,12 @@ class moduleAdminModel extends module
$moduleSrl = Context::get('module_srl');
if(!$targetModule || !$moduleSrl)
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
if($targetModule == '_SHORTCUT')
{
return new Object(0);
return new BaseObject(0);
}
$oModuleModel = getModel('module');
@ -453,7 +453,7 @@ class moduleAdminModel extends module
function getModuleAdminLangCode()
{
$name = Context::get('name');
if(!$name) return new Object(-1,'msg_invalid_request');
if(!$name) return new BaseObject(-1,'msg_invalid_request');
$site_module_info = Context::get('site_module_info');
$this->add('name', $name);
$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);

6
modules/module/module.admin.view.php
View file

@ -165,7 +165,7 @@ class moduleAdminView extends module
$module_srls = Context::get('module_srls');
$modules = explode(',',$module_srls);
if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
@ -201,7 +201,7 @@ class moduleAdminView extends module
$module_srls = Context::get('module_srls');
$modules = explode(',',$module_srls);
if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
// pre-define variables because you can get contents from other module (call by reference)
$content = '';
// Call a trigger for additional settings
@ -224,7 +224,7 @@ class moduleAdminView extends module
$module_srls = Context::get('module_srls');
$modules = explode(',',$module_srls);
if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'site_srl');

4
modules/module/module.class.php
View file

@ -46,7 +46,7 @@ class module extends ModuleObject
FileHandler::makeDir('./files/cache/triggers');
FileHandler::makeDir('./files/ruleset');
return new Object();
return new BaseObject();
}
/**
@ -394,7 +394,7 @@ class module extends ModuleObject
$oDB->modifyColumn('module_config', 'config', 'bigtext');
}
return new Object(0, 'success_updated');
return new BaseObject(0, 'success_updated');
}
/**

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

@ -257,7 +257,7 @@ class moduleController extends module
if(isSiteID($domain))
{
$oModuleModel = getModel('module');
if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1,'msg_already_registed_vid');
}
else
{
@ -273,7 +273,7 @@ class moduleController extends module
$columnList = array('modules.site_srl');
$oModuleModel = getModel('module');
$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($output) return new Object(-1,'msg_already_registed_vid');
if($output) return new BaseObject(-1,'msg_already_registed_vid');
$output = executeQuery('module.insertSite', $args);
if(!$output->toBool()) return $output;
@ -299,8 +299,8 @@ class moduleController extends module
if($site_info->domain != $args->domain)
{
$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
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($args->domain && !isSiteID($args->domain))
{
@ -329,7 +329,7 @@ class moduleController extends module
unset($args->act);
unset($args->page);
// Test mid value
if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid');
// Test variables (separate basic vars and other vars in modules)
$extra_vars = clone($args);
unset($extra_vars->module_srl);
@ -355,7 +355,7 @@ class moduleController extends module
unset($extra_vars->footer_text);
$args = delObjectVars($args, $extra_vars);
return new Object();
return new BaseObject();
}
/**
@ -377,7 +377,7 @@ class moduleController extends module
// 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 Object(-1, 'msg_module_name_exists');
if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
// begin transaction
$oDB = &DB::getInstance();
@ -518,7 +518,7 @@ class moduleController extends module
if(!$output->toBool() || $output->data->count)
{
$oDB->rollback();
return new Object(-1, 'msg_module_name_exists');
return new BaseObject(-1, 'msg_module_name_exists');
}
// default value
@ -641,7 +641,7 @@ class moduleController extends module
*/
function deleteModule($module_srl, $site_srl = 0)
{
if(!$module_srl) return new Object(-1,'msg_invalid_request');
if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
$site_module_info = Context::get('site_module_info');
@ -684,11 +684,11 @@ class moduleController extends module
if($output->isSuccess)
{
return new Object(0, 'success_deleted');
return new BaseObject(0, 'success_deleted');
}
else
{
return new Object($output->error, $output->message);
return new BaseObject($output->error, $output->message);
}
}
// only delete module
@ -704,13 +704,13 @@ class moduleController extends module
*/
public function onlyDeleteModule($module_srl)
{
if(!$module_srl) return new Object(-1,'msg_invalid_request');
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);
if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
// Call a trigger (before)
$trigger_obj = new stdClass();
@ -756,7 +756,7 @@ class moduleController extends module
*/
function updateModuleSkinVars($module_srl, $skin_vars)
{
return new Object();
return new BaseObject();
}
/**
@ -880,7 +880,7 @@ class moduleController extends module
}
getDestroyXeVars($obj);
if(!$obj || !count($obj)) return new Object();
if(!$obj || !count($obj)) return new BaseObject();
$args = new stdClass;
$args->module_srl = $module_srl;
@ -914,7 +914,7 @@ class moduleController extends module
$oDB->commit();
return new Object();
return new BaseObject();
}
/**
@ -1089,7 +1089,7 @@ class moduleController extends module
if ($ajax) Context::setRequestMethod('JSON');
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
$vars = Context::gets('addfile','filter');
$attributeNames = Context::get('attribute_name');
@ -1118,7 +1118,7 @@ class moduleController extends module
$filter = array_map('trim', explode(',',$vars->filter));
if (!in_array($ext, $filter))
{
return new Object(-1, 'msg_error_occured');
return new BaseObject(-1, 'msg_error_occured');
}
}
@ -1133,10 +1133,10 @@ class moduleController extends module
// insert
else
{
if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
$addfile = Context::get('addfile');
if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
$output = $this->insertModuleFileBox($vars);
}
@ -1235,10 +1235,10 @@ class moduleController extends module
function procModuleFileBoxDelete()
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
$module_filebox_srl = Context::get('module_filebox_srl');
if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
$vars = new stdClass();
$vars->module_filebox_srl = $module_filebox_srl;
$output = $this->deleteModuleFileBox($vars);

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

@ -2344,7 +2344,7 @@ class moduleModel extends module
function getFileBoxListHtml()
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
$link = parse_url($_SERVER["HTTP_REFERER"]);
$link_params = explode('&',$link['query']);
foreach ($link_params as $param)

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

@ -123,15 +123,15 @@ class moduleView extends module
function dispModuleFileBox()
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
$input_name = Context::get('input');
if(!preg_match('/^[a-z0-9_]+$/i', $input_name))
{
return new Object(-1, 'msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
}
if(!$input_name) return new Object(-1, 'msg_not_permitted');
if(!$input_name) return new BaseObject(-1, 'msg_not_permitted');
$addscript = sprintf('<script>//<![CDATA[
var selected_filebox_input_name = "%s";
@ -154,7 +154,7 @@ class moduleView extends module
function dispModuleFileBoxAdd()
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
$filter = Context::get('filter');
if($filter) Context::set('arrfilter',explode(',',$filter));