fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41: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

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

@ -151,7 +151,7 @@ class spamfilterAdminController extends spamfilter
if (mb_strlen($word, 'UTF-8') < 2 || mb_strlen($word, 'UTF-8') > 40)
{
return new BaseObject(-1, 'msg_invalid_word');
return $this->setError('msg_invalid_word');
}
$args = new stdClass;

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

@ -23,8 +23,6 @@ class spamfilter extends ModuleObject
$oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
$oModuleController->insertTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before');
return new BaseObject();
}
/**
@ -104,8 +102,6 @@ class spamfilter extends ModuleObject
{
$oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
}
return new BaseObject(0,'success_updated');
}
/**

26
modules/spamfilter/spamfilter.controller.php
View file

@ -27,7 +27,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertDocument(&$obj)
{
if($_SESSION['avoid_log']) return new BaseObject();
if($_SESSION['avoid_log']) return;
// Check the login status, login information, and permission
$is_logged = Context::get('is_logged');
$logged_info = Context::get('logged_info');
@ -35,8 +35,8 @@ class spamfilterController extends spamfilter
// In case logged in, check if it is an administrator
if($is_logged)
{
if($logged_info->is_admin == 'Y') return new BaseObject();
if($grant->manager) return new BaseObject();
if($logged_info->is_admin == 'Y') return;
if($grant->manager) return;
}
$oFilterModel = getModel('spamfilter');
@ -67,8 +67,6 @@ class spamfilterController extends spamfilter
}
// Save a log
$this->insertLog();
return new BaseObject();
}
/**
@ -76,7 +74,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertComment(&$obj)
{
if($_SESSION['avoid_log']) return new BaseObject();
if($_SESSION['avoid_log']) return;
// Check the login status, login information, and permission
$is_logged = Context::get('is_logged');
$logged_info = Context::get('logged_info');
@ -84,8 +82,8 @@ class spamfilterController extends spamfilter
// In case logged in, check if it is an administrator
if($is_logged)
{
if($logged_info->is_admin == 'Y') return new BaseObject();
if($grant->manager) return new BaseObject();
if($logged_info->is_admin == 'Y') return;
if($grant->manager) return;
}
$oFilterModel = getModel('spamfilter');
@ -113,8 +111,6 @@ class spamfilterController extends spamfilter
unset($obj->__isupdate);
// Save a log
$this->insertLog();
return new BaseObject();
}
/**
@ -122,7 +118,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertTrackback(&$obj)
{
if($_SESSION['avoid_log']) return new BaseObject();
if($_SESSION['avoid_log']) return;
$oFilterModel = getModel('spamfilter');
// Confirm if the trackbacks have been added more than once to your document
@ -150,8 +146,6 @@ class spamfilterController extends spamfilter
return new BaseObject(-1, 'msg_alert_trackback_denied');
}
}
return new BaseObject();
}
/**
@ -211,10 +205,10 @@ class spamfilterController extends spamfilter
*/
function triggerSendMessage(&$obj)
{
if($_SESSION['avoid_log']) return new BaseObject();
if($_SESSION['avoid_log']) return;
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y') return new BaseObject();
if($logged_info->is_admin == 'Y') return;
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
@ -229,8 +223,6 @@ class spamfilterController extends spamfilter
if(!$output->toBool()) return $output;
// Save a log
$this->insertLog();
return new BaseObject();
}
/**