From 0265c416122a0d69e1ebf43fdbdada85f8774b85 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Thu, 24 Jul 2025 22:13:19 +1000
Subject: [PATCH] partial rollback #1119

---
 front/userNotifications.php    |  4 ++-
 server/scan/device_handling.py | 62 ++++++++++++----------------------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/front/userNotifications.php b/front/userNotifications.php
index c53b9d9d..17c8a548 100755
--- a/front/userNotifications.php
+++ b/front/userNotifications.php
@@ -117,7 +117,8 @@ require 'php/templates/header.php';
                   var guid = data.split(":")[1].trim();
                   return `<a href="report.php?guid=${guid}">Go to Report</a>`;
                 } else {
-                  return data;
+                  // clear quotes (") if wrapped in them 
+                  return (data.startsWith('"') && data.endsWith('"')) ? data.slice(1, -1) : data;
                 }
           }
          },
@@ -208,6 +209,7 @@ require 'php/templates/header.php';
 
    
   });
+  
 </script>
 
 <?php
diff --git a/server/scan/device_handling.py b/server/scan/device_handling.py
index 7750977a..ee9d14fc 100755
--- a/server/scan/device_handling.py
+++ b/server/scan/device_handling.py
@@ -354,50 +354,32 @@ def create_new_devices (db):
     sql = db.sql # TO-DO
     startTime = timeNowTZ()
 
-    # Insert events for new devices from CurrentScan (not yet in Devices)
-    mylog('debug', '[New Devices] Insert "New Device" Events')
+    # Insert events for new devices from CurrentScan
+    mylog('debug','[New Devices] New devices - 1 Events')
 
-    query_new_device_events = f"""
-    INSERT INTO Events (
-        eve_MAC, eve_IP, eve_DateTime,
-        eve_EventType, eve_AdditionalInfo,
-        eve_PendingAlertEmail
-    )
-    SELECT cur_MAC, cur_IP, '{startTime}', 'New Device', cur_Vendor, 1
-    FROM CurrentScan
-    WHERE NOT EXISTS (
-        SELECT 1 FROM Devices
-        WHERE devMac = cur_MAC
-    )
-    """
+    query = f"""INSERT INTO Events (eve_MAC, eve_IP, eve_DateTime,
+                        eve_EventType, eve_AdditionalInfo,
+                        eve_PendingAlertEmail)
+                    SELECT cur_MAC, cur_IP, '{startTime}', 'New Device', cur_Vendor, 1
+                    FROM CurrentScan
+                    WHERE NOT EXISTS (SELECT 1 FROM Devices
+                                      WHERE devMac = cur_MAC)
+                """ 
 
-    mylog('debug', f'[New Devices] Log Events Query: {query_new_device_events}')
-    sql.execute(query_new_device_events)
+    
+    mylog('debug',f'[New Devices] Log Events Query: {query}')
+    
+    sql.execute(query)
 
-   
-    # Insert session rows for known devices that are now (re)connected
-    mylog('debug', '[New Devices] Insert "Connected" Sessions (only for known devices)')
+    mylog('debug',f'[New Devices] Insert Connection into session table')
 
-    query_connected_sessions = f"""
-    INSERT INTO Sessions (
-        ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection,
-        ses_EventTypeDisconnection, ses_DateTimeDisconnection,
-        ses_StillConnected, ses_AdditionalInfo
-    )
-    SELECT cur_MAC, cur_IP, 'Connected', '{startTime}', NULL, NULL, 1, cur_Vendor
-    FROM CurrentScan
-    WHERE EXISTS (
-        SELECT 1 FROM Devices
-        WHERE devMac = cur_MAC
-    )
-    AND NOT EXISTS (
-        SELECT 1 FROM Sessions
-        WHERE ses_MAC = cur_MAC AND ses_StillConnected = 1
-    )
-    """
-
-    mylog('debug', f'[New Devices] Log Sessions Query: {query_connected_sessions}')
-    sql.execute(query_connected_sessions)
+    sql.execute (f"""INSERT INTO Sessions (ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection,
+                        ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_StillConnected, ses_AdditionalInfo)
+                    SELECT cur_MAC, cur_IP,'Connected','{startTime}', NULL , NULL ,1, cur_Vendor
+                    FROM CurrentScan 
+                    WHERE NOT EXISTS (SELECT 1 FROM Sessions
+                                      WHERE ses_MAC = cur_MAC) 
+                    """)
                     
     # Create new devices from CurrentScan
     mylog('debug','[New Devices] 2 Create devices')