diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml index b7988e2a2..3613c99a8 100644 --- a/modules/spamfilter/conf/module.xml +++ b/modules/spamfilter/conf/module.xml @@ -7,10 +7,10 @@ - - - - - + + + + + diff --git a/modules/spamfilter/ruleset/deleteDeniedIp.xml b/modules/spamfilter/ruleset/deleteDeniedIp.xml new file mode 100644 index 000000000..7fcceed6d --- /dev/null +++ b/modules/spamfilter/ruleset/deleteDeniedIp.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/modules/spamfilter/ruleset/deleteDeniedWord.xml b/modules/spamfilter/ruleset/deleteDeniedWord.xml new file mode 100644 index 000000000..40193e835 --- /dev/null +++ b/modules/spamfilter/ruleset/deleteDeniedWord.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/spamfilter/ruleset/insertConfig.xml b/modules/spamfilter/ruleset/insertConfig.xml new file mode 100644 index 000000000..67fa08985 --- /dev/null +++ b/modules/spamfilter/ruleset/insertConfig.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/spamfilter/ruleset/insertDeniedIp.xml b/modules/spamfilter/ruleset/insertDeniedIp.xml new file mode 100644 index 000000000..7d1f6c05a --- /dev/null +++ b/modules/spamfilter/ruleset/insertDeniedIp.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/modules/spamfilter/ruleset/insertDeniedWord.xml b/modules/spamfilter/ruleset/insertDeniedWord.xml new file mode 100644 index 000000000..90345f73b --- /dev/null +++ b/modules/spamfilter/ruleset/insertDeniedWord.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index b1b59856d..0faf78943 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -23,6 +23,11 @@ // Create and insert the module Controller object $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('spamfilter',$args); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfig'); + header('location:'.$returnUrl); + return; + } return $output; } @@ -42,7 +47,13 @@ **/ function procSpamfilterAdminDeleteDeniedIP() { $ipaddress = Context::get('ipaddress'); - return $this->deleteIP($ipaddress); + $output = $this->deleteIP($ipaddress); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedIPList'); + header('location:'.$returnUrl); + return; + } + return $output; } /** @@ -50,7 +61,13 @@ **/ function procSpamfilterAdminInsertDeniedWord() { $word = Context::get('word'); - return $this->insertWord($word); + $output = $this->insertWord($word); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList'); + header('location:'.$returnUrl); + return; + } + return $output; } /** @@ -58,7 +75,13 @@ **/ function procSpamfilterAdminDeleteDeniedWord() { $word = base64_decode(Context::get('word')); - return $this->deleteWord($word); + $output = $this->deleteWord($word); + if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList'); + header('location:'.$returnUrl); + return; + } + return $output; } /** diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html index 750d0314a..cf2a34cb7 100644 --- a/modules/spamfilter/tpl/denied_ip_list.html +++ b/modules/spamfilter/tpl/denied_ip_list.html @@ -1,15 +1,15 @@ - - - -
+ +
-
+

{$XE_VALIDATOR_ERROR}

+ + diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index 64e99e6b3..bbc060765 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -1,15 +1,15 @@ - - - - + + - +

{$XE_VALIDATOR_ERROR}

+ +
{$lang->denied_ip}
diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html index c5c7d684a..91fda18f7 100644 --- a/modules/spamfilter/tpl/index.html +++ b/modules/spamfilter/tpl/index.html @@ -1,8 +1,8 @@ - - - +

{$XE_VALIDATOR_ERROR}

+ +
{$lang->word}
diff --git a/modules/spamfilter/tpl/js/spamfilter_admin.js b/modules/spamfilter/tpl/js/spamfilter_admin.js index 4bf4159ed..23a811542 100644 --- a/modules/spamfilter/tpl/js/spamfilter_admin.js +++ b/modules/spamfilter/tpl/js/spamfilter_admin.js @@ -4,7 +4,7 @@ function doDeleteDeniedIP(ipaddress) { var fo_obj = get_by_id('fo_denied_ip'); fo_obj.ipaddress.value = ipaddress; - procFilter(fo_obj, delete_denied_ip); + fo_obj.submit(); } /** @@ -13,5 +13,5 @@ function doDeleteDeniedIP(ipaddress) { function doDeleteDeniedWord(word) { var fo_obj = get_by_id('fo_denied_word'); fo_obj.word.value = word; - procFilter(fo_obj, delete_denied_word); + fo_obj.submit(); }