OP task #511 | info and pass validation changes

web_interface/src/wui-6/info.html

@@ -63,15 +63,15 @@
     </tr>
     <tr>
       <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
     </tr>
     <tr>
       <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
     </tr>
     <tr>
       <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
     </tr>
   </tbody>
   <thead>

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.html

@@ -63,15 +63,15 @@
     </tr>
     <tr>
       <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
     </tr>
     <tr>
       <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
     </tr>
     <tr>
       <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
     </tr>
   </tbody>
   <thead>

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/info.html

@@ -63,15 +63,15 @@
     </tr>
     <tr>
       <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
     </tr>
     <tr>
       <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
     </tr>
     <tr>
       <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="100"></td>
+      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
     </tr>
   </tbody>
   <thead>

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;