Browse Source

fix ftp_port min val validation & mainvolt_in_hist min value

Avetisyan Karen 3 years ago
parent
commit
8e13db3d29
2 changed files with 2 additions and 2 deletions
  1. BIN
      web_interface/dist/wui-11/main.js
  2. 2 2
      web_interface/src/wui-11/main.js

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


+ 2 - 2
web_interface/src/wui-11/main.js

@@ -944,7 +944,7 @@ function settingsGET(){
     $('mainvolt_in_low').value = data.mainvolt_in_low;
     $('mainvolt_in_low').value = data.mainvolt_in_low;
     $('mainvolt_in_high').value = data.mainvolt_in_high;
     $('mainvolt_in_high').value = data.mainvolt_in_high;
     mainvolt_in_hist = new SpinBox('mainvolt_in_hist', {
     mainvolt_in_hist = new SpinBox('mainvolt_in_hist', {
-      'name':'mainvolt_in_hist','minimum':5,'maximum':30,'step':1, 'value': data.mainvolt_in_hist
+      'name':'mainvolt_in_hist','minimum':10,'maximum':30,'step':1, 'value': data.mainvolt_in_hist
     });
     });
     // Whitelist
     // Whitelist
     $('wtl_ip1').value = data.wtl_ip1;
     $('wtl_ip1').value = data.wtl_ip1;
@@ -1059,7 +1059,7 @@ function ftpSettings() {
       if (!/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test($('ftp_server').value)) {
       if (!/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test($('ftp_server').value)) {
         return alert('Не верный формат IP-адреса сервера');
         return alert('Не верный формат IP-адреса сервера');
       }
       }
-      if(isNaN(parseInt($('ftp_port').value)) || parseInt($('ftp_port').value) > 65535) {
+      if(isNaN(parseInt($('ftp_port').value)) || parseInt($('ftp_port').value) < 1 || parseInt($('ftp_port').value) > 65535) {
         return alert('Не верный формат порта сервера');
         return alert('Не верный формат порта сервера');
       }
       }
       if(!/^[0-9a-zA-Z.,/\-_*#()[\]+=;:'"@!^%&?|${}`~<>]+$/.test($('ftp_login').value)) {
       if(!/^[0-9a-zA-Z.,/\-_*#()[\]+=;:'"@!^%&?|${}`~<>]+$/.test($('ftp_login').value)) {