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

merge from 1.5.3.2(r11162 ~ r11201)

Browse source 
and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-11 02:52:49 +00:00
parent 773a666d12
commit 42eb19ae10
32 changed files with 340 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}