Merge branch 'origin/main' into Weblate.

Currently translated at 88.0% (663 of 753 strings)

Translation: NetAlertX/core
Translate-URL: https://hosted.weblate.org/projects/pialert/core/pl/

docs/PLUGINS_DEV.md

@@ -578,7 +578,7 @@ Each element may also have associated events (e.g., running a scan or triggering
     
 ##### Supported settings `function` values
 
-You can have any `"function": "my_custom_name"` custom name, however, the ones listed below have a specific functionality attached to them. If you use a custom name, then the setting is mostly used as an input parameter for the `params` section.
+You can have any `"function": "my_custom_name"` custom name, however, the ones listed below have a specific functionality attached to them. 
 
 | Setting | Description |
 | ------- | ----------- |

front/css/app.css

@@ -1529,6 +1529,14 @@ input[readonly] {
     flex-direction:column;
     justify-content:center;
 }
+.networkHelpIcon
+{
+  padding: 5px;
+  margin-left: 5px;
+  top: 55px;
+  position: absolute;
+  z-index:5;
+}
 #networkTree .netNodeText
 { 
     position: absolute;
@@ -1589,7 +1597,7 @@ input[readonly] {
 
 .spanNetworkTree {
     display: inline-block;
-    width: 120px;
+    width: 135px;
     white-space: nowrap;
     overflow: hidden !important;
     text-overflow: ellipsis;
@@ -1635,6 +1643,10 @@ input[readonly] {
     {
         display: none;
     }
+    .dev-detail-tab-name
+    {
+        display: none;
+    }
 }
 
 /* ----------------------------------------------------------------- */

front/deviceDetails.php

@@ -61,12 +61,54 @@
         <!-- <div class="box-transparent"> -->
           <div id="navDevice" class="nav-tabs-custom">
             <ul class="nav nav-tabs" style="font-size:16px;">
-              <li> <a id="tabDetails"  href="#panDetails"  data-toggle="tab"> <?= lang('DevDetail_Tab_Details');?>  </a></li>
+              <li> 
-              <li> <a id="tabTools"    href="#panTools"    data-toggle="tab"> <?= lang('DevDetail_Tab_Tools');?>    </a></li>
+                <a id="tabDetails"  href="#panDetails"  data-toggle="tab"> 
-              <li> <a id="tabSessions" href="#panSessions" data-toggle="tab"> <?= lang('DevDetail_Tab_Sessions');?> </a></li>
+                  <i class="fa fa-info-circle"></i> 
-              <li> <a id="tabPresence" href="#panPresence" data-toggle="tab"> <?= lang('DevDetail_Tab_Presence');?> </a></li>
+                    <span class="dev-detail-tab-name"> 
-              <li> <a id="tabEvents"   href="#panEvents"   data-toggle="tab"> <?= lang('DevDetail_Tab_Events');?>   </a></li>              
+                      <?= lang('DevDetail_Tab_Details');?>  
-              <li> <a id="tabPlugins"  href="#panPlugins"  data-toggle="tab"> <?= lang('DevDetail_Tab_Plugins');?>  </a></li>
+                    </span>
+                </a>
+                </li>
+                <li> 
+                <a id="tabTools"    href="#panTools"    data-toggle="tab"> 
+                  <i class="fa fa-screwdriver-wrench"></i> 
+                    <span class="dev-detail-tab-name">
+                      <?= lang('DevDetail_Tab_Tools');?>    
+                    </span>
+                </a>
+                </li>
+              <li> 
+                <a id="tabSessions" href="#panSessions" data-toggle="tab"> 
+                  <i class="fa fa-list-ol"></i> 
+                    <span class="dev-detail-tab-name">
+                      <?= lang('DevDetail_Tab_Sessions');?> 
+                    </span>
+                </a>
+                </li>
+              <li> 
+                <a id="tabPresence" href="#panPresence" data-toggle="tab"> 
+                  <i class="fa fa-calendar"></i> 
+                    <span class="dev-detail-tab-name"> 
+                      <?= lang('DevDetail_Tab_Presence');?> 
+                    </span>
+                </a>
+                </li>
+              <li> 
+                <a id="tabEvents"   href="#panEvents"   data-toggle="tab"> 
+                  <i class="fa fa-bolt"></i>  
+                    <span class="dev-detail-tab-name">
+                      <?= lang('DevDetail_Tab_Events');?>   
+                    </span>
+                </a>
+                </li>              
+              <li> 
+                <a id="tabPlugins"  href="#panPlugins"  data-toggle="tab"> 
+                  <i class="fa fa-plug"></i> 
+                    <span class="dev-detail-tab-name">
+                      <?= lang('DevDetail_Tab_Plugins');?>  
+                    </span>
+                </a>
+                </li>
 
               <div class="btn-group pull-right">
                 <button type="button" class="btn btn-default"  style="padding: 10px; min-width: 30px;"

front/deviceDetailsEdit.php

@@ -348,16 +348,17 @@
     const createNew = mac === 'new' ? 1 : 0;
 
     const devLastIP = $('#NEWDEV_devLastIP').val();
+    const newMac = $('#NEWDEV_devMac').val()
 
     // Validate MAC and Last IP
-    if (mac === '' || !(isValidIPv4(devLastIP) || isValidIPv6(devLastIP))) {
+    if (mac === '' || !isValidMac(newMac) || !( isValidIPv4(devLastIP) || isValidIPv6(devLastIP) )) {
       showMessage(getString("DeviceEdit_ValidMacIp"), 5000, "modal_red");
       return;
     }
 
     showSpinner();
 
-     // Update data to server using POST
+    // Update data to server using POST
     $.post('php/server/devices.php?action=setDeviceData', {
         mac: $('#NEWDEV_devMac').val(),
         name: encodeURIComponent($('#NEWDEV_devName').val().replace(/'/g, "")),
@@ -403,7 +404,6 @@
         // Everything loaded
         hideSpinner();
     });
-
   }
 
   //-----------------------------------------------------------------------------------

front/devices.php

@@ -40,9 +40,9 @@
 
       <div class="row" id="DevicePresence">
           <div class="col-md-12">
-          <div class="box" id="clients">
+            <div class="box" id="clients">
               <div class="box-header ">
-                <h3 class="box-title"><?= lang('Device_Shortcut_OnlineChart');?> </h3> 
+                <h3 class="box-title col-md-12"><?= lang('Device_Shortcut_OnlineChart');?> </h3> 
               </div>
               <div class="box-body">
                 <div class="chart">
@@ -61,7 +61,7 @@
       <!-- Device Filters ------------------------------------------------------- -->
       <div class="box box-aqua hidden" id="columnFiltersWrap">
         <div class="box-header ">
-          <h3 class="box-title"><?= lang('Devices_Filters');?> </h3> 
+          <h3 class="box-title col-md-12"><?= lang('Devices_Filters');?> </h3> 
         </div>
         <!-- Placeholder ------------------------------------------------------- -->
          <div id="columnFilters" ></div>

front/js/common.js

@@ -776,6 +776,11 @@ function checkMacOrInternet(inputStr) {
   }
 }
 
+// Alias
+function isValidMac(value) {
+  return checkMacOrInternet(value);
+}
+
 // -----------------------------------------------------------------------------
 // Gte MAC from query string
 function getMac(){

front/js/settings_utils.js

@@ -717,6 +717,7 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
   let customParams = "";
   let customId = "";
   let columns = [];
+  let base64Regex = "";
 
 
   elementOptions.forEach((option) => {
@@ -773,6 +774,9 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
     if (option.columns) {
       columns = option.columns;
     }
+    if (option.base64Regex) {
+      base64Regex = option.base64Regex;
+    }
   });
 
   if (transformers.includes("sha256")) {
@@ -796,7 +800,8 @@ const handleElementOptions = (setKey, elementOptions, transformers, val) => {
     onChange,
     customParams,
     customId,
-    columns
+    columns,
+    base64Regex
   };
 };
 
@@ -973,7 +978,8 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
       onChange,
       customParams,
       customId,
-      columns
+      columns,
+      base64Regex
     } = handleElementOptions(setKey, elementOptions, transformers, inVal);
 
     // Override value
@@ -1022,6 +1028,7 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
                         my-customparams="${customParams}" 
                         my-customid="${customId}" 
                         my-originalSetKey="${originalSetKey}"
+                        my-base64Regex="${base64Regex}"
                         id="${setKey}${suffix}" 
                         type="${inputType}" 
                         value="${val}" 

front/js/ui_components.js

@@ -171,7 +171,47 @@ function updateIconPreview(elem) {
   tryUpdateIcon();
 }
 
+// ----------------------------------------------
+// Validate the value based on regex
+// ⚠ IMPORTANT: use the below to get a valid REGEX ⚠
+// const regexStr = String.raw`^(?:\*|(?:[0-9]|[1-5][0-9]|[0-9]+-[0-9]+|\*/[0-9]+))\s+(?:\*|(?:[0-9]|1[0-9]|2[0-3]|[0-9]+-[0-9]+|\*/[0-9]+))\s+(?:\*|(?:[1-9]|[12][0-9]|3[01]|[0-9]+-[0-9]+|\*/[0-9]+))\s+(?:\*|(?:[1-9]|1[0-2]|[0-9]+-[0-9]+|\*/[0-9]+))\s+(?:\*|(?:[0-6]|[0-6]-[0-6]|\*/[0-9]+))$`;
+// console.log(btoa(regexStr));
+function validateRegex(elem) {
+  const iconSpan  = $(elem).parent().find(".validityCheck");
+  const inputElem = $(elem);
+  const regexTmp  = atob($(inputElem).attr("my-base64Regex")); // Decode base64 regex
 
+  console.log(regexTmp);
+  const regex = new RegExp(regexTmp); // Convert to a valid RegExp object
+  
+  let attempts = 0;
+
+  function tryUpdateValidityResultIcon() {
+      let value = inputElem.val().trim(); // Ensure trimmed value
+
+      if (value === "") {
+          attempts++;
+          if (attempts < 10) {
+              setTimeout(tryUpdateValidityResultIcon, 1000); // Retry after 1 sec if empty
+          } else {
+              console.error("Input value is empty after 10 attempts");
+          }
+          return;
+      }
+
+      // Validate against regex
+      if (regex.test(value)) {
+          iconSpan.html("<i class='fa-regular fa-check'></i>");
+      } else {
+          iconSpan.html("<i class='fa-regular fa-xmark'></i>");
+      }
+  }
+
+  // Attach real-time validation on input change
+  inputElem.on("input", tryUpdateValidityResultIcon);
+
+  tryUpdateValidityResultIcon(); // Initial validation
+}
 
 // -----------------------------------------------------------------------------
 // Nice checkboxes with iCheck
@@ -231,38 +271,65 @@ function copyToClipboard(buttonElement) {
 // Simple Sortable Table columns 
 // -----------------------------------------------------------------------------
 
+// Function to handle column sorting when a user clicks on a table header
 function sortColumn(element) {
-  var th = $(element).closest('th');
+  var th = $(element).closest('th'); // Get the clicked table header
-  var table = th.closest('table');
+  var table = th.closest('table'); // Find the closest table
-  var columnIndex = th.index();
+  var columnIndex = th.index(); // Get the index of the column
-  var ascending = !th.data('asc');
+  var ascending = !th.data('asc'); // Toggle sorting order
   sortTable(table, columnIndex, ascending);
-  th.data('asc', ascending);
+  th.data('asc', ascending); // Store sorting order
 }
 
+// Function to sort the table based on the selected column
 function sortTable(table, columnIndex, ascending) {
-  var tbody = table.find('tbody');
+  var tbody = table.find('tbody'); // Get the table body
-  var rows = tbody.find('tr').toArray().sort(comparer(columnIndex));
+  var rows = tbody.find('tr').toArray().sort(comparer(columnIndex)); // Convert rows to an array and sort
   if (!ascending) {
-    rows = rows.reverse();
+    rows = rows.reverse(); // Reverse order if descending
   }
   for (var i = 0; i < rows.length; i++) {
-    tbody.append(rows[i]);
+    tbody.append(rows[i]); // Append sorted rows back to the table
   }
 }
 
+// Function to compare values in the selected column
 function comparer(index) {
-  return function(a, b) {
+  return function (a, b) {
     var valA = getCellValue(a, index);
     var valB = getCellValue(b, index);
-    return $.isNumeric(valA) && $.isNumeric(valB) ? valA - valB : valA.localeCompare(valB);
+
+    // Check if both values are valid IP addresses, and sort numerically if so
+    if (isIPAddress(valA) && isIPAddress(valB)) {
+      return ipToNum(valA) - ipToNum(valB);
+    }
+
+    // If both values are numbers, sort numerically
+    if ($.isNumeric(valA) && $.isNumeric(valB)) {
+      return valA - valB;
+    }
+
+    // Otherwise, sort as text
+    return valA.localeCompare(valB);
   };
 }
 
+// Function to get the text value from a table cell
 function getCellValue(row, index) {
-  return $(row).children('td').eq(index).text();
+  return $(row).children('td').eq(index).text().trim(); // Get text from the specified column and trim spaces
 }
 
+// Function to check if a string is a valid IPv4 address
+function isIPAddress(value) {
+  return /^\d{1,3}(\.\d{1,3}){3}$/.test(value); // Regular expression to match IPv4 format
+}
+
+// Function to convert an IP address to a numeric value for sorting
+function ipToNum(ip) {
+  return ip.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet, 10), 0);
+}
+
+
 // ----------------------------------------------------------------------------- 
 // handling events 
 // ----------------------------------------------------------------------------- 

front/multiEditCore.php

@@ -136,7 +136,8 @@
                     onChange,
                     customParams,
                     customId,
-                    columns
+                    columns,
+                    base64Regex
                   } = handleElementOptions('none', elementOptions, transformers, val = "");
 
                   //  render based on element type 

front/network.php

@@ -464,9 +464,8 @@
   require 'php/templates/footer.php';
 ?>
 
-
+<script src="lib/treeviz/bundle.js"></script> 
-<script src="lib/treeviz/index.js"></script>
+<script src="lib/treeviz/bundle.js.map"></script> 
-<script src="lib/treeviz/require.js"></script>
 
 
 <script defer>
@@ -527,7 +526,6 @@
     // Init global variable
     deviceListGlobal = devicesListnew;
     
-    
     // create tree
     initTree(getHierarchy());
 
@@ -538,378 +536,414 @@
 
 
 <script defer>
-  // ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
-  // Tree functionality
+// Tree functionality
-  // ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-  // ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+var leafNodesCount = 0;
+var visibleNodesCount = 0;
+var parentNodesCount = 0;
+var hiddenMacs = []; // hidden children
+var hiddenChildren = [];
+var deviceListGlobal = null; 
+
+
+
+
+// ---------------------------------------------------------------------------
+// Recursively get children nodes and build a tree
+function getChildren(node, list, path, visited = [])
+{
+    var children = [];
+
+    // Check for infinite recursion by seeing if the node has been visited before
+    if (visited.includes(node.mac.toLowerCase())) {
+        console.error("Infinite recursion detected at node:", node.mac);
+        write_notification("[ERROR] ⚠ Infinite recursion detected. You probably have assigned the Internet node to another children node or to itself. Please open a new issue on GitHub and describe how you did it.", 'interrupt')
+        return { error: "Infinite recursion detected", node: node.mac };
+    }
+
+    // Add current node to visited list
+    visited.push(node.mac.toLowerCase());
+
+    // Loop through all items to find children of the current node
+    for (var i in list) {
+        if (list[i].parentMac.toLowerCase() == node.mac.toLowerCase() && !hiddenMacs.includes(list[i].parentMac)) {   
+
+            visibleNodesCount++;
+
+            // Process children recursively, passing a copy of the visited list
+            children.push(getChildren(list[i], list, path + ((path == "") ? "" : '|') + list[i].parentMac, visited));
+        }
+    }
+
+    // Track leaf and parent node counts
+    if (children.length == 0) {
+        leafNodesCount++;
+    } else {
+        parentNodesCount++;
+    }
+
+    return { 
+        name: node.name,
+        path: path,
+        mac: node.mac,
+        port: node.port,
+        id: node.mac,
+        parentMac: node.parentMac,
+        icon: node.icon,
+        type: node.type,
+        status: node.status,
+        hasChildren: children.length > 0 || hiddenMacs.includes(node.mac),
+        hiddenChildren: hiddenMacs.includes(node.mac),
+        qty: children.length,
+        children: children
+    };
+}
+
+// ---------------------------------------------------------------------------  
+function getHierarchy()
+{ 
+  for(i in deviceListGlobal)
+  {      
+    if(deviceListGlobal[i].mac == 'Internet')
+    { 
+      return (getChildren(deviceListGlobal[i], deviceListGlobal, ''))
+      break;
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+function getFlatData() {
+  var result = [];
   var leafNodesCount = 0;
-  var visibleNodesCount = 0;
   var parentNodesCount = 0;
-  var hiddenMacs = []; // hidden children
+  var visibleNodesCount = 0;
-  var hiddenChildren = [];
-  var deviceListGlobal = null; 
   
+  for (let node of deviceListGlobal) {
+    let path = "";
+    let childrenCount = 0;
 
+    // count children of this node
+    for (let nodeTmp of deviceListGlobal) {
+        if (nodeTmp.parentMac === node.mac) {
+            childrenCount++;
+        }
+    }
     
+    // store parent and leaf node count
+    if (childrenCount === 0) {
+        leafNodesCount++;
+    } else {
+        parentNodesCount++;
+    }
     
-  // ---------------------------------------------------------------------------
+    if (!hiddenMacs.includes(node.parentMac)) {   
-  // Recursively get children nodes and build a tree
+      if (!((node.parentMac == "") && node.mac != "Internet")) {  // skip leaf nodes without father that are not the root
-  function getChildren(node, list, path, visited = [])
+        visibleNodesCount++;
-  {
-      var children = [];
         
-      // Check for infinite recursion by seeing if the node has been visited before
+        result.push({
-      if (visited.includes(node.mac.toLowerCase())) {
+            name: node.name,
-          console.error("Infinite recursion detected at node:", node.mac);
+            path: path,
-          write_notification("[ERROR] ⚠ Infinite recursion detected. You probably have assigned the Internet node to another children node or to itself. Please open a new issue on GitHub and describe how you did it.", 'interrupt')
+            mac: node.mac, // Replacing "mac" with "id"
-          return { error: "Infinite recursion detected", node: node.mac };
+            parentMac: node.mac == "Internet" ? "" : node.parentMac, // Replacing "parentMac" with "father"
-      }
+            port: node.port,
-
+            icon: node.icon,
-      // Add current node to visited list
+            type: node.type,
-      visited.push(node.mac.toLowerCase());
+            status: node.status,
-
+            hasChildren: childrenCount > 0 || hiddenMacs.includes(node.mac),
-      // Loop through all items to find children of the current node
+            hiddenChildren: hiddenMacs.includes(node.mac),
-      for (var i in list) {
+            qty: childrenCount,
-          if (list[i].parentMac.toLowerCase() == node.mac.toLowerCase() && !hiddenMacs.includes(list[i].parentMac)) {   
+        });
-
-              visibleNodesCount++;
-
-              // Process children recursively, passing a copy of the visited list
-              children.push(getChildren(list[i], list, path + ((path == "") ? "" : '|') + list[i].parentMac, visited));
-          }
-      }
-
-      // Track leaf and parent node counts
-      if (children.length == 0) {
-          leafNodesCount++;
-      } else {
-          parentNodesCount++;
-      }
-
-      return { 
-          name: node.name,
-          path: path,
-          mac: node.mac,
-          port: node.port,
-          id: node.mac,
-          parentMac: node.parentMac,
-          icon: node.icon,
-          type: node.type,
-          status: node.status,
-          hasChildren: children.length > 0 || hiddenMacs.includes(node.mac),
-          hiddenChildren: hiddenMacs.includes(node.mac),
-          qty: children.length,
-          children: children
-      };
-  }
-
-
-  // ---------------------------------------------------------------------------
-  
-  function getHierarchy()
-  { 
-    for(i in deviceListGlobal)
-    {      
-      if(deviceListGlobal[i].mac == 'Internet')
-      { 
-        return (getChildren(deviceListGlobal[i], deviceListGlobal, ''))
-        break;
       }
     }
+      
   }
 
+  return result;
+}
   
-  // ---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
-  function toggleSubTree(parentMac, treePath)
+function toggleSubTree(parentMac, treePath)
+{
+  treePath = treePath.split('|')
+
+  if(!hiddenMacs.includes(parentMac))
   {
-    treePath = treePath.split('|')
+    hiddenMacs.push(parentMac)
-
+  }
-    if(!hiddenMacs.includes(parentMac))
+  else
-    {
+  {
-      hiddenMacs.push(parentMac)
+    removeItemFromArray(hiddenMacs, parentMac)
-    }
-    else
-    {
-      removeItemFromArray(hiddenMacs, parentMac)
-    }
-
-    // updatedTree = myHierarchy;
-    updatedTree = getHierarchy()
-
-    myTree.refresh(updatedTree);
-
-    // re-attach any onclick events
-    attachTreeEvents();   
   }
 
-  // --------------------------------------------------------------------------- 
+  updatedTree = getHierarchy()
-  function attachTreeEvents()
+  myTree.refresh(updatedTree);
+
+  // re-attach any onclick events
+  attachTreeEvents();   
+}
+
+// --------------------------------------------------------------------------- 
+function attachTreeEvents()
+{
+  //  toggle subtree functionality
+  $("div[data-mytreemac]").each(function(){
+      $(this).attr('onclick', 'toggleSubTree("'+$(this).attr('data-mytreemac')+'","'+ $(this).attr('data-mytreepath')+'")')        
+  }); 
+}
+
+// --------------------------------------------------------------------------- 
+// Handle network node click - select correct tab in the bottom table
+function handleNodeClick(nodeData)
+{    
+  const targetTabMAC = nodeData.data.mac;    
+
+  var targetTab = $(`a[data-mytabmac="${targetTabMAC}"]`);
+
+  // Simulate a click event on the target tab
+  targetTab.click();
+}
+
+// --------------------------------------------------------------------------- 
+var myTree;
+var visibleTreeArea = $(window).height()-155;
+var nodeWidth = 120;
+var emSize;
+var nodeHeight;
+var sizeCoefficient = 1.4
+
+function initTree(myHierarchy)
+{
+  // calculate the drawing area based on teh tree width and available screen size
+  var treeAreaHeight = visibleTreeArea > 800 ? 800 : visibleTreeArea;
+  let screenWidth = $('.content-header').width();
+  let treeWidth = (nodeWidth + 20) *  parentNodesCount;
+  let treeAreaWidth  =  screenWidth < treeWidth ? treeWidth : screenWidth;
+
+  // init the drawing area size
+  $("#networkTree").attr('style', `height:${treeAreaHeight}px; width:${treeAreaWidth}px`)
+
+  if(myHierarchy.type == "")
   {
-    //  toggle subtree functionality
+    showModalOk(getString('Network_Configuration_Error'), getString('Network_Root_Not_Configured'))      
-    $("div[data-mytreemac]").each(function(){
+    
-        $(this).attr('onclick', 'toggleSubTree("'+$(this).attr('data-mytreemac')+'","'+ $(this).attr('data-mytreepath')+'")')        
+    return;
-    }); 
   }
 
-  // --------------------------------------------------------------------------- 
+  // calculate the font size of the leaf nodes to fit everything into the tree area
-  // Handle network node click - select correct tab in the bottom table
+  leafNodesCount == 0 ? 1 : leafNodesCount;
-  function handleNodeClick(event)
+  emSize = ((treeAreaHeight/(25*leafNodesCount)).toFixed(2));
-  {
+  emSize = emSize > 1 ? 1 : emSize;
-    // console.log(event.target.offsetParent.offsetParent)
 
-    const targetTabMAC = $(event.target.offsetParent.offsetParent).attr("data-mytreemacmain");    
+  // nodeHeight = ((emSize*100*0.30).toFixed(0))
+  nodeHeight = ((emSize*100*0.30).toFixed(0))
 
-    var targetTab = $(`a[data-mytabmac="${targetTabMAC}"]`);
+  console.log(Treeviz);
 
-    // Simulate a click event on the target tab
+  myTree = Treeviz.create({
-    targetTab.click();
+    htmlId: "networkTree",
-  }
+    renderNode:  nodeData =>  {
 
-  // --------------------------------------------------------------------------- 
+      var fontSize = "font-size:"+emSize+"em;";
-  var myTree;
-  var visibleTreeArea = $(window).height()-155;
-  var nodeWidth = 160;
-  var emSize;
-  var nodeHeight;
-  var sizeCoefficient = 1
 
-  function initTree(myHierarchy)
+      (!emptyArr.includes(nodeData.data.port )) ? port =  nodeData.data.port : port = "";
-  {
-    console.log(myHierarchy)
 
-    // calculate the drawing area based on teh tree width and available screen size
+      (port == "" || port == 0 || port == 'None' ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
-    var treeAreaHeight = visibleTreeArea > 800 ? 800 : visibleTreeArea;
-    let screenWidth = $('.content-header').width();
-    let treeWidth = (nodeWidth + 20) *  parentNodesCount;
-    let treeAreaWidth  =  screenWidth < treeWidth ? treeWidth : screenWidth;
 
-    // init the drawing area size
+      portHtml = (port == "" || port == 0 || port == 'None' ) ? "" : port;
-    $("#networkTree").attr('style', `height:${treeAreaHeight}px; width:${treeAreaWidth}px`)
       
-    if(myHierarchy.type == "")
+      // Build HTML for individual nodes in the network diagram        
-    {
+      deviceIcon = (!emptyArr.includes(nodeData.data.icon )) ?  
-      showModalOk(getString('Network_Configuration_Error'), getString('Network_Root_Not_Configured'))      
+                `<div class="netIcon">
+                      ${atob(nodeData.data.icon)}
+                </div>` : "";
+      devicePort = `<div  class="netPort" 
+                          style="width:${emSize*sizeCoefficient}em;height:${emSize*sizeCoefficient}em">
+                      ${portHtml}</div> 
+                    <div  class="portBckgIcon" 
+                          style="margin-left:-${emSize*sizeCoefficient}em;">
+                          ${portBckgIcon}
+                    </div>`;
+      collapseExpandIcon = nodeData.data.hiddenChildren ? 
+                          "square-plus" : "square-minus";
                           
-      return;
+      // generate +/- icon if node has children nodes
-    }
+      collapseExpandHtml = nodeData.data.hasChildren ? 
+                    `<div class="netCollapse" 
+                          style="font-size:${emSize*sizeCoefficient}em;top:${emSize/6}em" 
+                          data-mytreepath="${nodeData.data.path}" 
+                          data-mytreemac="${nodeData.data.mac}">
+                      <i class="fa fa-${collapseExpandIcon} pointer"></i>
+                    </div>` : "";
 
-    // calculate the font size of the leaf nodes to fit everything into the tree area
+      selectedNodeMac = $(".nav-tabs-custom .active a").attr('data-mytabmac')
-    leafNodesCount == 0 ? 1 : leafNodesCount;
-    emSize = ((treeAreaHeight/(25*leafNodesCount)).toFixed(2));
-    emSize = emSize > 1 ? 1 : emSize;
 
-    // nodeHeight = ((emSize*100*0.30).toFixed(0))
+      highlightedCss = nodeData.data.mac == selectedNodeMac ? 
-    nodeHeight = ((emSize*100*0.30).toFixed(0))
+                    " highlightedNode" : "";
 
-    console.log(Treeviz);
+      // css indicating online/offline status
-
+      statusCss = ` netStatus-${nodeData.data.status}`;
-    myTree = Treeviz.create({
-      htmlId: "networkTree",
-      renderNode:  nodeData =>  {
-        var fontSize = "font-size:"+emSize+"em;";
-
-        (!emptyArr.includes(nodeData.data.port )) ? port =  nodeData.data.port : port = "";
-
-        (port == "" || port == 0 || port == 'None' ) ? portBckgIcon = `<i class="fa fa-wifi"></i>` : portBckgIcon = `<i class="fa fa-ethernet"></i>`;
-
-        portHtml = (port == "" || port == 0 || port == 'None' ) ? "" : port
-
-        // Build HTML for individual nodes in the network diagram        
-        deviceIcon = (!emptyArr.includes(nodeData.data.icon )) ?  
-                  `<div class="netIcon">
-                        ${atob(nodeData.data.icon)}
-                  </div>` : "";
-        devicePort = `<div  class="netPort" 
-                            style="width:${emSize*sizeCoefficient}em;height:${emSize*sizeCoefficient}em">
-                        ${portHtml}</div> 
-                      <div  class="portBckgIcon" 
-                            style="margin-left:-${emSize*sizeCoefficient}em;">
-                            ${portBckgIcon}
-                      </div>`;
-        collapseExpandIcon = nodeData.data.hiddenChildren ? 
-                            "square-plus" : "square-minus";
-                            
-        // generate +/- icon if node has children nodes
-        collapseExpandHtml = nodeData.data.hasChildren ? 
-                      `<div class="netCollapse" 
-                            style="font-size:${emSize*sizeCoefficient}em;top:${1/2*emSize*sizeCoefficient}em" 
-                            data-mytreepath="${nodeData.data.path}" 
-                            data-mytreemac="${nodeData.data.mac}">
-                        <i class="fa fa-${collapseExpandIcon} pointer"></i>
-                      </div>` : "";
-
-        selectedNodeMac = $(".nav-tabs-custom .active a").attr('data-mytabmac')
-
-        highlightedCss = nodeData.data.mac == selectedNodeMac ? 
-                      " highlightedNode" : "";
-
-        // css indicating online/offline status
-        statusCss = ` netStatus-${nodeData.data.status}`;
-
-        return result = `<div class="box ${nodeData.data.hasChildren ? "pointer":""} ${statusCss} ${highlightedCss}"
-                              data-mytreemacmain="${nodeData.data.mac}"
-                              style="height:${nodeData.settings.nodeHeight}px;${fontSize}"
-                          >
-                            <div class="netNodeText">
-                              <strong>${devicePort}  ${deviceIcon}
-                                <span class="spanNetworkTree anonymizeDev" >${nodeData.data.name}</span>
-                              </strong>
-                              ${collapseExpandHtml}
-                            </div>
-                          </div>`;
-      },
-
-      onNodeClick:  nodeData =>  {
-        console.log(this)
-      },
-      mainAxisNodeSpacing: 'auto',
-      // mainAxisNodeSpacing: 3,
-      secondaryAxisNodeSpacing: 0.3,
-      nodeHeight: nodeHeight.toString(),
-      marginTop: '5',
-      hasZoom: true,
-      hasPan: true,
-      // marginLeft: '15',
-      idKey: "id",
-      hasFlatData: false,
-      linkWidth: (nodeData) => 3,
-      linkColor: (nodeData) => "#ffcc80",
-      onNodeClick: (nodeData) => handleNodeClick(nodeData),
-        relationnalField: "children",
-      });
-      
-
-
-      myTree.refresh(myHierarchy);
-
-      // hide spinning icon
-      hideSpinner()
-    }
-
-  // ---------------------------------------------------------------------------
-  // Tabs functionality
-  // ---------------------------------------------------------------------------
-  // Register events on tab change
-  
-  $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {   
-
-    initButtons()
 
+      return result = `<div class="box ${nodeData.data.hasChildren ? "pointer":""} ${statusCss} ${highlightedCss}"
+                            data-mytreemacmain="${nodeData.data.mac}"
+                            style="height:${nodeData.settings.nodeHeight}px;${fontSize}"
+                        >
+                          <div class="netNodeText">
+                            <strong>${devicePort}  ${deviceIcon}
+                              <span class="spanNetworkTree anonymizeDev" >${nodeData.data.name}</span>
+                            </strong>
+                            ${collapseExpandHtml}
+                          </div>
+                        </div>`;
+    },
+    mainAxisNodeSpacing: 'auto',
+    secondaryAxisNodeSpacing: 0.3,
+    nodeHeight: nodeHeight.toString(),
+    marginTop: '5',
+    isHorizontal : true,
+    hasZoom: true,
+    hasPan: true,
+    marginLeft: '15',
+    idKey: "mac",
+    hasFlatData: false,
+    relationnalField: "children",
+    linkWidth: (nodeData) => 3,
+    linkColor: (nodeData) => "#ffcc80",
+    onNodeClick: (nodeData) => handleNodeClick(nodeData),
   });      
 
+  console.log(deviceListGlobal);
+  myTree.refresh(myHierarchy);
 
-  // ---------------------------------------------------------------------------
+  // hide spinning icon
-  function initTab()
+  hideSpinner()
-  {
+}
-    key = "activeNetworkTab"
-
-    // default selection
-    selectedTab = "Internet_id"
-
-    // the #target from the url
-    target = getQueryString('mac') 
-
-    // update cookie if target specified
-    if(target != "")
-    {      
-      setCache(key, target.replaceAll(":","_")+'_id') // _id is added so it doesn't conflict with AdminLTE tab behavior
-    }
-
-    // get the tab id from the cookie (already overridden by the target)
-    if(!emptyArr.includes(getCache(key)))
-    {
-      selectedTab = getCache(key);
-    }
-
-    // Activate panel
-    $('.nav-tabs a[id='+ selectedTab +']').tab('show');
-
-    // When changed save new current tab
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-      setCache(key, $(e.target).attr('id'))
-    });
-    
-  }
-
-  // ---------------------------------------------------------------------------
-  function initDeviceNamesFromMACs()
-  {
-    $('.mac-to-name').each(function() {
-        var dataMacValue = $(this).attr('my-data-mac');
-
-        if(dataMacValue =="" )
-        {
-          $(this).html(getString("Network_Root"))
-        }
-        else{
-          $(this).html(getNameByMacAddress(dataMacValue));
-        }
 
 
-    });
+// ---------------------------------------------------------------------------
+// Tabs functionality
+// ---------------------------------------------------------------------------
+// Register events on tab change
 
-  }
+$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {   
 
-  // ---------------------------------------------------------------------------
-  function initButtons()
-  { 
-
-    var currentNodeMac = $(".tab-content .active td[data-mynodemac]").attr('data-mynodemac'); 
-
-    // change highlighted node in the tree
-    selNode = $("#networkTree .highlightedNode")[0]
-
-    // console.log(selNode)
-
-    if(selNode)
-    {
-      $(selNode).attr('class',  $(selNode).attr('class').replace('highlightedNode'))
-    }
-
-    newSelNode = $("#networkTree div[data-mytreemacmain='"+currentNodeMac+"']")[0]
-    
-    $(newSelNode).attr('class',  $(newSelNode).attr('class') + ' highlightedNode')
-
-
-    // init the Assign buttons
-    $('#unassignedDevices  button[data-myleafmac]').each(function(){
-      $(this).attr('onclick', `updateLeaf("${$(this).attr('data-myleafmac')}","${currentNodeMac}")`)
-    }); 
-
-    // init Unassign buttons
-    $('#assignedDevices button[data-myleafmac]').each(function(){
-      $(this).attr('onclick', `updateLeaf("${$(this).attr('data-myleafmac')}","")`)
-    }); 
-  }
-
-  // ---------------------------------------------------------------------------
-  function updateLeaf(leafMac,nodeMac)
-  {
-    console.log(leafMac) // child
-    console.log(nodeMac) // parent
-    console.log(nodeMac != "") // parent
-
-    // prevent the assignment of the Internet root node avoiding recursion when generating the network tree topology
-    if(leafMac.toLowerCase().includes('internet') && nodeMac != "")
-    {
-      showMessage(getString('Network_Cant_Assign'))
-    }
-    else{
-      saveData('updateNetworkLeaf', leafMac, nodeMac);
-      setTimeout("location.reload();", 500); // refresh page 
-    }
-  }
-
-  // init device names where macs are used
-  initDeviceNamesFromMACs();
-
-  // init selected (first) tab
-  initTab();  
-
-  // init Assign/Unassign buttons
   initButtons()
 
+});
+
+
+// ---------------------------------------------------------------------------
+function initTab()
+{
+  key = "activeNetworkTab"
+
+  // default selection
+  selectedTab = "Internet_id"
+
+  // the #target from the url
+  target = getQueryString('mac') 
+
+  // update cookie if target specified
+  if(target != "")
+  {      
+    setCache(key, target.replaceAll(":","_")+'_id') // _id is added so it doesn't conflict with AdminLTE tab behavior
+  }
+
+  // get the tab id from the cookie (already overridden by the target)
+  if(!emptyArr.includes(getCache(key)))
+  {
+    selectedTab = getCache(key);
+  }
+
+  // Activate panel
+  $('.nav-tabs a[id='+ selectedTab +']').tab('show');
+
+  // When changed save new current tab
+  $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+    setCache(key, $(e.target).attr('id'))
+  });
+  
+}
+
+// ---------------------------------------------------------------------------
+function initDeviceNamesFromMACs()
+{
+  $('.mac-to-name').each(function() {
+      var dataMacValue = $(this).attr('my-data-mac');
+
+      if(dataMacValue =="" )
+      {
+        $(this).html(getString("Network_Root"))
+      }
+      else{
+        $(this).html(getNameByMacAddress(dataMacValue));
+      }
+  });
+  
+}
+
+// ---------------------------------------------------------------------------
+function initButtons()
+{ 
+
+  var currentNodeMac = $(".tab-content .active td[data-mynodemac]").attr('data-mynodemac'); 
+
+  // change highlighted node in the tree
+  selNode = $("#networkTree .highlightedNode")[0]
+
+  // console.log(selNode)
+
+  if(selNode)
+  {
+    $(selNode).attr('class',  $(selNode).attr('class').replace('highlightedNode'))
+  }
+
+  newSelNode = $("#networkTree div[data-mytreemacmain='"+currentNodeMac+"']")[0]
+  
+  $(newSelNode).attr('class',  $(newSelNode).attr('class') + ' highlightedNode')
+
+
+  // init the Assign buttons
+  $('#unassignedDevices  button[data-myleafmac]').each(function(){
+    $(this).attr('onclick', `updateLeaf("${$(this).attr('data-myleafmac')}","${currentNodeMac}")`)
+  }); 
+
+  // init Unassign buttons
+  $('#assignedDevices button[data-myleafmac]').each(function(){
+    $(this).attr('onclick', `updateLeaf("${$(this).attr('data-myleafmac')}","")`)
+  }); 
+}
+
+// ---------------------------------------------------------------------------
+function updateLeaf(leafMac,nodeMac)
+{
+  console.log(leafMac) // child
+  console.log(nodeMac) // parent
+  console.log(nodeMac != "") // parent
+
+  // prevent the assignment of the Internet root node avoiding recursion when generating the network tree topology
+  if(leafMac.toLowerCase().includes('internet') && nodeMac != "")
+  {
+    showMessage(getString('Network_Cant_Assign'))
+  }
+  else{
+    saveData('updateNetworkLeaf', leafMac, nodeMac);
+    setTimeout("location.reload();", 500); // refresh page 
+  }
+}
+
+// init device names where macs are used
+initDeviceNamesFromMACs();
+
+// init selected (first) tab
+initTab();  
+
+// init Assign/Unassign buttons
+initButtons()
+
 </script>
 
 

front/php/templates/language/ar_ar.json

@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "",
     "Gen_Update": "",
     "Gen_Update_Value": "",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "",
     "Gen_Work_In_Progress": "",
     "Gen_create_new_device": "",

front/php/templates/language/ca_ca.json

@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Aturar alertes",
     "DevDetail_Shortcut_Presence": "Presència",
     "DevDetail_Shortcut_Sessions": "Sessions",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detalls",
+    "DevDetail_Tab_Details": "Detalls",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Esdeveniments",
+    "DevDetail_Tab_Events": "Esdeveniments",
     "DevDetail_Tab_EventsTableDate": "Data",
     "DevDetail_Tab_EventsTableEvent": "Tipus d'esdeveniment",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "Estat",
     "DevDetail_Tab_NmapTableText": "Configurar un calendari a <a href=\"/settings.php#NMAP_ACTIVE\">Configuració</a>",
     "DevDetail_Tab_NmapTableTime": "Temps",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Connectors (Plugins)",
+    "DevDetail_Tab_Plugins": "Connectors (Plugins)",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presència",
+    "DevDetail_Tab_Presence": "Presència",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessions",
+    "DevDetail_Tab_Sessions": "Sessions",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Eines",
+    "DevDetail_Tab_Tools": "Eines",
     "DevDetail_Tab_Tools_Internet_Info_Description": "L'eina d'informació d'Internet mostra informació sobre la connexió a Internet, com ara adreça IP, ciutat, país, codi d'àrea i zona horària.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "S'ha produït un error",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Inici Informació d'Internet",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Actualització fallida",
     "Gen_Update": "Actualitza",
     "Gen_Update_Value": "Actualitzar Valor",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Advertència",
     "Gen_Work_In_Progress": "Work in progress, un bon moment per retroalimentació a https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Nou dispositiu",

front/php/templates/language/cs_cz.json

@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "",
     "Gen_Update": "",
     "Gen_Update_Value": "",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "",
     "Gen_Work_In_Progress": "",
     "Gen_create_new_device": "",

front/php/templates/language/de_de.json

@@ -150,8 +150,8 @@
     "DevDetail_Shortcut_DownAlerts": "Down Meldungen",
     "DevDetail_Shortcut_Presence": "Anwesenheit",
     "DevDetail_Shortcut_Sessions": "Sitzungen",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Details",
+    "DevDetail_Tab_Details": "Details",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Ereignisse",
+    "DevDetail_Tab_Events": "Ereignisse",
     "DevDetail_Tab_EventsTableDate": "Datum",
     "DevDetail_Tab_EventsTableEvent": "Ereignistype",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -166,10 +166,10 @@
     "DevDetail_Tab_NmapTableState": "Status",
     "DevDetail_Tab_NmapTableText": "Erstelle einen Plan über die<a href=\"/settings.php#NMAP_ACTIVE\">Einstellungen</a>",
     "DevDetail_Tab_NmapTableTime": "Zeit",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
+    "DevDetail_Tab_Plugins": "Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Anwesenheit",
+    "DevDetail_Tab_Presence": "Anwesenheit",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sitzungen",
+    "DevDetail_Tab_Sessions": "Sitzungen",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Werkzeuge",
+    "DevDetail_Tab_Tools": "Werkzeuge",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Das Internet-Info-Tool zeigt Informationen über die Internetverbindung an, wie z. B. IP-Adresse, Stadt, Land, Ortsvorwahl und Zeitzone.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Es ist ein Fehler aufgetreten",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Internet-Info starten",
@@ -340,6 +340,7 @@
     "Gen_Upd_Fail": "Aktualisierung fehlgeschlagen",
     "Gen_Update": "Aktualisieren",
     "Gen_Update_Value": "Wert aktualisieren",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Warnung",
     "Gen_Work_In_Progress": "Keine Finalversion, feedback bitte unter: https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Neues Gerät",

front/php/templates/language/en_us.json

@@ -48,7 +48,7 @@
     "BackDevices_DBTools_ImportCSVError": "The CSV file could not be imported. Make sure the format is correct.",
     "BackDevices_DBTools_ImportCSVMissing": "The CSV file could not be found under <b>/config/devices.csv.</b>",
     "BackDevices_DBTools_Purge": "The oldest backups were deleted",
-    "BackDevices_DBTools_UpdDev": "Device updated successfully",
+    "BackDevices_DBTools_UpdDev": "Device updated successfully. Main devices list may need some time to reload if a scan is in progress.",
     "BackDevices_DBTools_UpdDevError": "Error updating device",
     "BackDevices_DBTools_Upgrade": "Database upgraded successfully",
     "BackDevices_DBTools_UpgradeError": "Database upgrade failed",
@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Down Alerts",
     "DevDetail_Shortcut_Presence": "Presence",
     "DevDetail_Shortcut_Sessions": "Sessions",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Details",
+    "DevDetail_Tab_Details": "Details",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Events",
+    "DevDetail_Tab_Events": "Events",
     "DevDetail_Tab_EventsTableDate": "Date",
     "DevDetail_Tab_EventsTableEvent": "Event type",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "State",
     "DevDetail_Tab_NmapTableText": "Set up a schedule in <a href=\"/settings.php#NMAP_ACTIVE\">Settings</a>",
     "DevDetail_Tab_NmapTableTime": "Time",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
+    "DevDetail_Tab_Plugins": "Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presence",
+    "DevDetail_Tab_Presence": "Presence",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessions",
+    "DevDetail_Tab_Sessions": "Sessions",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Tools",
+    "DevDetail_Tab_Tools": "Tools",
     "DevDetail_Tab_Tools_Internet_Info_Description": "The Internet info tool displays information about the Internet connection, such as IP address, city, country, area code and time zone.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "An error has occurred",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Start Internet Info",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Update failed",
     "Gen_Update": "Update",
     "Gen_Update_Value": "Update Value",
+    "Gen_ValidIcon": "<i class=\"fa-solid fa-chevron-right \"></i>",
     "Gen_Warning": "Warning",
     "Gen_Work_In_Progress": "Work in progress, good time to feedback on https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "New device",

front/php/templates/language/es_es.json

@@ -148,8 +148,8 @@
     "DevDetail_Shortcut_DownAlerts": "Alerta(s) de caída(s)",
     "DevDetail_Shortcut_Presence": "Historial",
     "DevDetail_Shortcut_Sessions": "Sesiones",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detalles",
+    "DevDetail_Tab_Details": "Detalles",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Eventos",
+    "DevDetail_Tab_Events": "Eventos",
     "DevDetail_Tab_EventsTableDate": "Fecha",
     "DevDetail_Tab_EventsTableEvent": "Tipo de evento",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -164,10 +164,10 @@
     "DevDetail_Tab_NmapTableState": "Estado",
     "DevDetail_Tab_NmapTableText": "Establece la programación en los <a href=\"/settings.php#NMAP_ACTIVE\">Ajustes</a>",
     "DevDetail_Tab_NmapTableTime": "Tiempo",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
+    "DevDetail_Tab_Plugins": "Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Historial",
+    "DevDetail_Tab_Presence": "Historial",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sesiones",
+    "DevDetail_Tab_Sessions": "Sesiones",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Herramientas",
+    "DevDetail_Tab_Tools": "Herramientas",
     "DevDetail_Tab_Tools_Internet_Info_Description": "La herramienta de información de internet muestra información sobre la conexión a Internet, como dirección IP, ciudad, país, código de área y zona horaria.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Se ha producido un error",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Iniciar información de Internet",
@@ -338,6 +338,7 @@
     "Gen_Upd_Fail": "Fallo al actualizar",
     "Gen_Update": "Actualizar",
     "Gen_Update_Value": "Actualizar valor",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Advertencia",
     "Gen_Work_In_Progress": "Trabajo en curso, un buen momento para hacer comentarios en https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Nuevo dispositivo",

front/php/templates/language/fr_fr.json

@@ -48,7 +48,7 @@
     "BackDevices_DBTools_ImportCSVError": "Le fichier CSV n'a pas pu être importé. Assurez-vous que le format est correct.",
     "BackDevices_DBTools_ImportCSVMissing": "Le fichier CSV est introuvable sous <b>/config/devices.csv.</b>",
     "BackDevices_DBTools_Purge": "Les sauvegardes les plus anciennes ont été supprimées",
-    "BackDevices_DBTools_UpdDev": "Appareil mis à jour avec succès",
+    "BackDevices_DBTools_UpdDev": "Appareil mis à jour avec succès. La liste principale des appareils peut prendre un peu de temps à se mettre à jour si un scan est en cours.",
     "BackDevices_DBTools_UpdDevError": "Erreur lors de la mise à jour de l'appareil",
     "BackDevices_DBTools_Upgrade": "Base de données mise à niveau avec succès",
     "BackDevices_DBTools_UpgradeError": "La mise à niveau de la base de données a échoué",
@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Alertes de panne",
     "DevDetail_Shortcut_Presence": "Présence",
     "DevDetail_Shortcut_Sessions": "Sessions",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Détails",
+    "DevDetail_Tab_Details": "Détails",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Événements",
+    "DevDetail_Tab_Events": "Événements",
     "DevDetail_Tab_EventsTableDate": "Date",
     "DevDetail_Tab_EventsTableEvent": "Type d'événement",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "État",
     "DevDetail_Tab_NmapTableText": "Configurer une programmation dans les <a href=\"/settings.php#NMAP_ACTIVE\">Paramètres</a>",
     "DevDetail_Tab_NmapTableTime": "Heure",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
+    "DevDetail_Tab_Plugins": "Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Présence",
+    "DevDetail_Tab_Presence": "Présence",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessions",
+    "DevDetail_Tab_Sessions": "Sessions",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Outils",
+    "DevDetail_Tab_Tools": "Outils",
     "DevDetail_Tab_Tools_Internet_Info_Description": "L'outil Infos Internet affiche les informations sur la connexion Internet, comme l'adresse IP, la ville, la région, le code région et le fuseau horaire.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Une erreur est survenue",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Lancer les informations Internet",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Échec de la mise à jour",
     "Gen_Update": "Mise à jour",
     "Gen_Update_Value": "Valeur à mettre à jour",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Avertissement",
     "Gen_Work_In_Progress": "Travaux en cours, c'est le bon moment pour faire un retour via la liste d'anomalies sur Github https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Nouvel appareil",

front/php/templates/language/it_it.json

@@ -48,7 +48,7 @@
     "BackDevices_DBTools_ImportCSVError": "Impossibile importare il file CSV. Assicurati che il formato del file sia corretto.",
     "BackDevices_DBTools_ImportCSVMissing": "Impossibile trovare il file CSV in <b>/config/devices.csv.</b>",
     "BackDevices_DBTools_Purge": "I backup più vecchi sono stati eliminati",
-    "BackDevices_DBTools_UpdDev": "Dispositivo aggiornato correttamente",
+    "BackDevices_DBTools_UpdDev": "Dispositivo aggiornato correttamente. L'elenco dei dispositivi principali potrebbe richiedere del tempo per ricaricarsi se è in corso una scansione.",
     "BackDevices_DBTools_UpdDevError": "Errore durante l'aggiornamento del dispositivo",
     "BackDevices_DBTools_Upgrade": "Database aggiornato correttamente",
     "BackDevices_DBTools_UpgradeError": "Aggiornamento del database non riuscito",
@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Avvisi disconnessione",
     "DevDetail_Shortcut_Presence": "Presenza",
     "DevDetail_Shortcut_Sessions": "Sessioni",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Dettagli",
+    "DevDetail_Tab_Details": "Dettagli",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Eventi",
+    "DevDetail_Tab_Events": "Eventi",
     "DevDetail_Tab_EventsTableDate": "Data",
     "DevDetail_Tab_EventsTableEvent": "Tipo evento",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "Stato",
     "DevDetail_Tab_NmapTableText": "Imposta una pianificazione nelle <a href=\"/settings.php#NMAP_ACTIVE\">Impostazioni</a>",
     "DevDetail_Tab_NmapTableTime": "Ora",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugin",
+    "DevDetail_Tab_Plugins": "Plugin",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presenza",
+    "DevDetail_Tab_Presence": "Presenza",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessioni",
+    "DevDetail_Tab_Sessions": "Sessioni",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Strumenti",
+    "DevDetail_Tab_Tools": "Strumenti",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Lo strumento informazioni Internet visualizza informazioni sulla connessione Internet, come indirizzo IP, città, paese, prefisso e fuso orario.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Si è verificato un errore",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Avvia info Internet",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Aggiornamento fallito",
     "Gen_Update": "Aggiorna",
     "Gen_Update_Value": "Aggiorna valore",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Avviso",
     "Gen_Work_In_Progress": "Lavori in corso, è quindi un buon momento per un feedback su https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Nuovo dispositivo",

front/php/templates/language/nb_no.json

@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Nede Varslinger",
     "DevDetail_Shortcut_Presence": "Tilstedeværelse",
     "DevDetail_Shortcut_Sessions": "Sesjoner",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detaljer",
+    "DevDetail_Tab_Details": "Detaljer",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Hendelser",
+    "DevDetail_Tab_Events": "Hendelser",
     "DevDetail_Tab_EventsTableDate": "Dato",
     "DevDetail_Tab_EventsTableEvent": "Hendelstype",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "Tilstand",
     "DevDetail_Tab_NmapTableText": "Konfigurer en tidsplan i <a href=\"/settings.php#NMAP_ACTIVE\">Innstillinger</a>",
     "DevDetail_Tab_NmapTableTime": "Tidspunkt",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
+    "DevDetail_Tab_Plugins": "Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Tilstedeværelse",
+    "DevDetail_Tab_Presence": "Tilstedeværelse",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Økter",
+    "DevDetail_Tab_Sessions": "Økter",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Verktøy",
+    "DevDetail_Tab_Tools": "Verktøy",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Internett-informasjonsverktøyet viser informasjon om Internett-tilkoblingen, for eksempel IP-adresse, by, land, retningsnummer og tidssone.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "En feil har oppstått",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Start Internett-informasjonsverktøyet",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Oppdatering feilet",
     "Gen_Update": "Oppdater",
     "Gen_Update_Value": "Oppdater verdi",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Advarsel",
     "Gen_Work_In_Progress": "Work in progress, gjerne kom med tilbakemeldinger på https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "",

front/php/templates/language/pl_pl.json

@@ -155,9 +155,9 @@
     "DevDetail_Tab_NmapTableText": "Ustaw harmonogram w <a href=\"/settings.php#NMAP_ACTIVE\">Ustawieniach</a>",
     "DevDetail_Tab_NmapTableTime": "Czas",
     "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i>Pluginy",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Obecność",
+    "DevDetail_Tab_Presence": "Obecność",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sesje",
+    "DevDetail_Tab_Sessions": "Sesje",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Narzędzia",
+    "DevDetail_Tab_Tools": "Narzędzia",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Narzędzie informacji o Internecie wyświetla informację o połączeniu z Internetem, takie jak adres IP, miasto, państwo, kod pocztowy i strefa czasowa.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Wystąpił błąd",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Rozpocznij Informacje o Internecie",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Aktualizacja nie powiodła się",
     "Gen_Update": "Aktualizuj",
     "Gen_Update_Value": "Aktualizuj Wartość",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Uwaga",
     "Gen_Work_In_Progress": "Praca w toku, dobry czas na feedback https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "",

front/php/templates/language/pt_br.json

@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Alertas para baixo",
     "DevDetail_Shortcut_Presence": "Presença",
     "DevDetail_Shortcut_Sessions": "Sessões",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detalhes",
+    "DevDetail_Tab_Details": "Detalhes",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Eventos",
+    "DevDetail_Tab_Events": "Eventos",
     "DevDetail_Tab_EventsTableDate": "Data",
     "DevDetail_Tab_EventsTableEvent": "Tipo de evento",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -155,9 +155,9 @@
     "DevDetail_Tab_NmapTableText": "Configure uma programação em <a href=\"/settings.php#NMAP_ACTIVE\">Configurações</a>",
     "DevDetail_Tab_NmapTableTime": "Tempo",
     "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"> </i> Plugins",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presença",
+    "DevDetail_Tab_Presence": "Presença",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessões",
+    "DevDetail_Tab_Sessions": "Sessões",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Ferramentas",
+    "DevDetail_Tab_Tools": "Ferramentas",
     "DevDetail_Tab_Tools_Internet_Info_Description": "A ferramenta info Internet exibe informações sobre a conexão com a Internet, como endereço IP, cidade, país, código de área e fuso horário.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Um erro ocorreu",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Iniciar informações da Internet",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "A atualização falhou",
     "Gen_Update": "Atualizar",
     "Gen_Update_Value": "Atualizar valor",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Aviso",
     "Gen_Work_In_Progress": "Trabalho em andamento, um bom momento para enviar feedback em https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "",

front/php/templates/language/ru_ru.json

@@ -48,7 +48,7 @@
     "BackDevices_DBTools_ImportCSVError": "Не удалось импортировать файл CSV. Убедитесь, что формат правильный.",
     "BackDevices_DBTools_ImportCSVMissing": "CSV-файл не найден в<b>/config/devices.csv.</b>",
     "BackDevices_DBTools_Purge": "Самые старые резервные копии были удалены",
-    "BackDevices_DBTools_UpdDev": "Устройство успешно обновлено",
+    "BackDevices_DBTools_UpdDev": "Устройство успешно обновлено. При выполнении сканирования может потребоваться некоторое время для перезагрузки основного списка устройств.",
     "BackDevices_DBTools_UpdDevError": "Ошибка обновления устройства",
     "BackDevices_DBTools_Upgrade": "База данных успешно обновлена",
     "BackDevices_DBTools_UpgradeError": "Обновление базы данных не удалось",
@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Оповещения о сбое",
     "DevDetail_Shortcut_Presence": "Присутствие",
     "DevDetail_Shortcut_Sessions": "Сеансы",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Детали",
+    "DevDetail_Tab_Details": "Детали",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> События",
+    "DevDetail_Tab_Events": "События",
     "DevDetail_Tab_EventsTableDate": "Дата",
     "DevDetail_Tab_EventsTableEvent": "Тип события",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "Состояние",
     "DevDetail_Tab_NmapTableText": "Настройте расписание в <a href=\"/settings.php#NMAP_ACTIVE\">Настройки</a>",
     "DevDetail_Tab_NmapTableTime": "Время",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Плагины",
+    "DevDetail_Tab_Plugins": "Плагины",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Присутствие",
+    "DevDetail_Tab_Presence": "Присутствие",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Сеансы",
+    "DevDetail_Tab_Sessions": "Сеансы",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Инструменты",
+    "DevDetail_Tab_Tools": "Инструменты",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Инструмент «Информация об Интернете» отображает информацию о подключении к Интернету, такую как IP-адрес, город, страна, код города и часовой пояс.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Произошла ошибка",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Показать инфо об Интернете",
@@ -242,7 +242,7 @@
     "Device_Tablelenght": "Показать _MENU_ записей",
     "Device_Tablelenght_all": "Все",
     "Device_Title": "Устройства",
-    "Devices_Filters": "",
+    "Devices_Filters": "Фильтры",
     "Donations_Others": "Другие",
     "Donations_Platforms": "Спонсорские платформы",
     "Donations_Text": "Привет 👋! </br> Спасибо, что нажали на этот пункт меню 😅 </br> </br> Я пытаюсь собрать пожертвования, чтобы сделать ваше программное обеспечение лучше. Кроме того, это поможет мне не перегореть, и я смогу дольше поддерживать это приложение. Любое небольшое спонсорство (периодическое или нет) вызывает у меня желание приложить больше усилий к этому приложению. </br> Мне бы хотелось сократить свою рабочую неделю и в оставшееся время полностью сосредоточиться на NetAlertX. Вы получите больше функциональности, более усовершенствованное приложение и меньше ошибок. </br> </br> Спасибо за прочтение – буду благодарен за любую поддержку❤🙏 </br>  </br> TL;DR: Поддержав меня, вы получаете: </br>  </br> <ul><li>Регулярные обновления для обеспечения безопасности ваших данных и семьи 🔄</li><li>Меньше ошибок 🐛🔫</li><li>Лучшую функциональность➕</li><li>Я не выгораю 🔥🤯</li><li>Меньше поспешных релизов 💨</li><li>Лучшая документация📚</li><li>Быстрее и лучше поддержка по вопросам 🆘</li></ul> </br> 📧Напишите мне на <a href='mailto:jokob@duck.com?subject=NetAlertX'>jokob@duck.com</a> если вы хотите связаться или если следует добавить другие спонсорские платформы. </br>",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Не удалось обновить",
     "Gen_Update": "Обновление",
     "Gen_Update_Value": "Обновить значение",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Предупреждение",
     "Gen_Work_In_Progress": "Работа продолжается, самое время оставить отзыв на https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "Новое устройство",

front/php/templates/language/tr_tr.json

@@ -138,7 +138,7 @@
     "DevDetail_Shortcut_DownAlerts": "",
     "DevDetail_Shortcut_Presence": "",
     "DevDetail_Shortcut_Sessions": "Oturumlar",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detaylar",
+    "DevDetail_Tab_Details": "Detaylar",
     "DevDetail_Tab_Events": "",
     "DevDetail_Tab_EventsTableDate": "Tarih",
     "DevDetail_Tab_EventsTableEvent": "",
@@ -156,7 +156,7 @@
     "DevDetail_Tab_NmapTableTime": "Zaman",
     "DevDetail_Tab_Plugins": "",
     "DevDetail_Tab_Presence": "",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Oturumlar",
+    "DevDetail_Tab_Sessions": "Oturumlar",
     "DevDetail_Tab_Tools": "",
     "DevDetail_Tab_Tools_Internet_Info_Description": "",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Bir hata oluştu",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "",
     "Gen_Update": "",
     "Gen_Update_Value": "",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "Uyarı",
     "Gen_Work_In_Progress": "",
     "Gen_create_new_device": "",

front/php/templates/language/uk_ua.json

@@ -48,7 +48,7 @@
     "BackDevices_DBTools_ImportCSVError": "Не вдалося імпортувати файл CSV. Переконайтеся, що формат правильний.",
     "BackDevices_DBTools_ImportCSVMissing": "Не вдалося знайти файл CSV у <b>/config/devices.csv.</b>",
     "BackDevices_DBTools_Purge": "Найстаріші резервні копії видалено",
-    "BackDevices_DBTools_UpdDev": "Пристрій успішно оновлено",
+    "BackDevices_DBTools_UpdDev": "Пристрій успішно оновлено. Перезавантаження основного списку пристроїв може знадобитися деякий час, якщо триває сканування.",
     "BackDevices_DBTools_UpdDevError": "Помилка оновлення пристрою",
     "BackDevices_DBTools_Upgrade": "Базу даних успішно оновлено",
     "BackDevices_DBTools_UpgradeError": "Не вдалося оновити базу даних",
@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "Сповіщення про падіння",
     "DevDetail_Shortcut_Presence": "Присутність",
     "DevDetail_Shortcut_Sessions": "Сеанси",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Подробиці",
+    "DevDetail_Tab_Details": "Подробиці",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Події",
+    "DevDetail_Tab_Events": "Події",
     "DevDetail_Tab_EventsTableDate": "Дата",
     "DevDetail_Tab_EventsTableEvent": "Тип події",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "Держава",
     "DevDetail_Tab_NmapTableText": "Налаштуйте розклад у <a href=\"/settings.php#NMAP_ACTIVE\">Settings</a>",
     "DevDetail_Tab_NmapTableTime": "час",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Плагіни",
+    "DevDetail_Tab_Plugins": "Плагіни",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Присутність",
+    "DevDetail_Tab_Presence": "Присутність",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Сеанси",
+    "DevDetail_Tab_Sessions": "Сеанси",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Інструменти",
+    "DevDetail_Tab_Tools": "Інструменти",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Інструмент Інтернет-інформації відображає інформацію про підключення до Інтернету, таку як IP-адреса, місто, країна, код міста та часовий пояс.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Сталася помилка",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Запустіть Internet Info",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "Не вдалося оновити",
     "Gen_Update": "оновлення",
     "Gen_Update_Value": "Оновити значення",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "УВАГА",
     "Gen_Work_In_Progress": "Робота триває, час залишити відгук на https://github.com/jokob-sk/NetAlertX/issues",
     "Gen_create_new_device": "новий пристрій",

front/php/templates/language/zh_cn.json

@@ -138,8 +138,8 @@
     "DevDetail_Shortcut_DownAlerts": "下线警报",
     "DevDetail_Shortcut_Presence": "存在",
     "DevDetail_Shortcut_Sessions": "会话",
-    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> 详细信息",
+    "DevDetail_Tab_Details": "详细信息",
-    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> 事件",
+    "DevDetail_Tab_Events": "事件",
     "DevDetail_Tab_EventsTableDate": "日期",
     "DevDetail_Tab_EventsTableEvent": "事件类型",
     "DevDetail_Tab_EventsTableIP": "IP",
@@ -154,10 +154,10 @@
     "DevDetail_Tab_NmapTableState": "状态",
     "DevDetail_Tab_NmapTableText": "<a href=\"/settings.php#NMAP_ACTIVE\">设置</a>时间表",
     "DevDetail_Tab_NmapTableTime": "时间",
-    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> 插件",
+    "DevDetail_Tab_Plugins": "插件",
-    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> 存在",
+    "DevDetail_Tab_Presence": "存在",
-    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> 会话",
+    "DevDetail_Tab_Sessions": "会话",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> 工具",
+    "DevDetail_Tab_Tools": "工具",
     "DevDetail_Tab_Tools_Internet_Info_Description": "互联网信息工具显示有关互联网连接的信息，例如 IP 地址、城市、国家、区号和时区。",
     "DevDetail_Tab_Tools_Internet_Info_Error": "发生了错误",
     "DevDetail_Tab_Tools_Internet_Info_Start": "开始互联网信息",
@@ -328,6 +328,7 @@
     "Gen_Upd_Fail": "更新失败",
     "Gen_Update": "更新",
     "Gen_Update_Value": "更新值",
+    "Gen_ValidIcon": "",
     "Gen_Warning": "警告",
     "Gen_Work_In_Progress": "工作正在进行中，欢迎在 https://github.com/jokob-sk/NetAlertX/issues 上反馈",
     "Gen_create_new_device": "",

front/php/templates/timezone.php

@@ -8,6 +8,7 @@ $configFolderPath = dirname(__FILE__)."/../../../config/";
 $config_file = "app.conf";
 $logFolderPath = "/app/log/";
 $log_file = "app_front.log";
+$default_tz = "Europe/Berlin";
 
 
 $fullConfPath = $configFolderPath.$config_file;
@@ -29,7 +30,13 @@ foreach ($config_file_lines as $line)
 
 if($timeZone == "")
 {
-  $timeZone = "Europe/Berlin";
+  $timeZone = $default_tz;
+}
+
+// Validate the timezone
+if (!in_array($timeZone, timezone_identifiers_list())) {
+  error_log("Invalid timezone '$timeZone' in config. Falling back to default: '$default_tz' ");
+  $timeZone = $default_tz;
 }
 
 date_default_timezone_set($timeZone);

front/plugins/__template/config.json

@@ -75,7 +75,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/_publisher_mqtt/config.json

@@ -361,7 +361,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * 3",

front/plugins/arp_scan/config.json

@@ -208,7 +208,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/asuswrt_import/config.json

@@ -84,9 +84,28 @@
       "type": {
         "dataType": "string",
         "elements": [
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
           {
             "elementType": "input",
-            "elementOptions": [],
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
             "transformers": []
           }
         ]

front/plugins/avahi_scan/config.json

@@ -132,7 +132,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/csv_backup/config.json

@@ -5,8 +5,11 @@
   "enabled": true,
   "data_source": "script",
   "show_ui": false,
-  "localized": ["display_name", "description", "icon"],
+  "localized": [
-
+    "display_name",
+    "description",
+    "icon"
+  ],
   "display_name": [
     {
       "language_code": "en_us",
@@ -53,15 +56,20 @@
       "value": "CSVBCKP_location"
     }
   ],
-
   "settings": [
     {
       "function": "RUN",
-      "events": ["run"],
+      "events": [
+        "run"
+      ],
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "select", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "select",
+            "elementOptions": [],
+            "transformers": []
+          }
         ]
       },
       "default_value": "schedule",
@@ -72,7 +80,10 @@
         "always_after_scan",
         "on_new_device"
       ],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -109,14 +120,21 @@
         "elements": [
           {
             "elementType": "input",
-            "elementOptions": [{ "readonly": "true" }],
+            "elementOptions": [
+              {
+                "readonly": "true"
+              }
+            ],
             "transformers": []
           }
         ]
       },
       "default_value": "python3 /app/front/plugins/csv_backup/script.py overwrite={overwrite} location={location}",
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -151,12 +169,38 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * 3",
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -193,14 +237,21 @@
         "elements": [
           {
             "elementType": "input",
-            "elementOptions": [{ "type": "number" }],
+            "elementOptions": [
+              {
+                "type": "number"
+              }
+            ],
             "transformers": []
           }
         ]
       },
       "default_value": 30,
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -237,14 +288,21 @@
         "elements": [
           {
             "elementType": "input",
-            "elementOptions": [{ "type": "checkbox" }],
+            "elementOptions": [
+              {
+                "type": "checkbox"
+              }
+            ],
             "transformers": []
           }
         ]
       },
       "default_value": false,
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -279,12 +337,19 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "input",
+            "elementOptions": [],
+            "transformers": []
+          }
         ]
       },
       "default_value": "/app/config",
       "options": [],
-      "localized": ["name", "description"],
+      "localized": [
+        "name",
+        "description"
+      ],
       "name": [
         {
           "language_code": "en_us",
@@ -315,6 +380,5 @@
       ]
     }
   ],
-
   "database_column_definitions": []
 }

front/plugins/db_cleanup/config.json

@@ -109,7 +109,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/ddns_update/config.json

@@ -159,7 +159,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/dhcp_leases/config.json

@@ -580,7 +580,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/plugins/dhcp_servers/config.json

@@ -381,7 +381,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/plugins/freebox/config.json

@@ -87,9 +87,28 @@
       "type": {
         "dataType": "string",
         "elements": [
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
           {
             "elementType": "input",
-            "elementOptions": [],
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
             "transformers": []
           }
         ]

front/plugins/icmp_scan/config.json

@@ -164,7 +164,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/internet_ip/config.json

@@ -187,7 +187,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/internet_speedtest/config.json

@@ -452,7 +452,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/ipneigh/config.json

@@ -87,9 +87,28 @@
       "type": {
         "dataType": "string",
         "elements": [
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
           {
             "elementType": "input",
-            "elementOptions": [],
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
             "transformers": []
           }
         ]

front/plugins/maintenance/config.json

@@ -114,7 +114,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/plugins/mikrotik_scan/config.json

@@ -114,7 +114,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/nbtscan_scan/config.json

@@ -132,7 +132,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/nmap_dev_scan/config.json

@@ -184,7 +184,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/nmap_scan/config.json

@@ -460,7 +460,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/plugins/nslookup_scan/config.json

@@ -132,7 +132,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/omada_sdn_imp/config.json

@@ -76,7 +76,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
 

front/plugins/pihole_scan/config.json

@@ -166,7 +166,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/30 * * * *",

front/plugins/plugin_helper.py

@@ -1,5 +1,6 @@
 from time import strftime
 import pytz
+from pytz import timezone, all_timezones, UnknownTimeZoneError
 import sys
 import re
 import base64
@@ -11,7 +12,7 @@ sys.path.append(f"{INSTALL_PATH}/front/plugins")
 sys.path.append(f'{INSTALL_PATH}/server') 
 
 from logger import mylog, Logger
-from const import confFileName
+from const import confFileName, default_tz
 
 #-------------------------------------------------------------------------------
 def read_config_file():
@@ -35,6 +36,8 @@ def read_config_file():
 
 configFile = read_config_file()
 timeZoneSetting = configFile['TIMEZONE']
+if timeZoneSetting not in all_timezones:
+    timeZoneSetting = default_tz
 timeZone = pytz.timezone(timeZoneSetting)
 
 # -------------------------------------------------------------------

front/plugins/snmp_discovery/config.json

@@ -495,7 +495,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/plugins/sync/config.json

@@ -82,7 +82,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
 

front/plugins/vendor_update/config.json

@@ -124,7 +124,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 4 * * 3",

front/plugins/wake_on_lan/config.json

@@ -74,7 +74,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "*/5 * * * *",

front/plugins/website_monitor/config.json

@@ -408,7 +408,30 @@
       "type": {
         "dataType": "string",
         "elements": [
-          { "elementType": "input", "elementOptions": [], "transformers": [] }
+          {
+            "elementType": "span",
+            "elementOptions": [
+              {
+                "cssClasses": "input-group-addon validityCheck"
+              },
+              {
+                "getStringKey": "Gen_ValidIcon"
+              }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "input",
+            "elementOptions": [
+              {
+                "onChange": "validateRegex(this)"
+              },
+              {
+                "base64Regex": "Xig/OlwqfCg/OlswLTldfFsxLTVdWzAtOV18WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlswLTldfDFbMC05XXwyWzAtM118WzAtOV0rLVswLTldK3xcKi9bMC05XSspKVxzKyg/OlwqfCg/OlsxLTldfFsxMl1bMC05XXwzWzAxXXxbMC05XSstWzAtOV0rfFwqL1swLTldKykpXHMrKD86XCp8KD86WzEtOV18MVswLTJdfFswLTldKy1bMC05XSt8XCovWzAtOV0rKSlccysoPzpcKnwoPzpbMC02XXxbMC02XS1bMC02XXxcKi9bMC05XSspKSQ="
+              }
+            ],
+            "transformers": []
+          }
         ]
       },
       "default_value": "0 2 * * *",

front/settings.php

@@ -595,7 +595,8 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX
             onChange,
             customParams,
             customId,
-            columns
+            columns,
+            base64Regex
           } = handleElementOptions('none', elementOptions, transformers, val = "");
 
           let value;

server/const.py

@@ -20,7 +20,7 @@ fullDbPath          = applicationPath + dbPath
 vendorsPath         = '/usr/share/arp-scan/ieee-oui.txt'
 vendorsPathNewest   = '/usr/share/arp-scan/ieee-oui_all_filtered.txt'
 
-       
+default_tz          = 'Europe/Berlin'
 
 
 #===============================================================================

server/initialise.py

@@ -1,7 +1,7 @@
 
 import os
 import time
-from pytz import timezone
+from pytz import timezone, all_timezones, UnknownTimeZoneError
 from cron_converter import Cron
 from pathlib import Path
 import datetime
@@ -11,7 +11,7 @@ import re
 
 # Register NetAlertX libraries
 import conf 
-from const import fullConfPath, applicationPath, fullConfFolder
+from const import fullConfPath, applicationPath, fullConfFolder, default_tz
 from helper import fixPermissions, collect_lang_strings, updateSubnets, initOrSetParam, isJsonObject, setting_value_to_python_type, timeNowTZ, get_setting_value, generate_random_string
 from app_state import updateState
 from logger import mylog
@@ -161,7 +161,7 @@ def importConfigs (db, all_plugins):
     conf.DISCOVER_PLUGINS = ccd('DISCOVER_PLUGINS', True , c_d, 'Discover plugins', """{"dataType": "boolean","elements": [{"elementType": "input","elementOptions": [{ "type": "checkbox" }],"transformers": []}]}""", '[]', 'General')
     conf.SCAN_SUBNETS = ccd('SCAN_SUBNETS', ['192.168.1.0/24 --interface=eth1', '192.168.1.0/24 --interface=eth0'] , c_d, 'Subnets to scan', '''{"dataType": "array","elements": [{"elementType": "input","elementOptions": [{"placeholder": "192.168.1.0/24 --interface=eth1"},{"suffix": "_in"},{"cssClasses": "col-sm-10"},{"prefillValue": "null"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": ["_in"]},{"separator": ""},{"cssClasses": "col-xs-12"},{"onClick": "addList(this, false)"},{"getStringKey": "Gen_Add"}],"transformers": []},{"elementType": "select","elementHasInputValue": 1,"elementOptions": [{"multiple": "true"},{"readonly": "true"},{"editable": "true"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": []},{"separator": ""},{"cssClasses": "col-xs-6"},{"onClick": "removeAllOptions(this)"},{"getStringKey": "Gen_Remove_All"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": []},{"separator": ""},{"cssClasses": "col-xs-6"},{"onClick": "removeFromList(this)"},{"getStringKey": "Gen_Remove_Last"}],"transformers": []}]}''', '[]', 'General')    
     conf.LOG_LEVEL = ccd('LOG_LEVEL', 'verbose' , c_d, 'Log verboseness', '{"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]}', "['none', 'minimal', 'verbose', 'debug', 'trace']", 'General')
-    conf.TIMEZONE = ccd('TIMEZONE', 'Europe/Berlin' , c_d, 'Time zone', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General')    
+    conf.TIMEZONE = ccd('TIMEZONE', default_tz , c_d, 'Time zone', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General')    
     conf.PLUGINS_KEEP_HIST = ccd('PLUGINS_KEEP_HIST', 250 , c_d, 'Keep history entries', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', '[]', 'General') 
     conf.REPORT_DASHBOARD_URL = ccd('REPORT_DASHBOARD_URL', 'http://netalertx/' , c_d, 'NetAlertX URL', '{"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]}', '[]', 'General')
     conf.DAYS_TO_KEEP_EVENTS = ccd('DAYS_TO_KEEP_EVENTS', 90 , c_d, 'Delete events days', '{"dataType":"integer", "elements": [{"elementType" : "input", "elementOptions" : [{"type": "number"}] ,"transformers": []}]}', '[]', 'General')
@@ -177,8 +177,15 @@ def importConfigs (db, all_plugins):
     # UI
     conf.UI_LANG = ccd('UI_LANG', 'English' , c_d, 'Language Interface', '{"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]}', "['English', 'German', 'Spanish', 'French', 'Norwegian', 'Russian', 'Italian (it_it)', 'Portuguese (pt_br)', 'Polish (pl_pl)', 'Chinese (zh_cn)', 'Turkish (tr_tr)', 'Czech (cs_cz)', 'Arabic (ar_ar)',  'Catalan (ca_ca)', 'Ukrainian (uk_ua)' ]", 'UI') 
     
-    #  Init timezone in case it changed
+    #  Init timezone in case it changed and handle invalid values
-    conf.tz = timezone(conf.TIMEZONE) 
+    try:
+        if conf.TIMEZONE not in all_timezones:
+            raise UnknownTimeZoneError(f"Invalid timezone: {conf.TIMEZONE}")
+        conf.tz = timezone(conf.TIMEZONE)
+    except UnknownTimeZoneError:
+        conf.tz = timezone(default_tz)  # Init Default
+        conf.TIMEZONE = ccd('TIMEZONE', conf.tz , c_d, '_KEEP_', '_KEEP_', '[]', 'General')
+        mylog('none', [f"[Config] Invalid timezone '{conf.TIMEZONE}', defaulting to {default_tz}."])
 
     # TODO cleanup later ----------------------------------------------------------------------------------
     # init all time values as we have timezone - all this shoudl be moved into plugin/plugin settings