From c58bbf21b157379d906528807a568357c35312a8 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sat, 28 Sep 2024 10:28:05 +1000
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A7=B9=20Code=20Cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/deviceDetails.php                |  30 ------
 front/events.php                       |  45 +++-----
 front/js/common.js                     |  23 ----
 front/js/settings_utils.js             |  27 -----
 front/php/components/logs.php          |   4 +
 front/php/components/tile_cards.php    |   5 +
 front/php/server/cache-bottom.php      |   7 --
 front/php/server/cache-top.php         |  15 ---
 front/php/server/db.php                |   4 +
 front/php/server/dbHelper.php          |  10 +-
 front/php/server/devices.php           |   4 +
 front/php/server/events.php            |  57 ++++++----
 front/php/server/internetinfo.php      |   4 +
 front/php/server/nmap_scan.php         |   4 +
 front/php/server/nslookup.php          |   5 +
 front/php/server/parameters.php        | 144 -------------------------
 front/php/server/speedtestcli.php      |   5 +
 front/php/server/traceroute.php        |   4 +
 front/php/server/util.php              |   6 +-
 front/php/server/utilDB.php            |  13 ---
 front/php/server/utilNotification.php  |   5 +-
 front/php/templates/auth.php           |   4 +-
 front/php/templates/footer.php         |   6 ++
 front/php/templates/graph.php          |   4 +
 front/php/templates/header.php         |   6 +-
 front/php/templates/language/lang.php  |   2 -
 front/php/templates/migrationCheck.php |   8 +-
 front/php/templates/security.php       |   7 +-
 front/php/templates/skinUI.php         |   5 +-
 front/php/templates/version.php        |   4 +-
 front/presence.php                     |  31 +++++-
 31 files changed, 171 insertions(+), 327 deletions(-)
 delete mode 100755 front/php/server/cache-bottom.php
 delete mode 100755 front/php/server/cache-top.php
 delete mode 100755 front/php/server/parameters.php
 delete mode 100755 front/php/server/utilDB.php
 mode change 100755 => 100644 front/php/templates/skinUI.php

diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index d7cbdfec..06b7214f 100755
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -790,7 +790,6 @@ function initializeiCheck () {
     // Hide / Show Events
     if (event.currentTarget.id == 'chkHideConnectionEvents') {
       getDeviceEvents();
-      setParameter (parEventsHide, event.currentTarget.checked);
     } else {
       // Activate save & restore
       // activateSaveRestoreData();
@@ -1014,25 +1013,6 @@ function initializeDatatables () {
       "info":           "<?= lang('Events_Table_info');?>",
     }
   });
-
-  // Save Parameters rows & order when changed
-  $('#tableSessions').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parSessionsRows, len);
-
-    // Sync Rows in both datatables
-    // if ( $('#tableEvents').DataTable().page.len() != len) {
-    //   $('#tableEvents').DataTable().page.len( len ).draw();
-    // }
-  } );
-  
-  $('#tableEvents').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parEventsRows, len);
-
-    // Sync Rows in both datatables
-    // if ( $('#tableSessions').DataTable().page.len() != len) {
-    //   $('#tableSessions').DataTable().page.len( len ).draw();
-    // }
-  } );
 };
 
 
@@ -1149,10 +1129,6 @@ function initializeCalendar () {
 
 // -----------------------------------------------------------------------------
 function periodChanged () {
-  // Save Parameter Period
-  period = $('#period').val();
-  setParameter (parPeriod, period);
-
   // Requery Device data
   getDeviceData(true);
   getSessionsPresenceEvents();
@@ -1831,12 +1807,6 @@ function initTable(tableId, mac){
 
   $("#"+tableId).attr("data-mac", mac)
 
-  // Save Parameters rows & order when changed
-  $('#'+tableId).on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parSessionsRows, len);
-
-  } );
-
 }
 
 //-----------------------------------------------------------------------------------
diff --git a/front/events.php b/front/events.php
index 2fa28397..6bd757e8 100755
--- a/front/events.php
+++ b/front/events.php
@@ -183,43 +183,31 @@
 
 <!-- page script ----------------------------------------------------------- -->
 <script>
-  var parPeriod       = 'Front_Events_Period';
-  var parTableRows    = 'Front_Events_Rows';
+  var parPeriod       = 'nax_parPeriod';
+  var parTableRows    = 'nax_parTableRows';
 
   var eventsType      = 'all';
-  var period          = '';
-  var tableRows       = 10;
+  var period          = '1 day';
+  var tableRows       = 25;
   
   // Read parameters & Initialize components
   main();
 
 
 // -----------------------------------------------------------------------------
-function main () {
-  // get parameter value
-  $.get('php/server/parameters.php?action=get&defaultValue=1 day&parameter='+ parPeriod, function(data) {
-    var result = JSON.parse(data);
-    if (result) {
-      period = result;
-      $('#period').val(period);
-    }
+function main() {
+  // Get parameter value from cookies instead of server
+  period = getCookie(parPeriod) === "" ? "1 day" : getCookie(parPeriod);
+  $('#period').val(period);
 
-    // get parameter value
-    $.get('php/server/parameters.php?action=get&defaultValue=50&parameter='+ parTableRows, function(data) {
-      var result = JSON.parse(data);
-      result = parseInt(result, 10)
-      if (Number.isInteger (result) ) {
-          tableRows = result;
-      }
+  tableRows = getCookie(parTableRows) === "" ? 50 : parseInt(getCookie(parTableRows), 10);
 
-      // Initialize components
-      initializeDatatable();
+  // Initialize components
+  initializeDatatable();
 
-      // query data
-      getEventsTotals();
-      getEvents (eventsType);
-    });
-  });
+  // Query data
+  getEventsTotals();
+  getEvents(eventsType);
 }
 
 
@@ -281,7 +269,7 @@ function initializeDatatable () {
 
   // Save Parameter rows when changed
   $('#tableEvents').on( 'length.dt', function ( e, settings, len ) {
-    setParameter (parTableRows, len);
+    setCookie(parTableRows, len)
   } );
 };
 
@@ -290,7 +278,8 @@ function initializeDatatable () {
 function periodChanged () {
   // Save Parameter Period
   period = $('#period').val();
-  setParameter (parPeriod, period);
+
+  setCookie(parTableRows, period)
 
   // Requery totals and events
   getEventsTotals();
diff --git a/front/js/common.js b/front/js/common.js
index 9228f379..2db71c85 100755
--- a/front/js/common.js
+++ b/front/js/common.js
@@ -423,29 +423,6 @@ function numberArrayFromString(data)
   return data.replace(/\[|\]/g, '').split(',').map(Number);
 }
 
-// -----------------------------------------------------------------------------
-function setParameter (parameter, value) {
-  // Retry
-  $.get('php/server/parameters.php?action=set&parameter=' + parameter +
-    '&value='+ value,
-  function(data) {
-    if (data != "OK") {
-      // Retry
-      sleep (200);
-      $.get('php/server/parameters.php?action=set&parameter=' + parameter +
-        '&value='+ value,
-        function(data) {
-          if (data != "OK") {
-          // alert (data);
-          } else {
-          // alert ("OK. Second attempt");
-          };
-      } );
-    };
-  } );
-}
-
-
 // -----------------------------------------------------------------------------  
 function saveData(functionName, id, value) {
   $.ajax({
diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js
index 3399ba0a..064f1f96 100755
--- a/front/js/settings_utils.js
+++ b/front/js/settings_utils.js
@@ -502,33 +502,6 @@ setTimeout(() => {
   });
 }, 1000);
 
-// -----------------------------------------------------------------------------
-// handling events on the backend initiated by the front end END
-// -----------------------------------------------------------------------------
-
-// ---------------------------------------------------------
-// UNUSED?
-function getParam(targetId, key, skipCache = false) {
-  skipCacheQuery = "";
-
-  if (skipCache) {
-    skipCacheQuery = "&skipcache";
-  }
-
-  // get parameter value
-  $.get(
-    "php/server/parameters.php?action=get&defaultValue=0&parameter=" +
-      key +
-      skipCacheQuery,
-    function (data) {
-      var result = data;
-
-      result = result.replaceAll('"', "");
-
-      document.getElementById(targetId).innerHTML = result.replaceAll('"', "");
-    }
-  );
-}
 
 // -----------------------------------------------------------------------------
 // Show/hide the metadata settings
diff --git a/front/php/components/logs.php b/front/php/components/logs.php
index ebec8adf..ce9c1d17 100755
--- a/front/php/components/logs.php
+++ b/front/php/components/logs.php
@@ -2,6 +2,10 @@
 
 require '../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Function to render the log area component
 function renderLogArea($params) {
     $fileName = isset($params['fileName']) ? $params['fileName'] : '';
diff --git a/front/php/components/tile_cards.php b/front/php/components/tile_cards.php
index 25be71e3..790dc790 100755
--- a/front/php/components/tile_cards.php
+++ b/front/php/components/tile_cards.php
@@ -1,4 +1,9 @@
 <?php
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 function renderInfobox($params) {
   $onclickEvent = isset($params['onclickEvent']) ? $params['onclickEvent'] : '';
   $color = isset($params['color']) ? $params['color'] : '';
diff --git a/front/php/server/cache-bottom.php b/front/php/server/cache-bottom.php
deleted file mode 100755
index 63ff81ca..00000000
--- a/front/php/server/cache-bottom.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-// Cache the contents to a cache file
-$cached = fopen($cachefile, 'w');
-fwrite($cached, ob_get_contents());
-fclose($cached);
-ob_end_flush(); // Send the output to the browser
-?>
\ No newline at end of file
diff --git a/front/php/server/cache-top.php b/front/php/server/cache-top.php
deleted file mode 100755
index 17be21e8..00000000
--- a/front/php/server/cache-top.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$url = $_SERVER["SCRIPT_NAME"];
-$break = Explode('/', $url);
-$file = $break[count($break) - 1];
-$cachefile = 'cached-'.substr_replace($file ,"",-4).'.html';
-$cachetime = 18000;
-
-// Serve from the cache if it is younger than $cachetime
-if (file_exists($cachefile) && time() - $cachetime < filemtime($cachefile)) {
-    echo "<!-- Cached copy, generated ".date('H:i', filemtime($cachefile))." -->\n";
-    readfile($cachefile);
-    exit;
-}
-ob_start(); // Start the output buffer
-?>
\ No newline at end of file
diff --git a/front/php/server/db.php b/front/php/server/db.php
index 85f8e6e6..0654ccc8 100755
--- a/front/php/server/db.php
+++ b/front/php/server/db.php
@@ -13,6 +13,10 @@
 $DBFILE = dirname(__FILE__).'/../../../db/app.db';
 $DBFILE_LOCKED_FILE = dirname(__FILE__).'/../../../front/log/db_is_locked.log';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $db_locked = false;
 
 //------------------------------------------------------------------------------
diff --git a/front/php/server/dbHelper.php b/front/php/server/dbHelper.php
index 8262b6e7..8b848352 100755
--- a/front/php/server/dbHelper.php
+++ b/front/php/server/dbHelper.php
@@ -3,16 +3,18 @@
 //  NetAlertX
 //  Open Source Network Guard / WIFI & LAN intrusion detector 
 //
-//  parameters.php - Front module. Server side. Manage Parameters
 //------------------------------------------------------------------------------
 #  Puche 2022+ jokob             jokob@duck.com                GNU GPLv3
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
- 
+// External files
+require dirname(__FILE__).'/init.php';
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 //------------------------------------------------------------------------------
 //  Action selector
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index 64a6efd8..a7c44219 100755
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -11,6 +11,10 @@
   // External files
   require dirname(__FILE__).'/init.php';
 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
   //------------------------------------------------------------------------------
   //  Action selector
   //------------------------------------------------------------------------------
diff --git a/front/php/server/events.php b/front/php/server/events.php
index 8ce23a28..761b58db 100755
--- a/front/php/server/events.php
+++ b/front/php/server/events.php
@@ -8,9 +8,12 @@
 #  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
 //------------------------------------------------------------------------------
 //------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
+// External files
+require dirname(__FILE__).'/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 //------------------------------------------------------------------------------
 //  Action selector
@@ -72,7 +75,7 @@ function getEventsTotals() {
     $resultJSON = getCache("getEventsTotals".$days);
   } else
   {
-    // one query to get all numbers, whcih is quicker than multiple queries
+    // one query to get all numbers, which is quicker than multiple queries
     $sql = "select 
               (SELECT Count(*) FROM Events  WHERE eve_DateTime >=  date('now', '".$periodDateSQL."')) as all_events, 
               (SELECT Count(*) FROM Sessions as sessions WHERE (  ses_DateTimeConnection >= date('now', '".$periodDateSQL."') OR ses_DateTimeDisconnection >= date('now', '".$periodDateSQL."') OR ses_StillConnected = 1 ))  as sessions,
@@ -334,24 +337,40 @@ function getEventsCalendar() {
   $endDate    = '"'. $_REQUEST ['end'] .'"';
 
   // SQL 
-  $SQL = 'SELECT ses_MAC, ses_EventTypeConnection, ses_DateTimeConnection,
-                 ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_IP, ses_AdditionalInfo, ses_StillConnected,
-            
-                 CASE
-                   WHEN ses_EventTypeConnection = "<missing event>" THEN
-                        IFNULL ((SELECT MAX(ses_DateTimeDisconnection) FROM Sessions AS SES2 WHERE SES2.ses_MAC = SES1.ses_MAC AND SES2.ses_DateTimeDisconnection < SES1.ses_DateTimeDisconnection),  DATETIME(ses_DateTimeDisconnection, "-1 hour"))
-                   ELSE ses_DateTimeConnection
-                 END AS ses_DateTimeConnectionCorrected,
+  $SQL = 'SELECT SES1.ses_MAC, SES1.ses_EventTypeConnection, SES1.ses_DateTimeConnection,
+          SES1.ses_EventTypeDisconnection, SES1.ses_DateTimeDisconnection, SES1.ses_IP,
+          SES1.ses_AdditionalInfo, SES1.ses_StillConnected,
+          
+          CASE
+            WHEN SES1.ses_EventTypeConnection = "<missing event>" THEN
+              IFNULL (
+                (SELECT MAX(SES2.ses_DateTimeDisconnection) 
+                  FROM Sessions AS SES2 
+                  WHERE SES2.ses_MAC = SES1.ses_MAC 
+                    AND SES2.ses_DateTimeDisconnection < SES1.ses_DateTimeDisconnection
+                    AND SES2.ses_DateTimeDisconnection BETWEEN Date('. $startDate .') AND Date('. $endDate .')
+                ), 
+                DATETIME(SES1.ses_DateTimeDisconnection, "-1 hour")
+              )
+            ELSE SES1.ses_DateTimeConnection
+          END AS ses_DateTimeConnectionCorrected,
 
-                 CASE
-                   WHEN ses_EventTypeDisconnection = "<missing event>" THEN
-                        (SELECT MIN(ses_DateTimeConnection) FROM Sessions AS SES2 WHERE SES2.ses_MAC = SES1.ses_MAC AND SES2.ses_DateTimeConnection > SES1.ses_DateTimeConnection)
-                   ELSE ses_DateTimeDisconnection
-                 END AS ses_DateTimeDisconnectionCorrected
+          CASE
+            WHEN SES1.ses_EventTypeDisconnection = "<missing event>" THEN
+              (SELECT MIN(SES2.ses_DateTimeConnection) 
+                FROM Sessions AS SES2 
+                WHERE SES2.ses_MAC = SES1.ses_MAC 
+                  AND SES2.ses_DateTimeConnection > SES1.ses_DateTimeConnection
+                  AND SES2.ses_DateTimeConnection BETWEEN Date('. $startDate .') AND Date('. $endDate .')
+              )
+            ELSE SES1.ses_DateTimeDisconnection
+          END AS ses_DateTimeDisconnectionCorrected
+
+        FROM Sessions AS SES1 
+        WHERE (SES1.ses_DateTimeConnection BETWEEN Date('. $startDate .') AND Date('. $endDate .'))
+        OR (SES1.ses_DateTimeDisconnection BETWEEN Date('. $startDate .') AND Date('. $endDate .'))
+        OR SES1.ses_StillConnected = 1';
 
-          FROM Sessions AS SES1 
-          WHERE (     ses_DateTimeConnectionCorrected <= Date('. $endDate .')
-                 AND (ses_DateTimeDisconnectionCorrected >= Date('. $startDate .') OR ses_StillConnected = 1 )) ';
   $result = $db->query($SQL);
 
   // arrays of rows
diff --git a/front/php/server/internetinfo.php b/front/php/server/internetinfo.php
index 8db9a4e2..2a11be8f 100755
--- a/front/php/server/internetinfo.php
+++ b/front/php/server/internetinfo.php
@@ -15,6 +15,10 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Perform a test with the PING command
 $output = shell_exec("curl ipinfo.io");
 
diff --git a/front/php/server/nmap_scan.php b/front/php/server/nmap_scan.php
index b964c68a..3721117a 100755
--- a/front/php/server/nmap_scan.php
+++ b/front/php/server/nmap_scan.php
@@ -2,6 +2,10 @@
 
 require 'util.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $PIA_HOST_IP = $_REQUEST['scan'];
 $PIA_SCAN_MODE = $_REQUEST['mode'];
 
diff --git a/front/php/server/nslookup.php b/front/php/server/nslookup.php
index ead2990b..fad219be 100755
--- a/front/php/server/nslookup.php
+++ b/front/php/server/nslookup.php
@@ -15,6 +15,11 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Get IP
 $ip = $_GET['ip'];
 
diff --git a/front/php/server/parameters.php b/front/php/server/parameters.php
deleted file mode 100755
index 84384c41..00000000
--- a/front/php/server/parameters.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-//------------------------------------------------------------------------------
-//  NetAlertX
-//  Open Source Network Guard / WIFI & LAN intrusion detector 
-//
-//  parameters.php - Front module. Server side. Manage Parameters
-//------------------------------------------------------------------------------
-#  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-  // External files
-  require dirname(__FILE__).'/init.php';
- 
-
-//------------------------------------------------------------------------------
-//  Action selector
-//------------------------------------------------------------------------------
-  // Set maximum execution time to 15 seconds
-  ini_set ('max_execution_time','15');
-
-  $skipCache = FALSE;
-  $expireMinutes = 5;
-  $defaultValue = '';
-  
-
-  if (isset ($_REQUEST['skipcache'])) {
-    $skipCache = TRUE;    
-  }
-
-  if (isset ($_REQUEST['defaultValue'])) {
-    $defaultValue = $_REQUEST['defaultValue'];    
-  }
-
-  if (isset ($_REQUEST['expireMinutes'])) {
-    $expireMinutes = $_REQUEST['expireMinutes'];    
-  }
-
-  // Action functions
-  if (isset ($_REQUEST['action']) && !empty ($_REQUEST['action'])) {
-    $action = $_REQUEST['action'];
-    switch ($action) {
-      case 'get':  getParameter($skipCache, $defaultValue, $expireMinutes); break;
-      case 'set':  setParameter($expireMinutes);                          break;
-      default:     logServerConsole ('Action: '. $action);  break;
-    }
-  }
-
-
-//------------------------------------------------------------------------------
-//  Get Parameter Value
-//------------------------------------------------------------------------------
-function getParameter($skipCache, $defaultValue, $expireMinutes) {
-
-  $parameter = $_REQUEST['parameter'];
-  $value = "";
-
-  // get the value from the cache if available
-  $cachedValue = getCache($parameter);
-  if($cachedValue != "")
-  {
-    $value  = $cachedValue;
-  }
-
-  // query the database if no cache entry found or requesting live data (skipping cache)
-  if($skipCache || $value == "" )
-  {
-    global $db;
-    
-    $sql = 'SELECT par_Value FROM Parameters
-            WHERE par_ID="'. quotes($parameter) .'"';
-    
-    $result = $db->query($sql);
-    $row = $result -> fetchArray (SQLITE3_NUM);  
-
-    if($row != NULL && count($row) == 1)
-    {
-      $value = $row[0];
-    } else{
-      $value = $defaultValue;
-
-      // Nothing found in the DB, Insert new value
-      insertNew($parameter, $value);
-    }
-
-    // update cache  
-    setCache($parameter, $value, $expireMinutes);
-  }
-  // return value
-  echo (json_encode ($value));  
-}
-
-
-//------------------------------------------------------------------------------
-//  Set Parameter Value
-//------------------------------------------------------------------------------
-function setParameter($expireMinutes) {
-
-  $parameter = $_REQUEST['parameter'];
-  $value = $_REQUEST['value'];  
-    
-  global $db;
- 
-  // Update value
-  $sql = 'UPDATE Parameters SET par_Value="'. quotes ($value) .'"
-          WHERE par_ID="'. quotes($parameter) .'"';
-  $result = $db->query($sql);
-
-  if (! $result == TRUE) {
-    echo "Error updating parameter\n\n$sql \n\n". $db->lastErrorMsg();
-    return;
-  }
-
-  $changes = $db->changes();
-  if ($changes == 0) {
-    // Insert new value
-    insertNew($parameter, $value);
-  }
-
-  // update cache  
-  setCache($parameter, $value, $expireMinutes);
-
-  echo 'OK';
-}
-
-function insertNew($parameter, $value)
-{
-  global $db;
-
-  // Insert new value
-  $sql = 'INSERT INTO Parameters (par_ID, par_Value)
-          VALUES ("'. quotes($parameter) .'",
-                  "'. quotes($value)     .'")';
-  $result = $db->query($sql);
-
-  if (! $result == TRUE) {
-    echo "Error creating parameter\n\n$sql \n\n". $db->lastErrorMsg();
-    return;
-  }
-}
-
-
-?>
diff --git a/front/php/server/speedtestcli.php b/front/php/server/speedtestcli.php
index 3d19e253..5599ff52 100755
--- a/front/php/server/speedtestcli.php
+++ b/front/php/server/speedtestcli.php
@@ -1,5 +1,10 @@
 <?php
 require dirname(__FILE__).'/../server/init.php';
+
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 exec('../../../back/speedtest-cli --secure --simple', $output);
 
 echo '<h4>'. lang('Speedtest_Results') .'</h4>';
diff --git a/front/php/server/traceroute.php b/front/php/server/traceroute.php
index f81eb12b..1b790214 100755
--- a/front/php/server/traceroute.php
+++ b/front/php/server/traceroute.php
@@ -15,6 +15,10 @@
 // Get init.php 
 require dirname(__FILE__).'/../server/init.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // Get IP
 $ip = $_GET['ip'];
 
diff --git a/front/php/server/util.php b/front/php/server/util.php
index 8c4216b5..8f650050 100755
--- a/front/php/server/util.php
+++ b/front/php/server/util.php
@@ -11,6 +11,10 @@
 require dirname(__FILE__).'/../templates/timezone.php';
 require dirname(__FILE__).'/../templates/skinUI.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 $FUNCTION = [];
 $SETTINGS = [];
 $ACTION   = "";
@@ -484,7 +488,7 @@ function getDateFromPeriod () {
       $days = "3650"; //10 years
       break;
     default:
-    $days = "1";    
+      $days = "1";    
   }  
 
   $periodDateSQL = "-".$days." day"; 
diff --git a/front/php/server/utilDB.php b/front/php/server/utilDB.php
deleted file mode 100755
index 54f7018f..00000000
--- a/front/php/server/utilDB.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- utils needing a DB connection -->
-
-<?php
-
-require dirname(__FILE__).'/init.php';
-
-// Action functions
-if (isset ($_REQUEST['key']))
-{
-  echo lang($_REQUEST['key']);
-}
-
-?>
\ No newline at end of file
diff --git a/front/php/server/utilNotification.php b/front/php/server/utilNotification.php
index 5e61a860..b9fdc87b 100755
--- a/front/php/server/utilNotification.php
+++ b/front/php/server/utilNotification.php
@@ -1,8 +1,11 @@
 <?php
 
-
 require dirname(__FILE__).'/../templates/timezone.php';
 
+//------------------------------------------------------------------------------
+// check if authenticated
+require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 // ----------------------------------------------------------------------------------------
 // Check if the action parameter is set in the GET request
 if (isset($_GET['action'])) {
diff --git a/front/php/templates/auth.php b/front/php/templates/auth.php
index b9993c78..5d466f8d 100755
--- a/front/php/templates/auth.php
+++ b/front/php/templates/auth.php
@@ -1,5 +1,7 @@
 <?php
-session_start();
+if (session_status() == PHP_SESSION_NONE) {
+    session_start();
+}
 
 $isAuthenticated = false;
 
diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php
index 1bdcfa82..164cf748 100755
--- a/front/php/templates/footer.php
+++ b/front/php/templates/footer.php
@@ -12,6 +12,12 @@
 #---------------------------------------------------------------------------------#
 -->
 
+<?php 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
+
   <!-- Main Footer -->
   <footer class="main-footer">
     <!-- Default to the left -->
diff --git a/front/php/templates/graph.php b/front/php/templates/graph.php
index 55f5f1d4..3632ba62 100755
--- a/front/php/templates/graph.php
+++ b/front/php/templates/graph.php
@@ -1,5 +1,9 @@
 <?php
 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+
 global $db;
 
 $Pia_Graph_Device_Time = array();
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 839eb5f3..539a0bbe 100755
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -8,8 +8,10 @@
 #--------------------------------------------------------------------------- -->
 
 <?php
-require dirname(__FILE__).'/../server/init.php';
-require dirname(__FILE__).'/security.php';
+  require dirname(__FILE__).'/../server/init.php';
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 
 ?>
 
diff --git a/front/php/templates/language/lang.php b/front/php/templates/language/lang.php
index e2e3e3e0..b4c392cc 100755
--- a/front/php/templates/language/lang.php
+++ b/front/php/templates/language/lang.php
@@ -28,8 +28,6 @@ switch($result){
 
 if (isset($pia_lang_selected) == FALSE or (strlen($pia_lang_selected) == 0)) {$pia_lang_selected = $defaultLang;}
 
-require dirname(__FILE__).'/../skinUI.php';
-
 $result = $db->query("SELECT * FROM Plugins_Language_Strings");
 $strings = array();
 while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
diff --git a/front/php/templates/migrationCheck.php b/front/php/templates/migrationCheck.php
index d452c107..f041d4f3 100755
--- a/front/php/templates/migrationCheck.php
+++ b/front/php/templates/migrationCheck.php
@@ -1,4 +1,10 @@
-<?php require 'php/templates/notification.php'; ?>
+<?php 
+
+  require 'php/templates/notification.php'; 
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
 
 <script>
 
diff --git a/front/php/templates/security.php b/front/php/templates/security.php
index f45b22cd..9248918f 100755
--- a/front/php/templates/security.php
+++ b/front/php/templates/security.php
@@ -10,7 +10,10 @@ if (strpos($url,'index.php') !== false) {
     $isLogonPage = TRUE;
 } 
 
-session_start();
+// start session if not started yet
+if (session_status() == PHP_SESSION_NONE) {
+    session_start();
+}
 
 if(array_search('action', $_REQUEST) != FALSE)
 {
@@ -24,7 +27,7 @@ if(array_search('action', $_REQUEST) != FALSE)
 // ##################################################
 // ## Login Processing start
 // ##################################################
-$config_file = "../config/app.conf";
+$config_file = $_SERVER['DOCUMENT_ROOT'] . "/../config/app.conf";
 $config_file_lines = file($config_file);
 $CookieSaveLoginName = "NetAlertX_SaveLogin";
 
diff --git a/front/php/templates/skinUI.php b/front/php/templates/skinUI.php
old mode 100755
new mode 100644
index e238cae8..d9eb8865
--- a/front/php/templates/skinUI.php
+++ b/front/php/templates/skinUI.php
@@ -12,10 +12,7 @@ if( isset($_COOKIE['UI_dark_mode']))
     $ENABLED_DARKMODE = False;
 }
 
-foreach (glob("/app/db/setting_skin*") as $filename) {
-    $pia_skin_selected = str_replace('setting_','',basename($filename));
-}
-if (isset($pia_skin_selected) == FALSE or (strlen($pia_skin_selected) == 0)) {$pia_skin_selected = 'skin-blue';}
+$pia_skin_selected = 'skin-blue';
 
 // ###################################
 // ## GUI settings processing end
diff --git a/front/php/templates/version.php b/front/php/templates/version.php
index 946a507b..e58e7aab 100755
--- a/front/php/templates/version.php
+++ b/front/php/templates/version.php
@@ -12,6 +12,7 @@
 #---------------------------------------------------------------------------------#
 
 $filename = "/app/.VERSION";
+
 if(file_exists($filename)) {
     $fileContents = file_get_contents($filename);
     if(trim($fileContents) === 'Dev') {
@@ -22,5 +23,6 @@ if(file_exists($filename)) {
 }
 else {
     echo date('H:i:s') . " - N/A";
-}           
+}          
+ 
 ?>
diff --git a/front/presence.php b/front/presence.php
index 57582b52..cac5e4b2 100755
--- a/front/presence.php
+++ b/front/presence.php
@@ -239,7 +239,7 @@ function initializeCalendar () {
       center          : 'title',
       right           : 'timelineYear,timelineMonth,timelineWeek,timelineDay'
     },
-    defaultView       : 'timelineMonth',
+    defaultView       : 'timelineWeek',
     height            : 'auto',
     firstDay          : 1,
     allDaySlot        : false,
@@ -389,6 +389,33 @@ function getDevicesPresence (status) {
     default:           tableTitle = '<?= lang('Presence_Shortcut_Devices');?>';       color = 'gray';    break;
   } 
 
+  period = "7 days"
+
+  // Calculate startDate and endDate based on the period
+  let startDate = "";
+  let endDate = new Date().toISOString().slice(0, 10);  // Today's date in ISO format (YYYY-MM-DD)
+
+  // Calculate startDate based on period
+  switch (period) {
+    case "7 days":
+      startDate = new Date();
+      startDate.setDate(startDate.getDate() - 7);  // Subtract 7 days
+      startDate = startDate.toISOString().slice(0, 10);  // Convert to ISO format
+      break;
+    case "1 month":
+      startDate = new Date();
+      startDate.setMonth(startDate.getMonth() - 1);  // Subtract 1 month
+      startDate = startDate.toISOString().slice(0, 10);  // Convert to ISO format
+      break;
+    case "1 year":
+      startDate = new Date();
+      startDate.setFullYear(startDate.getFullYear() - 1);  // Subtract 1 year
+      startDate = startDate.toISOString().slice(0, 10);  // Convert to ISO format
+      break;
+    default:
+      console.error("Invalid period selected");
+  }
+
   // Set title and color
   $('#tableDevicesTitle')[0].className = 'box-title text-'+ color;
   $('#tableDevicesBox')[0].className = 'box box-'+ color;
@@ -399,7 +426,7 @@ function getDevicesPresence (status) {
   $('#calendar').fullCalendar ('refetchResources');
 
   $('#calendar').fullCalendar('removeEventSources');
-  $('#calendar').fullCalendar('addEventSource', { url: 'php/server/events.php?action=getEventsCalendar' });
+  $('#calendar').fullCalendar('addEventSource', { url: `php/server/events.php?period=${period}&start=${startDate}&end=${endDate}&action=getEventsCalendar` });
 };
 
 </script>