fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +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/document/document.model.php
View file

@ -39,7 +39,7 @@ class documentModel extends document
{
if(!is_array($documentSrls) || count($documentSrls) == 0)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$args = new stdClass();
@ -508,7 +508,7 @@ class documentModel extends document
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl');
$member_srl = $oDocument->get('member_srl');
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$module_srl) return $this->setError('msg_invalid_request');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@ -915,7 +915,7 @@ class documentModel extends document
*/
function getDocumentCategories()
{
if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
if(!Context::get('is_logged')) return $this->setError('msg_not_permitted');
$module_srl = Context::get('module_srl');
$categories= $this->getCategoryList($module_srl);
$lang = Context::get('lang');
@ -1010,13 +1010,13 @@ class documentModel extends document
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
// Check permissions
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
if(!$grant->manager) return $this->setError('msg_not_permitted');
$category_srl = Context::get('category_srl');
$category_info = $this->getCategory($category_srl);
if(!$category_info)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$this->add('category_info', $category_info);
@ -1198,7 +1198,7 @@ class documentModel extends document
{
$args = new stdClass;
$document_srl = Context::get('document_srl');
if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
if(!$document_srl) return $this->setError('msg_invalid_request');
$point = Context::get('point');
if($point != -1) $point = 1;
@ -1207,18 +1207,18 @@ class documentModel extends document
$columnList = array('document_srl', 'module_srl');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl');
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$module_srl) return $this->setError('msg_invalid_request');
$oModuleModel = getModel('module');
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($point == -1)
{
if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
if($document_config->use_vote_down!='S') return $this->setError('msg_invalid_request');
$args->below_point = 0;
}
else
{
if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
if($document_config->use_vote_up!='S') return $this->setError('msg_invalid_request');
$args->more_point = 0;
}