From 67ba6b38c7c80c811a17ff575301c5d779053ccf Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Mon, 14 Apr 2025 10:06:13 +0300
Subject: [PATCH] Session expiration bug fix

---
 app/includes/session_middleware.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/includes/session_middleware.php b/app/includes/session_middleware.php
index 52ba92a..4779559 100644
--- a/app/includes/session_middleware.php
+++ b/app/includes/session_middleware.php
@@ -15,12 +15,14 @@ function applySessionMiddleware($config, $app_root, $isTest = false) {
 
     // Check session validity
     if (!Session::isValidSession()) {
+        // Only show session timeout message if there was an active session
+        if (isset($_SESSION['LAST_ACTIVITY'])) {
+            Feedback::flash('LOGIN', 'SESSION_TIMEOUT');
+        }
+
         // Session invalid, clean up and redirect
         Session::cleanup($config);
 
-        // Flash session timeout message
-        Feedback::flash('LOGIN', 'SESSION_TIMEOUT');
-
         if (!$isTest) {
             header('Location: ' . $app_root . '?page=login');
             exit();