From 2263200ce4cc242b1d7a0881dac30f32d62f79ff Mon Sep 17 00:00:00 2001 From: flyskyko Date: Tue, 18 Sep 2012 04:45:36 +0000 Subject: [PATCH] merge from branch 1.5.3.2 (version 1.5.3.3, ~r11282) git-svn-id: http://xe-core.googlecode.com/svn/trunk@11284 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/context/Context.class.php | 7 +++++++ config/config.inc.php | 2 +- modules/spamfilter/spamfilter.controller.php | 2 +- modules/spamfilter/tpl/js/spamfilter_admin.js | 8 ++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 3582c6198..57fdb521b 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -810,6 +810,13 @@ class Context { elseif($this->getRequestMethod()=='POST'&&isset($_POST[$key])) $set_to_vars = true; else $set_to_vars = false; + if($set_to_vars) + { + $val = preg_replace('/<\?.*(\?>)?/iUsm', '', $val); + $val = preg_replace('/<\%.*(\%>)?/iUsm', '', $val); + $val = preg_replace('/.*<[\s]*\/[\s]*script[\s]*>/iUsm', '', $val); + } + $this->set($key, $val, $set_to_vars); } } diff --git a/config/config.inc.php b/config/config.inc.php index 7f3cc2592..a159bf18b 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -14,7 +14,7 @@ * Display XE's full version * Even The file should be revised when releasing altough no change is made */ - define('__XE_VERSION__', '1.5.3.2'); + define('__XE_VERSION__', '1.5.3.3'); /** * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. 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; }