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

Make all spamfilter model methods static

Browse source
This commit is contained in:
Kijin Sung 2024-11-17 20:58:56 +09:00
parent a90f444182
commit a04dc1270f
2 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,9 +50,8 @@ class SpamfilterController extends Spamfilter
if($grant->manager) return;
}
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
$output = $oFilterModel->isDeniedIP();
$output = SpamfilterModel::isDeniedIP();
if(!$output->toBool()) return $output;
// Check if there is a ban on the word
$filter_targets = [$obj->title, $obj->content, $obj->tags ?? ''];
@ -71,7 +70,7 @@ class SpamfilterController extends Spamfilter
}
}
}
$output = $oFilterModel->isDeniedWord(implode("\n", $filter_targets));
$output = SpamfilterModel::isDeniedWord(implode("\n", $filter_targets));
if(!$output->toBool())
{
return $output;
@ -79,7 +78,7 @@ class SpamfilterController extends Spamfilter
// Check the specified time beside the modificaiton time
if($obj->document_srl == 0)
{
$output = $oFilterModel->checkLimited();
$output = SpamfilterModel::checkLimited();
if(!$output->toBool()) return $output;
}
// Save a log
@ -103,9 +102,8 @@ class SpamfilterController extends Spamfilter
if($grant->manager) return;
}
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
$output = $oFilterModel->isDeniedIP();
$output = SpamfilterModel::isDeniedIP();
if(!$output->toBool()) return $output;
// Check if there is a ban on the word
if($is_logged)
@ -116,12 +114,12 @@ class SpamfilterController extends Spamfilter
{
$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;
}
$output = $oFilterModel->isDeniedWord($text);
$output = SpamfilterModel::isDeniedWord($text);
if(!$output->toBool()) return $output;
// If the specified time check is not modified
if(!$obj->__isupdate)
{
$output = $oFilterModel->checkLimited();
$output = SpamfilterModel::checkLimited();
if(!$output->toBool()) return $output;
}
unset($obj->__isupdate);
@ -197,7 +195,7 @@ class SpamfilterController extends Spamfilter
return;
}
$output = SpamfilterModel::getInstance()->isDeniedIP();
$output = SpamfilterModel::isDeniedIP();
if (!$output->toBool())
{
return $output;
@ -219,7 +217,7 @@ class SpamfilterController extends Spamfilter
return;
}
$output = SpamfilterModel::getInstance()->isDeniedIP();
$output = SpamfilterModel::isDeniedIP();
if (!$output->toBool())
{
return $output;
@ -240,16 +238,15 @@ class SpamfilterController extends Spamfilter
$logged_info = Context::get('logged_info');
if($logged_info->is_admin == 'Y') return;
$oFilterModel = getModel('spamfilter');
// Check if the IP is prohibited
$output = $oFilterModel->isDeniedIP();
$output = SpamfilterModel::isDeniedIP();
if(!$output->toBool()) return $output;
// Check if there is a ban on the word
$text = $obj->title . ' ' . $obj->content;
$output = $oFilterModel->isDeniedWord($text);
$output = SpamfilterModel::isDeniedWord($text);
if(!$output->toBool()) return $output;
// Check the specified time
$output = $oFilterModel->checkLimited(TRUE);
$output = SpamfilterModel::checkLimited(TRUE);
if(!$output->toBool()) return $output;
// Save a log
$this->insertLog();