OP task #511 | fix validation

web_interface/src/wui-6/main.js

@@ -217,7 +217,7 @@ function checkChangePWD(){
   var oldpass = $('oldpwd').value;
   var newpass = $('newpwd').value;
   var newpassrepeat = $('newpwdrepeat').value;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
   if (oldpass.length === 0 || newpass.length === 0 || newpassrepeat.length === 0){
     alert('Поля не заполнены!');
   } else if (newpass !== newpassrepeat){
@@ -335,7 +335,7 @@ function infoValidation(){
 function ValidateAlphanumeric2(uadd, z) {
   var warn = document.createElement('li');
   // var letter = /^[0-9a-zA-Z]+[^\u0430-\u044f\u0410-\u042f\u0451\u0401\?]+$/m;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<> ]+$/m;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/m;
   warn.innerHTML = 'Поле ' + z + ' может содержать только латинские буквы и цифры';
   if (letter.test(uadd) || !uadd) {
     return true;

web_interface/src/wui-8/info.cgi

@@ -3,20 +3,5 @@
 import json
 print("Content-Type: text/html")
 print("")
-JSON = {
-  "uptime": "2 часа",
-  "model": "BT-6708",
-  "prodate": "31.08.2018",
-  "fwversion": "v 1.0",
-  "macaddr": "FF:00:FF:00:FF:00",
-  "serno": "2650475",
-  "sysname": "Btunchik",
-  "owner": "Karen",
-  "sysLocation": "Moscow",
-  "comment": "No comments",
-  "ups_model": "bTttt",
-  "ups_fwversion": "v 0.5.6",
-  "utc": "3.0",
-  "netsettings_changed": "false"
-}
+JSON = {"uptime":"0 дн. 0 ч. 1 мин.","model":"BT-6708","prodate":"00.00.00","fwversion":"1.2","macaddr":"EC-4C-4D-00-80-0A","serno":"7020000","sysname":"576","owner":"test1234567890test3test1234567890test3t1234567890","sysLocation":"","comment":"test1234567890test3test1234567890test3t12345678901234567890-=+_`~?/.,<>|\:;*@#!%&^()[]{}\/test1234567890test3","ups_model":"RTMP-IIv15","ups_sn":"test1234","ups_fwversion":"V8","netsettings_changed":"false"}
 print(json.dumps(JSON))

web_interface/src/wui-8/main.js

@@ -245,7 +245,7 @@ function checkChangePWD(){
   var oldpass = $('oldpwd').value;
   var newpass = $('newpwd').value;
   var newpassrepeat = $('newpwdrepeat').value;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
   if (oldpass.length === 0 || newpass.length === 0 || newpassrepeat.length === 0){
     alert('Поля не заполнены!');
   } else if (newpass !== newpassrepeat){
@@ -363,7 +363,7 @@ function infoValidation(){
 function ValidateAlphanumeric2(uadd, z) {
   var warn = document.createElement('li');
   // var letter = /^[0-9a-zA-Z]+[^\u0430-\u044f\u0410-\u042f\u0451\u0401\?]+$/m;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<> ]+$/m;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/m;
   warn.innerHTML = 'Поле ' + z + ' может содержать только латинские буквы и цифры';
   if (letter.test(uadd) || !uadd) {
     return true;

web_interface/src/wui/main.js

@@ -222,7 +222,7 @@ function checkChangePWD(){
   var oldpass = $('oldpwd').value;
   var newpass = $('newpwd').value;
   var newpassrepeat = $('newpwdrepeat').value;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/;
   if (oldpass.length === 0 || newpass.length === 0 || newpassrepeat.length === 0){
     alert('Поля не заполнены!');
   } else if (newpass !== newpassrepeat){
@@ -354,7 +354,7 @@ function infoValidation(){
 function ValidateAlphanumeric2(uadd, z) {
   var warn = document.createElement('li');
   // var letter = /^[0-9a-zA-Z]+[^\u0430-\u044f\u0410-\u042f\u0451\u0401\?]+$/m;
-  var letter = /^[0-9a-zA-Z.,/\\\-_*#()[\]+:'"@!^%&?|${}`~<> ]+$/m;
+  var letter = /^[0-9a-zA-Z.,/-_*#()[\]+:'"@!^%&?|${}`~<>]+$/m;
   warn.innerHTML = 'Поле ' + z + ' может содержать только латинские буквы и цифры';
   if (letter.test(uadd) || !uadd) {
     return true;