vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 01:26:11 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'jokob-sk:main' into mqtt-optimisations

Browse Source
This commit is contained in:
Ingo Ratsdorf
2025-09-22 12:28:41 +12:00
committed by GitHub
parent a20058a884 b78758976e
commit 75ef310e9b
55 changed files with 3071 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front/.gitignore vendored Executable file
View File

@@ -0,0 +1 @@
buildtimestamp.txt

2
front/php/components/logs.php
View File

@@ -62,7 +62,7 @@ function renderLogArea($params) {
'</textarea>
</div>
<div class="row logs-row">
<div class="log-file col-sm-6 col-xs-12">' . htmlspecialchars($fileName) . '
<div class="log-file col-sm-6 col-xs-12">' . htmlspecialchars($filePath) . '
<div class="logs-size">' . number_format((filesize($filePath) / 1000000), 2, ",", ".") . ' MB'
. $downloadButtonHtml .
'</div>

2
front/php/server/db.php
View File

@@ -82,7 +82,7 @@ class CustomDatabaseWrapper {
private $maxRetries;
private $retryDelay;
public function __construct($filename, $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $maxRetries = 3, $retryDelay = 1000, $encryptionKey = null) {
public function __construct($filename, $flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $maxRetries = 3, $retryDelay = 1000, $encryptionKey = "") {
$this->sqlite = new SQLite3($filename, $flags, $encryptionKey);
$this->maxRetries = $maxRetries;
$this->retryDelay = $retryDelay;

2
front/php/templates/security.php
View File

@@ -48,7 +48,7 @@ if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'logout') {
// Load configuration
if (!file_exists(CONFIG_PATH)) {
die("Configuration file not found.");
die("Configuration file not found in " . $_SERVER['DOCUMENT_ROOT'] . "/../config/app.conf");
}
$configLines = file(CONFIG_PATH);

4
front/plugins/omada_sdn_imp/config.json
View File

@@ -20,13 +20,13 @@
"display_name": [
{
"language_code": "en_us",
"string": "OMADA SDN import"
"string": "OMADA SDN import (do not use)"
}
],
"description": [
{
"language_code": "en_us",
"string": "Plugin to import data from OMADA SDN."
"string": "Unmaintained and superseded. Use OMDSDNOPENAPI instead."
}
],
"icon": [