Explorar o código

fix port min max validation

Avetisyan Karen %!s(int64=4) %!d(string=hai) anos
pai
achega
8b7fc1cbcd

BIN=BIN
web_interface/dist/wui-11/main.js


BIN=BIN
web_interface/dist/wui-11/settings.html


BIN=BIN
web_interface/dist/wui-7/main.js


BIN=BIN
web_interface/dist/wui-7/settings.html


BIN=BIN
web_interface/dist/wui-9/main.js


BIN=BIN
web_interface/dist/wui-9/settings.html


+ 21 - 0
web_interface/src/wui-11/main.js

@@ -130,9 +130,11 @@ function formValidation(){
   }
   if ($('tn_enabled').checked) {
     if(!ValidateNumber(tn_port, ' Порт Telnet')) flag = false;
+    if(!ValidateMinMax(tn_port, ' Порт Telnet')) flag = false;
   }
   if ($('syslog_enable').checked) {
     if(!ValidateNumber(syslog_port, ' Порт Syslog')) flag = false;
+    if(!ValidateMinMax(syslog_port, ' Порт Syslog')) flag = false;
     if(!ValidateIPaddress(syslog_server, ' Сервер Syslog')) flag = false;
   }
   // if ($('ssh_enabled').checked) {
@@ -173,6 +175,25 @@ function formValidation(){
   return flag;
 }
 
+function ValidateMinMax(element, title){
+  var warn = document.createElement('li');
+  var minValue = parseFloat(element.getAttribute('minimum'));
+  var maxValue = parseFloat(element.getAttribute('maximum'));
+  var curValue = parseFloat(element.value);
+  var boolValue = true;
+  if (curValue < minValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть ниже ' + minValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  }
+  else if (curValue > maxValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть выше ' + maxValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  } else { boolValue = true; }
+  return boolValue;
+}
+
 function ValidateIPaddress(ipaddress, z) {
   var warn = document.createElement('li');
   warn.innerHTML = 'Неправильно задан' + z + '!';

+ 2 - 2
web_interface/src/wui-11/settings.html

@@ -145,7 +145,7 @@
       </div>
       <label for="syslog_port" class="col span_1_of_2">Порт</label>
       <div class="col span_1_of_2">
-        <input type="text" class="form-control" id="syslog_port" name="syslog_port">
+        <input type="text" class="form-control" id="syslog_port" name="syslog_port" minimum="1" maximum="65535">
       </div>
     </div>
   </div>
@@ -219,7 +219,7 @@
       </div>
       <label for="tn_port" class="col span_1_of_2">Порт Telnet</label>
       <div class="col span_1_of_2">
-        <input type="text" class="form-control" id="tn_port" name="tn_port">
+        <input type="text" class="form-control" id="tn_port" name="tn_port" minimum="1" maximum="65535">
       </div>
     </div>
 <!--     <div class="col span_1_of_2">

+ 20 - 0
web_interface/src/wui-7/main.js

@@ -118,6 +118,7 @@ function formValidation(){
   }
   if ($('tn_enabled').checked) {
     if(!ValidateNumber(tn_port, ' Порт Telnet')) flag = false;
+    if(!ValidateMinMax(tn_port, ' Порт Telnet')) flag = false;
   }
   if(ups_cell_min > ups_cell_max) {
     var warn = document.createElement('li');
@@ -140,6 +141,25 @@ function formValidation(){
   return flag;
 }
 
+function ValidateMinMax(element, title){
+  var warn = document.createElement('li');
+  var minValue = parseFloat(element.getAttribute('minimum'));
+  var maxValue = parseFloat(element.getAttribute('maximum'));
+  var curValue = parseFloat(element.value);
+  var boolValue = true;
+  if (curValue < minValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть ниже ' + minValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  }
+  else if (curValue > maxValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть выше ' + maxValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  } else { boolValue = true; }
+  return boolValue;
+}
+
 function ValidateIPaddress(ipaddress, z) {
   var warn = document.createElement('li');
   warn.innerHTML = 'Неправильно задан' + z + '!';

+ 1 - 1
web_interface/src/wui-7/settings.html

@@ -215,7 +215,7 @@
       </div>
       <label for="tn_port" class="col span_1_of_2">Порт Telnet</label>
       <div class="col span_1_of_2">
-        <input type="text" class="form-control" id="tn_port" name="tn_port">
+        <input type="text" class="form-control" id="tn_port" name="tn_port" minimum="1" maximum="65535">
       </div>
     </div>
   </div>

+ 21 - 0
web_interface/src/wui-9/main.js

@@ -128,9 +128,11 @@ function formValidation(){
   }
   if ($('tn_enabled').checked) {
     if(!ValidateNumber(tn_port, ' Порт Telnet')) flag = false;
+    if(!ValidateMinMax(tn_port, ' Порт Telnet')) flag = false;
   }
   if ($('ssh_enabled').checked) {
     if(!ValidateNumber(ssh_port, ' Порт SSH')) flag = false;
+    if(!ValidateMinMax(ssh_port, ' Порт SSH')) flag = false;
   }
   if ($('ssh_enabled').checked && $('tn_enabled').checked) {
     if (ssh_port.value == tn_port.value) {
@@ -167,6 +169,25 @@ function formValidation(){
   return flag;
 }
 
+function ValidateMinMax(element, title){
+  var warn = document.createElement('li');
+  var minValue = parseFloat(element.getAttribute('minimum'));
+  var maxValue = parseFloat(element.getAttribute('maximum'));
+  var curValue = parseFloat(element.value);
+  var boolValue = true;
+  if (curValue < minValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть ниже ' + minValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  }
+  else if (curValue > maxValue) {
+    warn.innerHTML = 'Значение ' + title + ' не может быть выше ' + maxValue;
+    $('validation-box').appendChild(warn);
+    boolValue = false;
+  } else { boolValue = true; }
+  return boolValue;
+}
+
 function ValidateIPaddress(ipaddress, z) {
   var warn = document.createElement('li');
   warn.innerHTML = 'Неправильно задан' + z + '!';

+ 2 - 2
web_interface/src/wui-9/settings.html

@@ -161,7 +161,7 @@
       </div>
       <label for="tn_port" class="col span_1_of_2">Порт Telnet</label>
       <div class="col span_1_of_2">
-        <input type="text" class="form-control" id="tn_port" name="tn_port">
+        <input type="text" class="form-control" id="tn_port" name="tn_port" minimum="1" maximum="65535">
       </div>
     </div>
     <div class="col span_1_of_2">
@@ -174,7 +174,7 @@
       </div>
       <label for="ssh_port" class="col span_1_of_2">Порт SSH</label>
       <div class="col span_1_of_2">
-        <input type="text" class="form-control" id="ssh_port" name="ssh_port">
+        <input type="text" class="form-control" id="ssh_port" name="ssh_port" minimum="1" maximum="65535">
       </div>
     </div>
   </div>