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

Remove unnecessary use of BaseObject

Browse source 
- 트리거 등 반환값이 필요하지 않은 곳에서 new BaseObject()를 반환하는 것 삭제
- 모듈 설치, 업데이트 후 무의미한 new BaseObject()를 반환하는 것 삭제
- 사용자에게 에러 메시지를 돌려주는 용도로 new BaseObject(-1, '에러메시지')를
  사용하는 경우는 대부분 $this->setError()로 변경함. 언어 변환과 sprintf()
  처리까지 한 번에 이루어지므로 이쪽이 더 편리함.
This commit is contained in:
Kijin Sung 2017-12-01 00:54:51 +09:00
parent 03d74a984f
commit 84e5542d77
103 changed files with 692 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

18
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 BaseObject(-1, 'msg_limit_mid');
if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return $this->setError('msg_limit_mid');
$browser_title = $args->{"browser_title_".$i};
if(!$mid) continue;
if($mid && !$browser_title) $browser_title = $mid;
@ -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 BaseObject(-1,'msg_invalid_request');
if(!$module_info) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!$vars->module_srls) return $this->setError('msg_invalid_request');
$module_srls = explode(',',$vars->module_srls);
if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
if(count($module_srls) < 1) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!$module_srls) return $this->setError('msg_invalid_request');
$modules = explode(',',$module_srls);
if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
if(count($modules) < 1) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!$args->name) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!$args->name) return $this->setError('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 BaseObject(-1, 'msg_not_permitted');
if(!Context::get('is_logged')) return $this->setError('msg_not_permitted');
$oModuleController = getController('module');
$oModuleModel = getModel('module');

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

@ -220,7 +220,7 @@ class moduleAdminModel extends module
if($targetModule == '_SHORTCUT')
{
return new BaseObject(0);
return new BaseObject();
}
$oModuleModel = getModel('module');
@ -453,7 +453,7 @@ class moduleAdminModel extends module
function getModuleAdminLangCode()
{
$name = Context::get('name');
if(!$name) return new BaseObject(-1,'msg_invalid_request');
if(!$name) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return $this->setError('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 BaseObject(-1,'msg_invalid_request');
if(!count($modules)) if(!$module_srls) return $this->setError('msg_invalid_request');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module', 'site_srl');

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

@ -45,8 +45,6 @@ class module extends ModuleObject
FileHandler::makeDir('./files/cache/module_info');
FileHandler::makeDir('./files/cache/triggers');
FileHandler::makeDir('./files/ruleset');
return new BaseObject();
}
/**
@ -393,8 +391,6 @@ class module extends ModuleObject
{
$oDB->modifyColumn('module_config', 'config', 'bigtext');
}
return new BaseObject(0, 'success_updated');
}
/**

22
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 BaseObject(-1,'msg_already_registed_vid');
if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
}
else
{
@ -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 BaseObject(-1,'msg_already_registed_domain');
if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-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))
{
@ -704,7 +704,7 @@ class moduleController extends module
*/
public function onlyDeleteModule($module_srl)
{
if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
// check start module
$oModuleModel = getModel('module');
@ -1078,7 +1078,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 BaseObject(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return $this->setError('msg_not_permitted');
$vars = Context::gets('addfile','filter');
$attributeNames = Context::get('attribute_name');
@ -1107,7 +1107,7 @@ class moduleController extends module
$filter = array_map('trim', explode(',',$vars->filter));
if (!in_array($ext, $filter))
{
return new BaseObject(-1, 'msg_error_occured');
return $this->setError('msg_error_occured');
}
}
@ -1122,10 +1122,10 @@ class moduleController extends module
// insert
else
{
if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
if(!Context::isUploaded()) return $this->setError('msg_error_occured');
$addfile = Context::get('addfile');
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');
if(!is_uploaded_file($addfile['tmp_name'])) return $this->setError('msg_error_occured');
if($vars->addfile['error'] != 0) return $this->setError('msg_error_occured');
$output = $this->insertModuleFileBox($vars);
}
@ -1224,10 +1224,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 BaseObject(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return $this->setError('msg_not_permitted');
$module_filebox_srl = Context::get('module_filebox_srl');
if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$module_filebox_srl) return $this->setError('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 BaseObject(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return $this->setError('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 BaseObject(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return $this->setError('msg_not_permitted');
$input_name = Context::get('input');
if(!preg_match('/^[a-z0-9_]+$/i', $input_name))
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
if(!$input_name) return new BaseObject(-1, 'msg_not_permitted');
if(!$input_name) return $this->setError('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 BaseObject(-1, 'msg_not_permitted');
if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return $this->setError('msg_not_permitted');
$filter = Context::get('filter');
if($filter) Context::set('arrfilter',explode(',',$filter));