Pulling 'session_start_options' app settings and injecting it into al…

…l calls to session_start()
rotexsoft · May 23, 2024 · 71a7c28 · 71a7c28
1 parent 1b2f691
commit 71a7c28
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
@@ -270,7 +270,14 @@ public function updateSelectedLanguage() : void {
              */
             $this->vespula_locale->setCode($query_params[self::GET_QUERY_PARAM_SELECTED_LANG]);
 
-            if (session_status() !== \PHP_SESSION_ACTIVE) { session_start($this->getAppSetting('session_start_options') ?? []); }
+            if (session_status() !== \PHP_SESSION_ACTIVE) {
+
+                $session_start_settings = 
+                    $this->getAppSetting('session_start_options') !== null
+                        ? (array)$this->getAppSetting('session_start_options')
+                        : [];
+                session_start($session_start_settings);
+            }
 
             // also store in session
             /**
@@ -739,7 +746,14 @@ protected function doLogin(\Vespula\Auth\Auth $auth, array $credentials, string
                 }
 
                 //since we are successfully logged in, resume session if any
-                if (session_status() !== \PHP_SESSION_ACTIVE) { session_start($this->getAppSetting('session_start_options') ?? []); }
+                if (session_status() !== \PHP_SESSION_ACTIVE) { 
+
+                    $session_start_settings = 
+                        $this->getAppSetting('session_start_options') !== null
+                            ? (array)$this->getAppSetting('session_start_options')
+                            : [];
+                    session_start($session_start_settings);
+                }
 
             } else {
                 /**
@@ -1019,7 +1033,11 @@ public function storeCurrentUrlForLoginRedirection(): self {
         //start a new session if none exists
         if(session_status() !== \PHP_SESSION_ACTIVE) {
 
-            session_start($this->getAppSetting('session_start_options') ?? []);
+            $session_start_settings = 
+                $this->getAppSetting('session_start_options') !== null
+                    ? (array)$this->getAppSetting('session_start_options')
+                    : [];
+            session_start($session_start_settings);
         }
 
         //store current url in session