remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Session WIP

Browse Source
This commit is contained in:
Fred Tempez 2023-04-12 15:29:21 +02:00
parent 52f25fe231
commit 17d4e7f3be
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/class/router.class.php
View File

@ -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));

9
core/core.php
View File

@ -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');
}

4
core/module/install/install.php
View File

@ -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)) {

3
core/module/translate/translate.php
View File

@ -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