|
|
@@ -92,19 +92,24 @@ function fadeIn(el, display){
|
|
|
|
|
|
function formValidation(){
|
|
|
var read_community,write_community,managerIP,managerIP2,managerIP3,managerIP4,managerIP5,
|
|
|
- ipaddr, gw, mask, tn_port/*, ntpservip*/;
|
|
|
-
|
|
|
- read_community = $('read_community'),
|
|
|
- write_community = $('write_community'),
|
|
|
- managerIP = $('managerIP'),
|
|
|
- managerIP2 = $('managerIP2'),
|
|
|
- managerIP3 = $('managerIP3'),
|
|
|
- managerIP4 = $('managerIP4'),
|
|
|
- managerIP5 = $('managerIP5'),
|
|
|
- ipaddr = $('ipaddr'),
|
|
|
- gw = $('gw'),
|
|
|
- mask = $('mask'),
|
|
|
+ ipaddr, gw, mask, tn_port, wtl_ip1, wtl_ip2, wtl_ip3, wtl_ip4, wtl_ip5/*, ntpservip*/;
|
|
|
+
|
|
|
+ read_community = $('read_community');
|
|
|
+ write_community = $('write_community');
|
|
|
+ managerIP = $('managerIP');
|
|
|
+ managerIP2 = $('managerIP2');
|
|
|
+ managerIP3 = $('managerIP3');
|
|
|
+ managerIP4 = $('managerIP4');
|
|
|
+ managerIP5 = $('managerIP5');
|
|
|
+ ipaddr = $('ipaddr');
|
|
|
+ gw = $('gw');
|
|
|
+ mask = $('mask');
|
|
|
tn_port = $('tn_port');
|
|
|
+ wtl_ip1 = $('wtl_ip1');
|
|
|
+ wtl_ip2 = $('wtl_ip2');
|
|
|
+ wtl_ip3 = $('wtl_ip3');
|
|
|
+ wtl_ip4 = $('wtl_ip4');
|
|
|
+ wtl_ip5 = $('wtl_ip5');
|
|
|
// ntpservip = $('ntpservip');
|
|
|
|
|
|
var flag = true;
|
|
|
@@ -124,6 +129,12 @@ function formValidation(){
|
|
|
if(!ValidateIPaddress(managerIP4, ' Сервер SNMP 4')) flag = false;
|
|
|
if(!ValidateIPaddress(managerIP5, ' Сервер SNMP 5')) flag = false;
|
|
|
|
|
|
+ if(!ValidateCIDRIPaddress(wtl_ip1, ' Маска/IP-адреса 1 белого списка')) flag = false;
|
|
|
+ if(!ValidateCIDRIPaddress(wtl_ip2, ' Маска/IP-адреса 2 белого списка')) flag = false;
|
|
|
+ if(!ValidateCIDRIPaddress(wtl_ip3, ' Маска/IP-адреса 3 белого списка')) flag = false;
|
|
|
+ if(!ValidateCIDRIPaddress(wtl_ip4, ' Маска/IP-адреса 4 белого списка')) flag = false;
|
|
|
+ if(!ValidateCIDRIPaddress(wtl_ip5, ' Маска/IP-адреса 5 белого списка')) flag = false;
|
|
|
+
|
|
|
return flag;
|
|
|
}
|
|
|
|
|
|
@@ -136,6 +147,15 @@ function ValidateIPaddress(ipaddress, z) {
|
|
|
$('validation-box').appendChild(warn);
|
|
|
return false;
|
|
|
}
|
|
|
+function ValidateCIDRIPaddress(ipaddress, z) {
|
|
|
+ var warn = document.createElement('li');
|
|
|
+ warn.innerHTML = 'Неправильно задан' + z + '!';
|
|
|
+ if (/^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$/.test(ipaddress.value) || !ipaddress.value) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ $('validation-box').appendChild(warn);
|
|
|
+ return false;
|
|
|
+}
|
|
|
|
|
|
function ValidateNumber(n, z) {
|
|
|
var warn = document.createElement('li');
|
|
|
@@ -796,6 +816,12 @@ function settingsGET(){
|
|
|
$('gw').value = data.gw;
|
|
|
$('mask').value = data.mask;
|
|
|
$('dhcp').checked = data.dhcp;
|
|
|
+ // Whitelist
|
|
|
+ $('wtl_ip1').value = data.wtl_ip1;
|
|
|
+ $('wtl_ip2').value = data.wtl_ip2;
|
|
|
+ $('wtl_ip3').value = data.wtl_ip3;
|
|
|
+ $('wtl_ip4').value = data.wtl_ip4;
|
|
|
+ $('wtl_ip5').value = data.wtl_ip5;
|
|
|
|
|
|
$('tn_enabled').checked = data.tn_enabled;
|
|
|
$('tn_port').value = data.tn_port;
|
Avetisyan Karen