Don't store user language in session

So that we don't save it in every session on every page visit. Cookies are enough to remember selected language.
Wruczek · Jun 30, 2022 · 83d7d0b · 83d7d0b
1 parent 8c93d31
commit 83d7d0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/api/setlang.php b/src/api/setlang.php
@@ -19,7 +19,6 @@
 }
 
 setcookie("tswebsite_language", $lang->getLanguageCode(), time() + (60 * 60 * 24) * 60, "/"); // 60 days
-$_SESSION["userlanguageid"] = $lang->getLanguageId();
 
 $returnTo = "../";
 

diff --git a/src/private/php/Utils/Language/LanguageUtils.php b/src/private/php/Utils/Language/LanguageUtils.php
@@ -197,7 +197,7 @@ public function translate(string $identifier, $args = []): string {
         }
 
         $defaultlang = $this->getDefaultLanguage();
-        $lang = $this->getLanguageById(@$_SESSION["userlanguageid"]);
+        $lang = $this->getLanguageById(USER_LANGUAGE_ID);
 
         if(!$lang && !$defaultlang) {
             throw new \Exception("Cannot get user or default language");

diff --git a/src/private/php/Utils/TemplateUtils.php b/src/private/php/Utils/TemplateUtils.php
@@ -86,7 +86,7 @@ public function renderTemplateToString($templateName, $data = [], $loadLangs = t
 
         if($loadLangs) {
             $langUtils = LanguageUtils::i();
-            $userlang = $langUtils->getLanguageById($_SESSION["userlanguageid"]);
+            $userlang = $langUtils->getLanguageById(USER_LANGUAGE_ID);
 
             if ($userlang === null) {
                 $userlang = $langUtils->getDefaultLanguage();

diff --git a/src/private/php/load.php b/src/private/php/load.php
@@ -50,14 +50,14 @@
 
 // Try to guess user language and store it
 // If the current language is not defined, or is invalid then return to default
-if(!isset($_SESSION["userlanguageid"])) {
+{
     $lang = LanguageUtils::i()->detectUserLanguage();
 
     if(!$lang) {
         $lang = LanguageUtils::i()->getDefaultLanguage();
     }
 
-    $_SESSION["userlanguageid"] = $lang->getLanguageId();
+    define("USER_LANGUAGE_ID", $lang->getLanguageId());
 }
 
 // Shortcut to language functions