ip_type all时,只有ip非空时,切换默认值

证书模块文件校验
ip掩码验证,非掩码范围增加掩码范围提示
国际化sourse和dest修改为client和server
国际化俄文提交
This commit is contained in:
duandongmei
2018-09-14 11:29:17 +08:00
parent 95892b46d5
commit 023317f2e4
7 changed files with 1181 additions and 969 deletions

View File

@@ -259,7 +259,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if(ipv4_ip_subnet_regexp.test(value)){
return true;
}else{
$.validator.messages.ipCheck=$.validator.messages.ipMask;
$.validator.messages.ipCheck=$.validator.messages.ipMaskRange;
return false;
}
}else if(RegExp.$5&&RegExp.$5>32){
@@ -379,7 +379,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if(ipv4_ip_subnet_regexp.test(value)){
return true;
}else{
$.validator.messages.ipCheck=$.validator.messages.ipMask;
$.validator.messages.ipCheck=$.validator.messages.ipMaskRange;
return false;
}
}else if(RegExp.$5&&RegExp.$5>32){
@@ -550,7 +550,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if(ipv4_ip_subnet_regexp.test(value)){
return true;
}else{
$.validator.messages.ipCheck=$.validator.messages.ipMask;
$.validator.messages.ipCheck=$.validator.messages.ipMaskRange;
return false;
}
}else if(RegExp.$5&&RegExp.$5>32){

View File

@@ -30,11 +30,11 @@
ipv6MaskPart:"Mask must be 128",
//ipMaskRange:"IP mask must between 0 and 32",
ipMaskRange:"IP mask must between 16 and 32",
srcIpNotEqDestIp:"Source IP ",
destIpNotEqDestIp:" and destination IP ",
srcIpNotEqDestIp:"Client IP ",
destIpNotEqDestIp:" and Server IP ",
IpNotEqDestIp:" can't be the same",
srcIpIsNotValue:"Source IP can't be ",
destIpIsNotValue:"Destination IP can't be ",
srcIpIsNotValue:"Client IP can't be ",
destIpIsNotValue:"Server IP can't be ",
ipRange:"Wrong IP format or start IP and end IP in two subnet",
ipRange1:"start IP should smaller than end IP",
portCheck:"Please enter a correct port",