From f15ea2f764f25c3b7af175684b9972dae71517d7 Mon Sep 17 00:00:00 2001 From: chschy Date: Tue, 18 Sep 2012 02:42:41 +0000 Subject: [PATCH] Issue 2354 merge to 1.5.3.2 git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11280 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/spamfilter/spamfilter.controller.php | 2 +- modules/spamfilter/tpl/js/spamfilter_admin.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 525d896a3..e0d889b92 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -140,7 +140,7 @@ $ipaddress_list = str_replace("\r","",$ipaddress_list); $ipaddress_list = explode("\n",$ipaddress_list); foreach($ipaddress_list as $ipaddressValue) { - preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/\s*(.*))?/",$ipaddressValue,$matches); + preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/",$ipaddressValue,$matches); if($ipaddress=trim($matches[1])) { $args->ipaddress = $ipaddress; if(!$description && $matches[4]) $args->description = $matches[4]; diff --git a/modules/spamfilter/tpl/js/spamfilter_admin.js b/modules/spamfilter/tpl/js/spamfilter_admin.js index 46a42623a..3d8e6bd74 100644 --- a/modules/spamfilter/tpl/js/spamfilter_admin.js +++ b/modules/spamfilter/tpl/js/spamfilter_admin.js @@ -21,8 +21,8 @@ function doDeleteDeniedWord(word) { } function doInsertDeniedIP(msg_invalid_format){ var fo_obj = get_by_id('spamfilterInsert'); - var reg_ipaddress = /^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/; - var matchStr_ipaddress = fo_obj.ipaddressList.value; + var reg_ipaddress = /^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/; + var matchStr_ipaddress = fo_obj.ipaddress_list.value; if(!matchStr_ipaddress.match(reg_ipaddress)) { alert(msg_invalid_format); return false; } @@ -32,8 +32,8 @@ function doInsertDeniedIP(msg_invalid_format){ } function doInsertDeniedWord(msg_invalid_format){ var fo_obj = get_by_id('spamfilterInsert'); - var reg_word = /^(.{2,40}[\r\n]+)*.{0,40}$/; - var matchStr_word = fo_obj.wordList.value; + var reg_word = /^(.{2,40}\s*)*$/; + var matchStr_word = fo_obj.word_list.value; if(!matchStr_word.match(reg_word)) { alert(msg_invalid_format); return false; }