From 17d4e7f3bec3831e40c1bfd74e578ee1c2d13a53 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Wed, 12 Apr 2023 15:29:21 +0200 Subject: [PATCH] Session WIP --- core/class/router.class.php | 3 ++- core/core.php | 9 ++++++++- core/module/install/install.php | 4 ++-- core/module/translate/translate.php | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/core/class/router.class.php b/core/class/router.class.php index 738b7746..ad9ee8a0 100644 --- a/core/class/router.class.php +++ b/core/class/router.class.php @@ -521,7 +521,8 @@ class core extends common file_exists(self::DATA_DIR . $key . '/page.json')) { $pagesId = json_decode(file_get_contents(self::DATA_DIR . $key . '/page.json'), true); if (array_key_exists($this->getUrl(0), $pagesId['page'])) { - setcookie('ZWII_CONTENT', $key, time() + 3600, helper::baseUrl(false, false), '', true, helper::isHttps()); + //setcookie('ZWII_CONTENT', $key, time() + 3600, helper::baseUrl(false, false), '', true, helper::isHttps()); + $_SESSION['ZWII_CONTENT'] = $key; self::$i18nContent = $key; \setlocale(LC_ALL, self::$i18nContent . '.UTF8'); header('Refresh:0; url=' . helper::baseUrl() . $this->getUrl(0)); diff --git a/core/core.php b/core/core.php index 3e145338..a41d46e7 100644 --- a/core/core.php +++ b/core/core.php @@ -314,10 +314,17 @@ class common $this->input['_COOKIE'] = $_COOKIE; } + // Déterminer la langue du contenu du site + if (isset($_SESSION['ZWII_CONTENT'])) { + // Déterminé par le cookie + self::$i18nContent = $_SESSION['ZWII_CONTENT']; + \setlocale(LC_ALL, self::$i18nContent . '.UTF8'); + } + // Déterminer la langue du contenu du site if (isset($this->input['_COOKIE']['ZWII_CONTENT'])) { // Déterminé par le cookie - self::$i18nContent = $this->input['_COOKIE']['ZWII_CONTENT']; + //self::$i18nContent = $this->input['_COOKIE']['ZWII_CONTENT']; \setlocale(LC_ALL, self::$i18nContent . '.UTF8'); } diff --git a/core/module/install/install.php b/core/module/install/install.php index 536e25bf..62cac2d6 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -106,8 +106,8 @@ class install extends common // par défaut le contenu est la langue d'installation self::$i18nContent = self::$i18nUI; - setcookie('ZWII_CONTENT', self::$i18nContent, time() + 3600, helper::baseUrl(false, false), '', helper::isHttps(), true); - + //setcookie('ZWII_CONTENT', self::$i18nContent, time() + 3600, helper::baseUrl(false, false), '', helper::isHttps(), true); + $_SESSION['ZWII_CONTENT'] = self::$i18nContent; // Double vérification pour le mot de passe if ($this->getInput('installPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('installConfirmPassword', helper::FILTER_STRING_SHORT, true)) { diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index 7067d4e9..ac63f185 100644 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -625,7 +625,8 @@ class translate extends common // Nettoyer le cookie helper::deleteCookie('ZWII_CONTENT'); // Stocker le choix - setcookie('ZWII_CONTENT', $lang, time() + 3600, helper::baseUrl(false, false), '', true, helper::isHttps()); + //setcookie('ZWII_CONTENT', $lang, time() + 3600, helper::baseUrl(false, false), '', true, helper::isHttps()); + $_SESSION['ZWII_CONTENT'] = $lang; } // Valeurs en sortie