fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 21:32:51 +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

16
modules/member/member.admin.controller.php
View file

@ -26,7 +26,7 @@ class memberAdminController extends member
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' || !checkCSRF())
{
return new BaseObject(-1, 'msg_invalid_request');
return $this->setError('msg_invalid_request');
}
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
@ -729,7 +729,7 @@ class memberAdminController extends member
// Check ID duplicated
if (Context::isReservedWord($args->column_name))
{
return new BaseObject(-1, 'msg_column_id_not_available');
return $this->setError('msg_column_id_not_available');
}
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
@ -738,7 +738,7 @@ class memberAdminController extends member
if($item->name == $args->column_name)
{
if($args->member_join_form_srl && $args->member_join_form_srl == $item->member_join_form_srl) continue;
return new BaseObject(-1,'msg_column_id_not_available');
return $this->setError('msg_column_id_not_available');
}
}
// Fix if member_join_form_srl exists. Add if not exists.
@ -949,7 +949,7 @@ class memberAdminController extends member
function procMemberAdminDeleteMembers()
{
$target_member_srls = Context::get('target_member_srls');
if(!$target_member_srls) return new BaseObject(-1, 'msg_invalid_request');
if(!$target_member_srls) return $this->setError('msg_invalid_request');
$member_srls = explode(',', $target_member_srls);
$oMemberController = getController('member');
@ -973,7 +973,7 @@ class memberAdminController extends member
function procMemberAdminUpdateMembersGroup()
{
$member_srl = Context::get('member_srl');
if(!$member_srl) return new BaseObject(-1,'msg_invalid_request');
if(!$member_srl) return $this->setError('msg_invalid_request');
$member_srls = explode(',',$member_srl);
$group_srl = Context::get('group_srls');
@ -1246,7 +1246,7 @@ class memberAdminController extends member
function updateGroup($args)
{
if(!$args->site_srl) $args->site_srl = 0;
if(!$args->group_srl) return new BaseObject(-1, 'lang->msg_not_founded');
if(!$args->group_srl) return $this->setError('lang->msg_not_founded');
// Call trigger (before)
$trigger_output = ModuleHandler::triggerCall('member.updateGroup', 'before', $args);
@ -1290,8 +1290,8 @@ class memberAdminController extends member
$columnList = array('group_srl', 'is_default');
$group_info = $oMemberModel->getGroup($group_srl, $columnList);
if(!$group_info) return new BaseObject(-1, 'lang->msg_not_founded');
if($group_info->is_default == 'Y') return new BaseObject(-1, 'msg_not_delete_default');
if(!$group_info) return $this->setError('lang->msg_not_founded');
if($group_info->is_default == 'Y') return $this->setError('msg_not_delete_default');
// Call trigger (before)
$trigger_output = ModuleHandler::triggerCall('member.deleteGroup', 'before', $group_info);