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

php7.2호환을 위해 변경한 클래스 Object 를 BaseObject으로 변경

Browse source
This commit is contained in:
BJRambo 2017-11-28 20:01:28 +09:00
parent f4c19a3e0f
commit f3f40f6859
109 changed files with 976 additions and 976 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 Object(-1, 'msg_invalid_word');
return new BaseObject(-1, 'msg_invalid_word');
}
$args = new stdClass;

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

@ -24,7 +24,7 @@ class spamfilter extends ModuleObject
// 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 Object();
return new BaseObject();
}
/**
@ -105,7 +105,7 @@ class spamfilter extends ModuleObject
$oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
}
return new Object(0,'success_updated');
return new BaseObject(0,'success_updated');
}
/**

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

@ -27,7 +27,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertDocument(&$obj)
{
if($_SESSION['avoid_log']) return new Object();
if($_SESSION['avoid_log']) return new BaseObject();
// 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 Object();
if($grant->manager) return new Object();
if($logged_info->is_admin == 'Y') return new BaseObject();
if($grant->manager) return new BaseObject();
}
$oFilterModel = getModel('spamfilter');
@ -68,7 +68,7 @@ class spamfilterController extends spamfilter
// Save a log
$this->insertLog();
return new Object();
return new BaseObject();
}
/**
@ -76,7 +76,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertComment(&$obj)
{
if($_SESSION['avoid_log']) return new Object();
if($_SESSION['avoid_log']) return new BaseObject();
// Check the login status, login information, and permission
$is_logged = Context::get('is_logged');
$logged_info = Context::get('logged_info');
@ -84,8 +84,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 Object();
if($grant->manager) return new Object();
if($logged_info->is_admin == 'Y') return new BaseObject();
if($grant->manager) return new BaseObject();
}
$oFilterModel = getModel('spamfilter');
@ -114,7 +114,7 @@ class spamfilterController extends spamfilter
// Save a log
$this->insertLog();
return new Object();
return new BaseObject();
}
/**
@ -122,7 +122,7 @@ class spamfilterController extends spamfilter
*/
function triggerInsertTrackback(&$obj)
{
if($_SESSION['avoid_log']) return new Object();
if($_SESSION['avoid_log']) return new BaseObject();
$oFilterModel = getModel('spamfilter');
// Confirm if the trackbacks have been added more than once to your document
@ -147,11 +147,11 @@ class spamfilterController extends spamfilter
{
$oTrackbackController->deleteTrackbackSender(60*60*6, \RX_CLIENT_IP, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
$this->insertIP(\RX_CLIENT_IP, 'AUTO-DENIED : trackback.insertTrackback');
return new Object(-1, 'msg_alert_trackback_denied');
return new BaseObject(-1, 'msg_alert_trackback_denied');
}
}
return new Object();
return new BaseObject();
}
/**
@ -188,7 +188,7 @@ class spamfilterController extends spamfilter
if (!Rhymix\Framework\Filters\IpFilter::validateRange($args->ipaddress))
{
return new Object(-1, 'msg_invalid_ip');
return new BaseObject(-1, 'msg_invalid_ip');
}
$output = executeQuery('spamfilter.insertDeniedIP', $args);
@ -211,10 +211,10 @@ class spamfilterController extends spamfilter
*/
function triggerSendMessage(&$obj)
{
if($_SESSION['avoid_log']) return new Object();
if($_SESSION['avoid_log']) return new BaseObject();
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y') return new Object();
if($logged_info->is_admin == 'Y') return new BaseObject();
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
@ -230,7 +230,7 @@ class spamfilterController extends spamfilter
// Save a log
$this->insertLog();
return new Object();
return new BaseObject();
}
/**

24
modules/spamfilter/spamfilter.model.php
View file

@ -43,7 +43,7 @@ class spamfilterModel extends spamfilter
function isDeniedIP()
{
$ip_list = $this->getDeniedIPList();
if(!count($ip_list)) return new Object();
if(!count($ip_list)) return new BaseObject();
$ip_ranges = array();
foreach ($ip_list as $ip_range)
@ -53,10 +53,10 @@ class spamfilterModel extends spamfilter
if (Rhymix\Framework\Filters\IpFilter::inRanges(\RX_CLIENT_IP, $ip_ranges))
{
return new Object(-1, 'msg_alert_registered_denied_ip');
return new BaseObject(-1, 'msg_alert_registered_denied_ip');
}
return new Object();
return new BaseObject();
}
/**
@ -78,7 +78,7 @@ class spamfilterModel extends spamfilter
function isDeniedWord($text)
{
$word_list = $this->getDeniedWordList();
if(!count($word_list)) return new Object();
if(!count($word_list)) return new BaseObject();
foreach ($word_list as $word_item)
{
@ -108,11 +108,11 @@ class spamfilterModel extends spamfilter
$custom_message = sprintf(lang('msg_alert_denied_word'), $word);
}
return new Object(-1, $custom_message);
return new BaseObject(-1, $custom_message);
}
}
return new Object();
return new BaseObject();
}
/**
@ -122,7 +122,7 @@ class spamfilterModel extends spamfilter
{
$config = $this->getConfig();
if($config->limits != 'Y') return new Object();
if($config->limits != 'Y') return new BaseObject();
$limit_count = $config->limits_count ?: 3;
$interval = $config->limits_interval ?: 10;
@ -142,7 +142,7 @@ class spamfilterModel extends spamfilter
$oSpamFilterController = getController('spamfilter');
$oSpamFilterController->insertIP(\RX_CLIENT_IP . $suffix, 'AUTO-DENIED : Over limit');
return new Object(-1, 'msg_alert_registered_denied_ip');
return new BaseObject(-1, 'msg_alert_registered_denied_ip');
}
// If the number of limited posts is not reached, keep creating.
@ -160,9 +160,9 @@ class spamfilterModel extends spamfilter
$oSpamFilterController = getController('spamfilter');
$oSpamFilterController->insertLog();
return new Object(-1, $message);
return new BaseObject(-1, $message);
}
return new Object();
return new BaseObject();
}
/**
@ -176,10 +176,10 @@ class spamfilterModel extends spamfilter
$count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, \RX_CLIENT_IP);
if ($count > 0)
{
return new Object(-1, 'msg_alert_trackback_denied');
return new BaseObject(-1, 'msg_alert_trackback_denied');
}
}
return new Object();
return new BaseObject();
}
/**