vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-06 17:15:38 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

double-bars work #1119

Browse Source
This commit is contained in:
jokob-sk
2025-07-24 21:15:36 +10:00
parent 266d7c25da
commit 3035b5b6b2
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/index.php
View File

@@ -99,18 +99,6 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
<!-- Favicon --> <!-- Favicon -->
<link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png"> <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
<!-- Dark-Mode Patch -->
<?php
switch ($UI_THEME) {
case "Dark":
echo '<link rel="stylesheet" href="css/dark-patch.css">';
break;
case "System":
echo '<link rel="stylesheet" href="css/system-dark-patch.css">';
break;
}
?>
<link rel="stylesheet" href="/css/offline-font.css"> <link rel="stylesheet" href="/css/offline-font.css">
</head> </head>
<body class="hold-transition login-page col-sm-12 col-sx-12"> <body class="hold-transition login-page col-sm-12 col-sx-12">

62
server/scan/device_handling.py
View File

@@ -354,32 +354,50 @@ def create_new_devices (db):
sql = db.sql # TO-DO sql = db.sql # TO-DO
startTime = timeNowTZ() startTime = timeNowTZ()
# Insert events for new devices from CurrentScan # Insert events for new devices from CurrentScan (not yet in Devices)
mylog('debug','[New Devices] New devices - 1 Events') mylog('debug', '[New Devices] Insert "New Device" Events')
query = f"""INSERT INTO Events (eve_MAC, eve_IP, eve_DateTime, query_new_device_events = f"""
eve_EventType, eve_AdditionalInfo, INSERT INTO Events (
eve_PendingAlertEmail) eve_MAC, eve_IP, eve_DateTime,
SELECT cur_MAC, cur_IP, '{startTime}', 'New Device', cur_Vendor, 1 eve_EventType, eve_AdditionalInfo,
FROM CurrentScan eve_PendingAlertEmail
WHERE NOT EXISTS (SELECT 1 FROM Devices )
WHERE devMac = cur_MAC) 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}')
mylog('debug',f'[New Devices] Log Events Query: {query}') sql.execute(query_new_device_events)
sql.execute(query)
mylog('debug',f'[New Devices] Insert Connection into session table')
# Insert session rows for known devices that are now (re)connected
mylog('debug', '[New Devices] Insert "Connected" Sessions (only for known devices)')
sql.execute (f"""INSERT INTO Sessions (ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection, query_connected_sessions = f"""
ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_StillConnected, ses_AdditionalInfo) INSERT INTO Sessions (
SELECT cur_MAC, cur_IP,'Connected','{startTime}', NULL , NULL ,1, cur_Vendor ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection,
FROM CurrentScan ses_EventTypeDisconnection, ses_DateTimeDisconnection,
WHERE NOT EXISTS (SELECT 1 FROM Sessions ses_StillConnected, ses_AdditionalInfo
WHERE ses_MAC = cur_MAC) )
""") 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
)
"""
mylog('debug', f'[New Devices] Log Sessions Query: {query_connected_sessions}')
sql.execute(query_connected_sessions)
# Create new devices from CurrentScan # Create new devices from CurrentScan
mylog('debug','[New Devices] 2 Create devices') mylog('debug','[New Devices] 2 Create devices')