Remove unnecessary use of BaseObject

- 트리거 등 반환값이 필요하지 않은 곳에서 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

View file

@ -130,7 +130,7 @@ class layoutAdminController extends layout
$output = executeQuery('menu.getMenuItemByUrl', $tmpArgs);
if(!$output->toBool())
{
return new BaseObject(-1, 'fail_to_update');
return $this->setError('fail_to_update');
}
$menu_srl = $output->data->menu_srl;
@ -313,7 +313,7 @@ class layoutAdminController extends layout
if(!$output->toBool())
{
return new BaseObject(-1, $output->message);
return $this->setError($output->message);
}
}
}
@ -356,7 +356,7 @@ class layoutAdminController extends layout
if(!$layout_srl || !$code || !$is_post)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oLayoutModel = getModel('layout');
@ -377,7 +377,7 @@ class layoutAdminController extends layout
function procLayoutAdminCodeReset()
{
$layout_srl = Context::get('layout_srl');
if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_srl) return $this->setError('msg_invalid_request');
// delete user layout file
$oLayoutModel = getModel('layout');
@ -480,13 +480,13 @@ class layoutAdminController extends layout
$oModuleModel = getModel('module');
$mid = Context::get('mid');
if(!$mid) return new BaseObject(-1, 'msg_invalid_request');
if(!$mid) return $this->setError('msg_invalid_request');
$site_module_info = Context::get('site_module_info');
$columnList = array('layout_srl');
$module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList);
$layout_srl = $module_info->layout_srl;
if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_srl) return $this->setError('msg_invalid_request');
$oLayoutModel = getModel('layout');

View file

@ -295,11 +295,11 @@ class layoutAdminView extends layout
$layout_srl = Context::get('layout_srl');
$code = Context::get('code');
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_srl || !$code) return $this->setError('msg_invalid_request');
// Get the layout information
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_info) return $this->setError('msg_invalid_request');
// Separately handle the layout if its type is faceoff
if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
// Apply CSS directly

View file

@ -15,8 +15,6 @@ class layout extends ModuleObject
{
// Create a directory to be used in the layout
FileHandler::makeDir('./files/cache/layout');
return new BaseObject();
}
/**
@ -104,7 +102,6 @@ class layout extends ModuleObject
}
}
}
return new BaseObject(0, 'success_updated');
}
/**

View file

@ -318,8 +318,7 @@ class layoutView extends layout
{
if(!checkCSRF())
{
$this->stop('msg_invalid_request');
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
// admin check
@ -331,11 +330,11 @@ class layoutView extends layout
$code = Context::get('code');
$code_css = Context::get('code_css');
if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_srl || !$code) return $this->setError('msg_invalid_request');
// Get the layout information
$oLayoutModel = getModel('layout');
$layout_info = $oLayoutModel->getLayout($layout_srl);
if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
if(!$layout_info) return $this->setError('msg_invalid_request');
// Separately handle the layout if its type is faceoff
if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
// Apply CSS directly