From 9df05d20db09e99ad2230bf0f7140a66a8b118f3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 23 Feb 2021 21:51:45 +0900 Subject: [PATCH] Remove trackback integration from spamfilter module --- .../spamfilter.admin.controller.php | 6 +--- modules/spamfilter/spamfilter.class.php | 5 +-- modules/spamfilter/spamfilter.controller.php | 35 ------------------- modules/spamfilter/tpl/config_block.html | 14 -------- 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 4f93d1214..41fd421a8 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -20,17 +20,13 @@ class spamfilterAdminController extends spamfilter $config = ModuleModel::getModuleConfig('spamfilter') ?: new stdClass; // Get the default information - $args = Context::gets('limits', 'limits_interval', 'limits_count', 'check_trackback', 'ipv4_block_range', 'ipv6_block_range', 'custom_message'); + $args = Context::gets('limits', 'limits_interval', 'limits_count', 'ipv4_block_range', 'ipv6_block_range', 'custom_message'); // Set default values if($args->limits != 'Y') { $args->limits = 'N'; } - if($args->check_trackback != 'Y') - { - $args->check_trackback = 'N'; - } if(!preg_match('#^/(\d+)$#', $args->ipv4_block_range, $matches) || $matches[1] > 32 || $matches[1] < 16) { $args->ipv4_block_range = ''; diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php index 13323e435..e3dc3b600 100644 --- a/modules/spamfilter/spamfilter.class.php +++ b/modules/spamfilter/spamfilter.class.php @@ -13,12 +13,13 @@ class spamfilter extends ModuleObject array('document.manage', 'before', 'controller', 'triggerManageDocument'), array('comment.insertComment', 'before', 'controller', 'triggerInsertComment'), array('comment.updateComment', 'before', 'controller', 'triggerInsertComment'), - array('trackback.insertTrackback', 'before', 'controller', 'triggerInsertTrackback'), array('communication.sendMessage', 'before', 'controller', 'triggerSendMessage'), array('moduleObject.proc', 'before', 'controller', 'triggerCheckCaptcha'), ); - protected static $_delete_triggers = array(); + protected static $_delete_triggers = array( + array('trackback.insertTrackback', 'before', 'controller', 'triggerInsertTrackback'), + ); /** * Register all triggers. diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 4313989d4..75bccd141 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -122,41 +122,6 @@ class spamfilterController extends spamfilter $this->insertLog(); } - /** - * @brief Inspect the trackback creation time and IP - */ - function triggerInsertTrackback(&$obj) - { - if($_SESSION['avoid_log']) return; - - $oFilterModel = getModel('spamfilter'); - // Confirm if the trackbacks have been added more than once to your document - $output = $oFilterModel->isInsertedTrackback($obj->document_srl); - if(!$output->toBool()) return $output; - - // Check if the IP is prohibited - $output = $oFilterModel->isDeniedIP(); - if(!$output->toBool()) return $output; - - // Check if there is a ban on the word - $text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url; - $output = $oFilterModel->isDeniedWord($text); - if(!$output->toBool()) return $output; - - // Start Filtering - $oTrackbackController = getController('trackback'); - if (is_object($oTrackbackController) && method_exists($oTrackbackController, 'deleteTrackbackSender')) - { - // In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it. - if($obj->title == $obj->excerpt) - { - $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 BaseObject(-1, 'msg_alert_trackback_denied'); - } - } - } - /** * @brief IP registration * The registered IP address is considered as a spammer diff --git a/modules/spamfilter/tpl/config_block.html b/modules/spamfilter/tpl/config_block.html index 4d61fc545..83642613b 100644 --- a/modules/spamfilter/tpl/config_block.html +++ b/modules/spamfilter/tpl/config_block.html @@ -18,20 +18,6 @@

{$lang->cmd_interval_help}

-
- -
- - -

{$lang->cmd_check_trackback_help}

-
-