/data and /tmp standarization

front/php/server/db.php

@@ -13,8 +13,35 @@
 // $DBFILE = dirname(__FILE__).'/../../../db/app.db';
 // $DBFILE_LOCKED_FILE = dirname(__FILE__).'/../../../log/db_is_locked.log';
 $scriptDir = realpath(dirname(__FILE__)); // Resolves symlinks to the actual physical path
-$DBFILE = $scriptDir . '/../../../db/app.db';
-$DBFILE_LOCKED_FILE = $scriptDir . '/../../../log/db_is_locked.log';
+$legacyDbPath = $scriptDir . '/../../../db/app.db';
+$legacyLogDir = $scriptDir . '/../../../log';
+
+$dbFolderPath = rtrim(getenv('NETALERTX_DB') ?: '/data/db', '/');
+$logFolderPath = rtrim(getenv('NETALERTX_LOG') ?: '/tmp/log', '/');
+
+// Fallback to legacy layout if the new location is missing but the legacy file still exists
+if (!is_dir($dbFolderPath) && file_exists($legacyDbPath)) {
+    $dbFolderPath = dirname($legacyDbPath);
+}
+
+if (!is_dir($dbFolderPath)) {
+    @mkdir($dbFolderPath, 0775, true);
+}
+
+$DBFILE = rtrim($dbFolderPath, '/') . '/app.db';
+if (!file_exists($DBFILE) && file_exists($legacyDbPath)) {
+    $DBFILE = $legacyDbPath;
+}
+
+if (!is_dir($logFolderPath) && is_dir($legacyLogDir)) {
+    $logFolderPath = $legacyLogDir;
+}
+
+if (!is_dir($logFolderPath)) {
+    @mkdir($logFolderPath, 0775, true);
+}
+
+$DBFILE_LOCKED_FILE = rtrim($logFolderPath, '/') . '/db_is_locked.log';
 
 
 //------------------------------------------------------------------------------
@@ -39,8 +66,10 @@ function SQLite3_connect($trytoreconnect = true, $retryCount = 0) {
         if (!file_exists($DBFILE)) {
             die("Database file not found: $DBFILE");
         }
-        if (!file_exists(dirname($DBFILE_LOCKED_FILE))) {
-            die("Log directory not found: " . dirname($DBFILE_LOCKED_FILE));
+
+        $lockDir = dirname($DBFILE_LOCKED_FILE);
+        if (!is_dir($lockDir) && !@mkdir($lockDir, 0775, true)) {
+            die("Log directory not found and could not be created: $lockDir");
         }
        
 
@@ -130,6 +159,7 @@ class CustomDatabaseWrapper {
         $message = 'Error executing query (attempts: ' . $attempts . '), query: ' . $query;        
         // write_notification($message);
         error_log("Query failed after {$this->maxRetries} attempts: " . $this->sqlite->lastErrorMsg());        
+        return false;
     }
 
     public function query_log_add($query)
@@ -187,7 +217,7 @@ function OpenDB($DBPath = null) {
 
     if (strlen($DBFILE) == 0) {
         $message = 'Database not available';
-        echo '<script>alert('.$message.')</script>';
+        echo '<script>alert("'.$message.'")</script>';
         write_notification($message);
         
         die('<div style="padding-left:150px">'.$message.'</div>');
@@ -197,7 +227,7 @@ function OpenDB($DBPath = null) {
         $db = new CustomDatabaseWrapper($DBFILE);
     } catch (Exception $e) {
         $message = "Error connecting to the database";
-        echo '<script>alert('.$message.'": ' . $e->getMessage() . '")</script>';
+        echo '<script>alert("'.$message.': '.$e->getMessage().'")</script>';
         write_notification($message);
         die('<div style="padding-left:150px">'.$message.'</div>');
     }

front/php/server/init.php

@@ -1,5 +1,6 @@
 <?php
-ini_set('error_log', '../../log/app.php_errors.log'); // initializing the app.php_errors.log file for the maintenance section
+$logPath = rtrim(getenv('NETALERTX_LOG') ?: '/tmp/log', '/') . '/app.php_errors.log';
+ini_set('error_log', $logPath); // initializing the app.php_errors.log file for the maintenance section
 require dirname(__FILE__).'/../templates/globals.php';
 require dirname(__FILE__).'/db.php';
 require dirname(__FILE__).'/util.php';

front/php/server/query_config.php

@@ -18,7 +18,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // Check if file parameter is provided
     if ($file) {
         // Define the folder where files are located
-        $filePath = "/app/config/" . basename($file);
+        $configRoot = getenv('NETALERTX_CONFIG') ?: '/data/config';
+        $filePath = rtrim($configRoot, '/') . "/" . basename($file);
 
         // Check if the file exists and is readable
         if (file_exists($filePath) && is_readable($filePath)) {

front/php/server/query_json.php

@@ -11,6 +11,8 @@ require dirname(__FILE__).'/../server/init.php';
 //------------------------------------------------------------------------------
 // Handle incoming requests
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    $configRoot = getenv('NETALERTX_CONFIG') ?: '/data/config';
+    $apiRoot = getenv('NETALERTX_API') ?: '/tmp/api';
     // Get query string parameter ?file=settings_table.json
     $file = isset($_GET['file']) ? $_GET['file'] : null;
 
@@ -19,10 +21,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
         // Define the folder where files are located
         if ($file == "workflows.json") 
         {
-            $filePath = "/app/config/" . basename($file);
+            $filePath = rtrim($configRoot, '/') . "/" . basename($file);
         } else
         {       
-            $filePath = "/app/api/" . basename($file);
+            $filePath = rtrim($apiRoot, '/') . "/" . basename($file);
         }
 
         // Check if the file exists
@@ -59,7 +61,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
     
     $file = $_GET['file'];
-    $filePath = "/app/config/" . basename($file);
+    $configRoot = getenv('NETALERTX_CONFIG') ?: '/data/config';
+    $filePath = rtrim($configRoot, '/') . "/" . basename($file);
 
     // Save new workflows.json (replace existing content)
     if (file_put_contents($filePath, json_encode($decodedData, JSON_PRETTY_PRINT))) {

front/php/server/query_logs.php

@@ -16,8 +16,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
     // Check if file parameter is provided
     if ($file) {
-        // Define the folder where files are located
-        $filePath = "/app/log/" . basename($file);
+    // Define the folder where files are located
+    $logBasePath = rtrim(getenv('NETALERTX_LOG') ?: '/tmp/log', '/');
+    $filePath = $logBasePath . '/' . basename($file);
 
         // Check if the file exists
         if (file_exists($filePath)) {

front/php/server/util.php

@@ -11,6 +11,7 @@
 require dirname(__FILE__).'/../templates/globals.php';
 require dirname(__FILE__).'/../templates/skinUI.php';
 
+
 //------------------------------------------------------------------------------
 // check if authenticated
 require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
@@ -263,7 +264,7 @@ function cleanLog($logFile)
 
   $path = "";
 
-  $allowedFiles = ['app.log', 'app_front.log', 'IP_changes.log', 'stdout.log', 'stderr.log', 'app.php_errors.log', 'execution_queue.log', 'db_is_locked.log'];
+  $allowedFiles = ['app.log', 'app_front.log', 'IP_changes.log', 'stdout.log', 'stderr.log', 'app.php_errors.log', 'execution_queue.log', 'db_is_locked.log', 'nginx-error.log', 'crond.log'];
   
   if(in_array($logFile, $allowedFiles))
   {
@@ -312,7 +313,7 @@ function saveSettings()
 
   $txt = $txt."#-----------------AUTOGENERATED FILE-----------------#\n";
   $txt = $txt."#                                                    #\n";
-  $txt = $txt."#         Generated:  ".$timestamp."            #\n";
+  $txt = $txt."#         Generated:  ".$timestamp."                 #\n";
   $txt = $txt."#                                                    #\n";
   $txt = $txt."#   Config file for the LAN intruder detection app:  #\n";
   $txt = $txt."#      https://github.com/jokob-sk/NetAlertX         #\n";
@@ -321,7 +322,12 @@ function saveSettings()
 
   // collect all groups
 
-  $decodedSettings = json_decode($SETTINGS, true);
+  $decodedSettings = json_decode((string)$SETTINGS, true);
+
+  if ($decodedSettings === null) {
+      echo "Error: Invalid JSON in settings data.";
+      return;
+  }
 
   foreach ($decodedSettings as $setting) { 
     if( in_array($setting[0] , $groups) == false) {
@@ -431,8 +437,9 @@ function getString ($setKey, $default) {
 }
 // -------------------------------------------------------------------------------------------
 function getSettingValue($setKey) {
-  // Define the JSON endpoint URL  
-  $url = dirname(__FILE__).'/../../../api/table_settings.json';  
+  // Define the JSON endpoint URL
+  $apiRoot = rtrim(getenv('NETALERTX_API') ?: '/tmp/api', '/');
+  $url = $apiRoot . '/table_settings.json';
 
   // Fetch the JSON data
   $json = file_get_contents($url);

front/php/server/utilNotification.php

@@ -7,6 +7,11 @@
 
 require dirname(__FILE__).'/../templates/globals.php';
 
+function get_notification_store_path(): string {
+    $apiRoot = getenv('NETALERTX_API') ?: '/tmp/api';
+    return rtrim($apiRoot, '/') . '/user_notifications.json';
+}
+
 //------------------------------------------------------------------------------
 // check if authenticated
 require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
@@ -69,7 +74,7 @@ function generate_guid() {
 // ----------------------------------------------------------------------------------------
 // Logs a notification in in-app notification system
 function write_notification($content, $level = "interrupt") {
-    $NOTIFICATION_API_FILE = '/app/api/user_notifications.json';
+    $NOTIFICATION_API_FILE = get_notification_store_path();
 
     // Generate GUID
     $guid = generate_guid();
@@ -102,7 +107,7 @@ function write_notification($content, $level = "interrupt") {
 // ----------------------------------------------------------------------------------------
 // Removes a notification based on GUID
 function remove_notification($guid) {
-    $NOTIFICATION_API_FILE = '/app/api/user_notifications.json';
+    $NOTIFICATION_API_FILE = get_notification_store_path();
 
     // Read existing notifications
     $notifications = json_decode(file_get_contents($NOTIFICATION_API_FILE), true);
@@ -119,7 +124,7 @@ function remove_notification($guid) {
 // ----------------------------------------------------------------------------------------
 // Deletes all notifications
 function notifications_clear() {
-    $NOTIFICATION_API_FILE = '/app/api/user_notifications.json';
+    $NOTIFICATION_API_FILE = get_notification_store_path();
 
     // Clear notifications by writing an empty array to the file
     file_put_contents($NOTIFICATION_API_FILE, json_encode(array()));
@@ -128,7 +133,7 @@ function notifications_clear() {
 // ----------------------------------------------------------------------------------------
 // Mark a notification read based on GUID
 function mark_notification_as_read($guid) {
-    $NOTIFICATION_API_FILE = '/app/api/user_notifications.json';
+    $NOTIFICATION_API_FILE = get_notification_store_path();
     $max_attempts = 3;
     $attempts = 0;
 
@@ -177,7 +182,7 @@ function notifications_mark_all_read() {
 
 // ----------------------------------------------------------------------------------------
 function get_unread_notifications() {
-    $NOTIFICATION_API_FILE = '/app/api/user_notifications.json';
+    $NOTIFICATION_API_FILE = get_notification_store_path();
 
     // Read existing notifications
     if (file_exists($NOTIFICATION_API_FILE) && is_readable($NOTIFICATION_API_FILE)) {