diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 666af2186..68176e752 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -367,7 +367,7 @@ configuration=Configuration
direction=Direction
protocol=Protocol
oneway=Single
-twoway=Two-way
+twoway=Double
arbitrary=Arbitrarily
basic_config=Basic Configuration
block_config=Configuration Info
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index 84539577f..0bdef9c2a 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -38,7 +38,7 @@
<%-- >
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index 9f4bf4024..4cbebe584 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -59,13 +59,15 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
- }
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
+ }
}
});
if(flag){
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index 9ecb25d8a..4384c627d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -65,13 +65,15 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
- }
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
+ }
}
});
if(flag){
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 6d7943ab2..4990b79ab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -58,12 +58,14 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
}
}
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 9d1598f10..0cf3a381b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -59,12 +59,14 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
}
}
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index 0024d64b9..548357849 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -66,13 +66,15 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
- }
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
+ }
}
});
if(flag){
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index d4bb37f59..65474188f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -59,12 +59,14 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
}
}
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index ba94b9dc4..910b722c3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -104,16 +104,14 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- alert($(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").length);
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
}
}
});
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index 82e2ce98d..2842d3d07 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -59,14 +59,15 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
- if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
- $(this).parents(".boxSolid").find(
- "div[for='"
- + $(this).attr("name").replace("isHexbin","cfgKeywords")
- + "']").html("");
- flag = false;
- return;
- }
+ if(keywords != ''){
+ if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+ $(this).parents(".boxSolid").find(
+ "div[for='"
+ + $(this).attr("name").replace("isHexbin","cfgKeywords")
+ + "']").html("");
+ flag = false;
+ }
+ }
}
});
if(flag){