fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Implement member exception and full HTML filtering in spamfilter module #1882

Browse source
This commit is contained in:
Kijin Sung 2022-12-19 02:00:56 +09:00
parent 020b85168c
commit 98f75ee4dd
1 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,11 +46,19 @@ class spamfilterModel extends spamfilter
$ip_list = $this->getDeniedIPList(); $ip_list = $this->getDeniedIPList();
Rhymix\Framework\Cache::set('spamfilter:denied_ip_list', $ip_list); Rhymix\Framework\Cache::set('spamfilter:denied_ip_list', $ip_list);
} }
if(!count($ip_list)) return new BaseObject(); if (!count($ip_list))
{
return new BaseObject();
}
$ip_ranges = array(); $is_logged = Context::get('is_logged');
foreach ($ip_list as $ip_range) foreach ($ip_list as $ip_range)
{ {
if (!empty($ip_range->except_member) && $ip_range->except_member === 'Y' && $is_logged)
{
continue;
}
if (Rhymix\Framework\Filters\IpFilter::inRange(\RX_CLIENT_IP, $ip_range->ipaddress)) if (Rhymix\Framework\Filters\IpFilter::inRange(\RX_CLIENT_IP, $ip_range->ipaddress))
{ {
$args = new stdClass(); $args = new stdClass();
@ -84,22 +92,35 @@ class spamfilterModel extends spamfilter
if ($word_list === null) if ($word_list === null)
{ {
$word_list = $this->getDeniedWordList(); $word_list = $this->getDeniedWordList();
Rhymix\Framework\Cache::set('spamfilter:denied_word_list', $ip_list); Rhymix\Framework\Cache::set('spamfilter:denied_word_list', $word_list);
}
if (!count($word_list))
{
return new BaseObject();
} }
if(!count($word_list)) return new BaseObject();
$text = strtolower(utf8_trim(utf8_normalize_spaces(htmlspecialchars_decode(strip_tags($text, '<a><img>'))))); $is_logged = Context::get('is_logged');
$fulltext = strtolower(utf8_trim(utf8_normalize_spaces($text)));
$plaintext = htmlspecialchars_decode(strip_tags($fulltext, '<a><img>'));
foreach ($word_list as $word_item) foreach ($word_list as $word_item)
{ {
if (!empty($word_item->except_member) && $word_item->except_member === 'Y' && $is_logged)
{
continue;
}
$target = (!empty($word_item->filter_html) && $word_item->filter_html === 'Y') ? 'fulltext' : 'plaintext';
$word = $word_item->word; $word = $word_item->word;
$hit = false; $hit = false;
if (preg_match('#^/.+/$#', $word)) if (preg_match('#^/.+/$#', $word))
{ {
$hit = preg_match($word . 'iu', $text, $matches) ? $matches[0] : false; $hit = preg_match($word . 'iu', $$target, $matches) ? $matches[0] : false;
} }
if ($hit === false) if ($hit === false)
{ {
$hit = (strpos($text, strtolower($word)) !== false) ? $word : false; $hit = (strpos($$target, strtolower($word)) !== false) ? $word : false;
} }
if ($hit !== false) if ($hit !== false)
{ {