Merge pull request #2491 from Leantime/defaultThemeFixes

Default theme fixes
Leantime · Apr 29, 2024 · 8cae169 · 8cae169
2 parents b9228b0 + 097a2e7
commit 8cae169
Show file tree

Hide file tree

Showing 14 changed files with 161 additions and 138 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/app/Core/Language.php b/app/Core/Language.php
@@ -99,7 +99,7 @@ public function __construct(
 
         //Start checking if the user has a language set
         if (!$this->setLanguage($language)) {
-            $this->setLanguage($this->config->language);
+            $this->setLanguage("en-US");
         }
     }
 

diff --git a/app/Core/Session.php b/app/Core/Session.php
@@ -85,7 +85,7 @@ public function __construct(
 
             //test remote host info
             $session_string = ! $this->request instanceof CliRequest
-                ? self::get_client_ip() . $_SERVER['HTTP_HOST']
+                ? self::get_client_ip() . $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME']
                 : 'cli';
 
             $testSessionHost = hash('sha1', $session_string . $this->sessionpassword);
@@ -136,7 +136,7 @@ public static function getSID(): string
     private function makeSID(): void
     {
         $session_string = ! $this->request instanceof CliRequest
-            ? self::get_client_ip() . $_SERVER['HTTP_HOST']
+            ? self::get_client_ip() . $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME']
             : 'cli';
 
         $tmp = hash('sha1', mt_rand(32, 32) . $session_string . time());