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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/spamfilter/spamfilter.admin.controller.php
View file

@ -33,10 +33,10 @@
function procSpamfilterAdminInsertDeniedIP(){
//스팸IP 추가
$ipaddressList = Context::get('ipaddressList');
$ipaddress_list = Context::get('ipaddress_list');
$oSpamfilterController = &getController('spamfilter');
if($ipaddressList){
$insertIPOutput = $oSpamfilterController->insertIP($ipaddressList);
if($ipaddress_list){
$insertIPOutput = $oSpamfilterController->insertIP($ipaddress_list);
if(!$insertIPOutput->toBool()) return $insertIPOutput;
}
@ -45,9 +45,9 @@
}
function procSpamfilterAdminInsertDeniedWord(){
//스팸 키워드 추가
$wordList = Context::get('wordList');
if($wordList){
$insertWordOutput = $this->insertWord($wordList);
$word_list = Context::get('word_list');
if($word_list){
$insertWordOutput = $this->insertWord($word_list);
if(!$insertWordOutput->toBool()) return $insertWordOutput;
}
@ -93,10 +93,10 @@
* @brief Register the spam word
* The post, which contains the newly registered spam word, should be considered as a spam
**/
function insertWord($wordList) {
$wordList = str_replace("\r","",$wordList);
$wordList = explode("\n",$wordList);
foreach($wordList as $wordKey => $word) {
function insertWord($word_list) {
$word_list = str_replace("\r","",$word_list);
$word_list = explode("\n",$word_list);
foreach($word_list as $word) {
if(trim($word)) $args->word = $word;
$output = executeQuery('spamfilter.insertDeniedWord', $args);
if(!$output->toBool()) return $output;