Fix session defaults

glpi-project · Dec 18, 2024 · 3d6150c · 3d6150c
1 parent 6975a17
commit 3d6150c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/Glpi/Console/Application.php b/src/Glpi/Console/Application.php
@@ -116,6 +116,9 @@ public function __construct(private Kernel $kernel)
         global $CFG_GLPI;
         $this->config = &$CFG_GLPI;
 
+        // Force the current "username"
+        $_SESSION['glpiname'] = 'cli';
+
         $this->computeAndLoadOutputLang();
 
        // Load core commands only to check if called command prevent or not usage of plugins

diff --git a/src/Glpi/Kernel/Listener/SessionStart.php b/src/Glpi/Kernel/Listener/SessionStart.php
@@ -96,15 +96,5 @@ public function onPostBoot(): void
 
             Session::start();
         }
-
-        if (isCommandLine()) {
-            // Default value for use mode
-            $_SESSION['glpi_use_mode'] = Session::NORMAL_MODE;
-            $_SESSION['glpiname'] = 'cli';
-        } else {
-            // Initialize some session data before everything else so all layers can use it, even if session isn't started
-            $_SESSION['glpi_use_mode'] = null;
-            $_SESSION['glpilanguage'] = Session::getPreferredLanguage();
-        }
     }
 }
diff --git a/src/Session.php b/src/Session.php
@@ -267,6 +267,11 @@ public static function start()
         if (!isset($_SESSION['glpi_use_mode'])) {
             $_SESSION['glpi_use_mode'] = Session::NORMAL_MODE;
         }
+
+        // Define default language
+        if (!isset($_SESSION['glpilanguage'])) {
+            $_SESSION['glpilanguage'] = Session::getPreferredLanguage();
+        }
     }