fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +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

14
modules/editor/editor.controller.php
View file

@ -47,18 +47,18 @@ class editorController extends editor
{
$component = Context::get('component');
$method = Context::get('method');
if(!$component) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!$component) return $this->setError('msg_component_is_not_founded', $component);
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(lang('msg_component_is_not_founded'), $component));
if(!method_exists($oComponent, $method)) return $this->setError('msg_component_is_not_founded', $component);
//$output = call_user_method($method, $oComponent);
//$output = call_user_func(array($oComponent, $method));
if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
else return new BaseObject(-1,sprintf('%s method is not exists', $method));
else return $this->setError('%s method is not exists', $method);
if($output instanceof Object && !$output->toBool()) return $output;
@ -93,13 +93,13 @@ class editorController extends editor
$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
if (!$module_info->module_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
if (!$module_grant->manager)
{
return new BaseObject(-1, 'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$module_srl[] = $srl;
@ -171,7 +171,7 @@ class editorController extends editor
*/
function triggerEditorComponentCompile(&$content)
{
if(Context::getResponseMethod()!='HTML') return new BaseObject();
if(Context::getResponseMethod() !== 'HTML') return;
$module_info = Context::get('module_info');
$module_srl = $module_info->module_srl;
@ -253,7 +253,6 @@ class editorController extends editor
}
$content = $this->transComponent($content);
return new BaseObject();
}
/**
@ -350,7 +349,6 @@ class editorController extends editor
function triggerDeleteSavedDoc(&$obj)
{
$this->deleteSavedDoc(false);
return new BaseObject();
}
/**