diff --git a/modules/spamfilter/spamfilter.admin.view.php b/modules/spamfilter/spamfilter.admin.view.php index 992a27d28..b6db51b52 100644 --- a/modules/spamfilter/spamfilter.admin.view.php +++ b/modules/spamfilter/spamfilter.admin.view.php @@ -39,9 +39,16 @@ class spamfilterAdminView extends spamfilter */ function dispSpamfilterAdminDeniedWordList() { + // Get sort index + $sort_index = Context::get('sort_index'); + if (!in_array($sort_index, array('regdate', 'latest_hit', 'hit'))) + { + $sort_index = 'hit'; + } + // Get the list of denied IP addresses and words $oSpamFilterModel = getModel('spamfilter'); - $word_list = $oSpamFilterModel->getDeniedWordList(); + $word_list = $oSpamFilterModel->getDeniedWordList($sort_index); Context::set('word_list', $word_list); $security = new Security(); diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index f5b8d6c11..6ec830706 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -62,10 +62,10 @@ class spamfilterModel extends spamfilter /** * @brief Return the list of registered Words which were banned */ - function getDeniedWordList() + function getDeniedWordList($sort_index = 'hit') { $args = new stdClass(); - $args->sort_index = "hit"; + $args->sort_index = $sort_index; $output = executeQueryArray('spamfilter.getDeniedWordList', $args); return $output->data ?: array(); } diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index 5d6870d35..160c01a1b 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -17,9 +17,9 @@ {$lang->word} - {$lang->latest_hit} - {$lang->hit} - {$lang->regdate} + {$lang->latest_hit} + {$lang->hit} + {$lang->regdate}