fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add regexp support to spamfilter

Browse source
This commit is contained in:
Kijin Sung 2018-08-14 13:15:11 +09:00
parent 75f55c9b5e
commit 7c07727e91
9 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,10 +66,8 @@ class spamfilterModel extends spamfilter
{
$args = new stdClass();
$args->sort_index = "hit";
$output = executeQuery('spamfilter.getDeniedWordList', $args);
if(!$output->data) return;
if(!is_array($output->data)) return array($output->data);
return $output->data;
$output = executeQueryArray('spamfilter.getDeniedWordList', $args);
return $output->data ?: array();
}
/**
@ -84,7 +82,16 @@ class spamfilterModel extends spamfilter
foreach ($word_list as $word_item)
{
$word = $word_item->word;
if (strpos($text, strtolower($word)) !== false)
$hit = false;
if (preg_match('#^/.+/$#', $word))
{
$hit = preg_match($word . 'iu', $text, $matches) ? $matches[0] : false;
}
if ($hit === false)
{
$hit = (strpos($text, strtolower($word)) !== false) ? $word : false;
}
if ($hit !== false)
{
$args = new stdClass();
$args->word = $word;
@ -106,9 +113,14 @@ class spamfilterModel extends spamfilter
}
else
{
$custom_message = sprintf(lang('msg_alert_denied_word'), $word);
$custom_message = lang('msg_alert_denied_word');
}
if (strpos($custom_message, '%s') !== false)
{
$custom_message = sprintf($custom_message, escape($hit, false));
}
return new BaseObject(-1, $custom_message);
}
}