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

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

@ -18,8 +18,6 @@ class widget extends ModuleObject
// Add this widget compile the trigger for the display.after
$oModuleController = getController('module');
$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
return new BaseObject();
}
/**
@ -46,8 +44,6 @@ class widget extends ModuleObject
{
$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
}
return new BaseObject(0, 'success_updated');
}
/**

33
modules/widget/widget.controller.php
View file

@ -47,8 +47,8 @@ class widgetController extends widget
function procWidgetGenerateCode()
{
$widget = Context::get('selected_widget');
if(!$widget) return new BaseObject(-1,'msg_invalid_request');
if(!Context::get('skin')) return new BaseObject(-1,lang('msg_widget_skin_is_null'));
if(!$widget) return $this->setError('msg_invalid_request');
if(!Context::get('skin')) return $this->setError('msg_widget_skin_is_null');
$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
@ -63,9 +63,9 @@ class widgetController extends widget
function procWidgetGenerateCodeInPage()
{
$widget = Context::get('selected_widget');
if(!$widget) return new BaseObject(-1,'msg_invalid_request');
if(!$widget) return $this->setError('msg_invalid_request');
if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new BaseObject(-1,lang('msg_widget_skin_is_null'));
if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return $this->setError('msg_widget_skin_is_null');
$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
// Wanted results
@ -112,18 +112,18 @@ class widgetController extends widget
$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if(!$page_info->module_srl || $page_info->module != 'page') $err++;
if($err > 1) return new BaseObject(-1,'msg_invalid_request');
if($err > 1) return $this->setError('msg_invalid_request');
// Check permissions
$logged_info = Context::get('logged_info');
if (!$logged_info->member_srl)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
if (!$module_grant->manager)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
// Enter post
@ -167,25 +167,25 @@ class widgetController extends widget
$oDocumentAdminController = getAdminController('document');
$oDocument = $oDocumentModel->getDocument($document_srl);
if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request');
if(!$oDocument->isExists()) return $this->setError('msg_invalid_request');
$module_srl = $oDocument->get('module_srl');
// Destination Information Wanted page module
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
if(!$page_info->module_srl || $page_info->module != 'page') return $this->setError('msg_invalid_request');
// Check permissions
$logged_info = Context::get('logged_info');
if (!$logged_info->member_srl)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
if (!$module_grant->manager)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
@ -208,24 +208,24 @@ class widgetController extends widget
$oDocumentController = getController('document');
$oDocument = $oDocumentModel->getDocument($document_srl);
if(!$oDocument->isExists()) return new BaseObject();
if(!$oDocument->isExists()) return;
$module_srl = $oDocument->get('module_srl');
// Destination Information Wanted page module
$oModuleModel = getModel('module');
$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
if(!$page_info->module_srl || $page_info->module != 'page') return $this->setError('msg_invalid_request');
// Check permissions
$logged_info = Context::get('logged_info');
if (!$logged_info->member_srl)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
if (!$module_grant->manager)
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'));
@ -246,9 +246,8 @@ class widgetController extends widget
*/
function triggerWidgetCompile(&$content)
{
if(Context::getResponseMethod()!='HTML') return new BaseObject();
if(Context::getResponseMethod()!='HTML') return;
$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
return new BaseObject();
}
/**