diff --git a/modules/spamfilter/queries/deleteDeniedIP.xml b/modules/spamfilter/queries/deleteDeniedIP.xml index 7269df268..ed7d3da6a 100644 --- a/modules/spamfilter/queries/deleteDeniedIP.xml +++ b/modules/spamfilter/queries/deleteDeniedIP.xml @@ -3,6 +3,6 @@ - + diff --git a/modules/spamfilter/queries/deleteDeniedWord.xml b/modules/spamfilter/queries/deleteDeniedWord.xml index 0f5eef8c3..0bc1bb5c3 100644 --- a/modules/spamfilter/queries/deleteDeniedWord.xml +++ b/modules/spamfilter/queries/deleteDeniedWord.xml @@ -3,6 +3,6 @@
- + diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 62eb457bb..b501cb386 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -70,14 +70,7 @@ class spamfilterAdminController extends spamfilter function procSpamfilterAdminDeleteDeniedIP() { $ipAddressList = Context::get('ipaddress'); - - if(is_array($ipAddressList)) - { - foreach($ipAddressList AS $key=>$ipaddress) - { - $this->deleteIP($ipaddress); - } - } + $this->deleteIP($ipAddressList); $this->setMessage(Context::getLang('success_deleted')); @@ -90,12 +83,13 @@ class spamfilterAdminController extends spamfilter */ function procSpamfilterAdminDeleteDeniedWord() { - $word = Context::get('word'); - //$word = base64_decode(Context::get('word')); - $output = $this->deleteWord($word); + $wordList = Context::get('word'); + $this->deleteWord($wordList); + + $this->setMessage(Context::getLang('success_deleted')); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word'); - return $this->setRedirectUrl($returnUrl, $output); + return $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index 89e36c982..b56f22d1a 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -5,6 +5,11 @@
  • {$lang->cmd_denied_word}
  • {$lang->cmd_config_block}
  • + + + + +
    @@ -13,7 +18,7 @@ - + @@ -22,13 +27,16 @@ - +
    {$lang->cmd_denied_word}
    {$lang->latest_hit} {$lang->hit} {$lang->regdate}{$lang->cmd_delete}
    {$word_info->latest_hit}- {$word_info->hit} {zdate($word_info->regdate,'Y-m-d')}{$lang->cmd_delete}
    {$lang->no_data}
    + + +