fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 06:42:14 +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

2
modules/comment/comment.admin.controller.php
View file

@ -96,7 +96,7 @@ class commentAdminController extends comment
$comment = $oCommentModel->getComment($comment_srl);
if($comment->comment_srl != $comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$document_srl = $comment->document_srl;
if(!in_array($document_srl, $updated_documents_arr))

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

@ -33,8 +33,6 @@ class comment extends ModuleObject
$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
// 2008. 02. 22 add comment setting when a new module added
$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
return new BaseObject();
}
/**
@ -194,8 +192,6 @@ class comment extends ModuleObject
{
$oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl'));
}
return new BaseObject(0, 'success_updated');
}
/**

42
modules/comment/comment.controller.php
View file

@ -29,13 +29,13 @@ class commentController extends comment
{
if(!Context::get('is_logged'))
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$comment_srl = Context::get('target_srl');
if(!$comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oCommentModel = getModel('comment');
@ -43,14 +43,14 @@ class commentController extends comment
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
if($comment_config->use_vote_up == 'N')
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$point = 1;
@ -61,16 +61,16 @@ class commentController extends comment
function procCommentVoteUpCancel()
{
if(!Context::get('logged_info')) return new BaseObject(-1, 'msg_invalid_request');
if(!Context::get('logged_info')) return $this->setError('msg_invalid_request');
$comment_srl = Context::get('target_srl');
if(!$comment_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$comment_srl) return $this->setError('msg_invalid_request');
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
if($oComment->get('voted_count') <= 0)
{
return new BaseObject(-1, 'msg_comment_voted_cancel_not');
return $this->setError('msg_comment_voted_cancel_not');
}
$point = 1;
$output = $this->updateVotedCountCancel($comment_srl, $oComment, $point);
@ -90,13 +90,13 @@ class commentController extends comment
{
if(!Context::get('is_logged'))
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$comment_srl = Context::get('target_srl');
if(!$comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oCommentModel = getModel('comment');
@ -104,14 +104,14 @@ class commentController extends comment
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
if($comment_config->use_vote_down == 'N')
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$point = -1;
@ -122,16 +122,16 @@ class commentController extends comment
function procCommentVoteDownCancel()
{
if(!Context::get('logged_info')) return new BaseObject(-1, 'msg_invalid_request');
if(!Context::get('logged_info')) return $this->setError('msg_invalid_request');
$comment_srl = Context::get('target_srl');
if(!$comment_srl) return new BaseObject(-1, 'msg_invalid_request');
if(!$comment_srl) return $this->setError('msg_invalid_request');
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
if($oComment->get('blamed_count') >= 0)
{
return new BaseObject(-1, 'msg_comment_blamed_cancel_not');
return $this->setError('msg_comment_blamed_cancel_not');
}
$point = -1;
$output = $this->updateVotedCountCancel($comment_srl, $oComment, $point);
@ -193,13 +193,13 @@ class commentController extends comment
{
if(!Context::get('is_logged'))
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$comment_srl = Context::get('target_srl');
if(!$comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
// if an user select message from options, message would be the option.
@ -226,7 +226,7 @@ class commentController extends comment
$document_srl = $obj->document_srl;
if(!$document_srl)
{
return new BaseObject();
return;
}
return $this->deleteComments($document_srl, $obj);
@ -241,7 +241,7 @@ class commentController extends comment
$module_srl = $obj->module_srl;
if(!$module_srl)
{
return new BaseObject();
return;
}
$oCommentController = getAdminController('comment');
@ -1622,13 +1622,13 @@ class commentController extends comment
$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;
@ -1692,7 +1692,7 @@ class commentController extends comment
{
if(!Context::get('is_logged'))
{
return new BaseObject(-1, 'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
$commentSrls = Context::get('comment_srls');

8
modules/comment/comment.model.php
View file

@ -976,7 +976,7 @@ class commentModel extends comment
$comment_srl = Context::get('comment_srl');
if(!$comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$point = Context::get('point');
@ -990,7 +990,7 @@ class commentModel extends comment
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$oModuleModel = getModel('module');
@ -1002,7 +1002,7 @@ class commentModel extends comment
{
if($comment_config->use_vote_down != 'S')
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$args->below_point = 0;
@ -1011,7 +1011,7 @@ class commentModel extends comment
{
if($comment_config->use_vote_up != 'S')
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$args->more_point = 0;

4
modules/comment/comment.view.php
View file

@ -82,12 +82,12 @@ class commentView extends comment
$oComment = $oCommentModel->getComment($comment_srl);
if(!$oComment->isExists())
{
return new BaseObject(-1,'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
// Check permissions
if(!$oComment->isAccessible())
{
return new BaseObject(-1,'msg_not_permitted');
return $this->setError('msg_not_permitted');
}
// Browser title settings