From 2a5e419034d41f9d891dfb3a8059b4ffaf8a353d Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sat, 8 Feb 2025 08:17:37 +1100
Subject: [PATCH] Better dummy newdev MAC check

---
 front/deviceDetailsEdit.php | 6 +++---
 front/js/common.js          | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/front/deviceDetailsEdit.php b/front/deviceDetailsEdit.php
index a3182c26..df9571b4 100755
--- a/front/deviceDetailsEdit.php
+++ b/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();
     });
-
   }
 
   //-----------------------------------------------------------------------------------
diff --git a/front/js/common.js b/front/js/common.js
index b91ec0fc..bdb32bd5 100755
--- a/front/js/common.js
+++ b/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(){