fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-31 00:59:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from branch 1.5.3.2 (version 1.5.3.3, ~r11282)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11284 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-18 04:45:36 +00:00
parent 77f5aa2671
commit 2263200ce4
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/context/Context.class.php
View file

@ -810,6 +810,13 @@ class Context {
elseif($this->getRequestMethod()=='POST'&&isset($_POST[$key])) $set_to_vars = true; elseif($this->getRequestMethod()=='POST'&&isset($_POST[$key])) $set_to_vars = true;
else $set_to_vars = false; else $set_to_vars = false;
if($set_to_vars)
{
$val = preg_replace('/<\?.*(\?>)?/iUsm', '', $val);
$val = preg_replace('/<\%.*(\%>)?/iUsm', '', $val);
$val = preg_replace('/<script(\s|\S)*language[\s]*=("|\')php("|\')(\s|\S)*>.*<[\s]*\/[\s]*script[\s]*>/iUsm', '', $val);
}
$this->set($key, $val, $set_to_vars); $this->set($key, $val, $set_to_vars);
} }
} }

2
config/config.inc.php
View file

@ -14,7 +14,7 @@
* Display XE's full version * Display XE's full version
* Even The file should be revised when releasing altough no change is made * 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. * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.

2
modules/spamfilter/spamfilter.controller.php
View file

@ -140,7 +140,7 @@
$ipaddress_list = str_replace("\r","",$ipaddress_list); $ipaddress_list = str_replace("\r","",$ipaddress_list);
$ipaddress_list = explode("\n",$ipaddress_list); $ipaddress_list = explode("\n",$ipaddress_list);
foreach($ipaddress_list as $ipaddressValue) { 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])) { if($ipaddress=trim($matches[1])) {
$args->ipaddress = $ipaddress; $args->ipaddress = $ipaddress;
if(!$description && $matches[4]) $args->description = $matches[4]; if(!$description && $matches[4]) $args->description = $matches[4];

8
modules/spamfilter/tpl/js/spamfilter_admin.js
View file

@ -21,8 +21,8 @@ function doDeleteDeniedWord(word) {
} }
function doInsertDeniedIP(msg_invalid_format){ function doInsertDeniedIP(msg_invalid_format){
var fo_obj = get_by_id('spamfilterInsert'); var fo_obj = get_by_id('spamfilterInsert');
var reg_ipaddress = /^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/; var reg_ipaddress = /^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/;
var matchStr_ipaddress = fo_obj.ipaddressList.value; var matchStr_ipaddress = fo_obj.ipaddress_list.value;
if(!matchStr_ipaddress.match(reg_ipaddress)) { if(!matchStr_ipaddress.match(reg_ipaddress)) {
alert(msg_invalid_format); return false; alert(msg_invalid_format); return false;
} }
@ -32,8 +32,8 @@ function doInsertDeniedIP(msg_invalid_format){
} }
function doInsertDeniedWord(msg_invalid_format){ function doInsertDeniedWord(msg_invalid_format){
var fo_obj = get_by_id('spamfilterInsert'); var fo_obj = get_by_id('spamfilterInsert');
var reg_word = /^(.{2,40}[\r\n]+)*.{0,40}$/; var reg_word = /^(.{2,40}\s*)*$/;
var matchStr_word = fo_obj.wordList.value; var matchStr_word = fo_obj.word_list.value;
if(!matchStr_word.match(reg_word)) { if(!matchStr_word.match(reg_word)) {
alert(msg_invalid_format); return false; alert(msg_invalid_format); return false;
} }