From 7508c9a38bfcb74b2f024a61d52bba1bc8de58c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Mon, 6 Dec 2021 18:26:16 +0100 Subject: [PATCH] =?UTF-8?q?drapeau=20trad=20mode=20connect=C3=A9=20+=20hom?= =?UTF-8?q?epage=20changement=20de=20langue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 6 +++++- core/module/translate/translate.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/core.php b/core/core.php index d8caaf57..2fcd9f95 100644 --- a/core/core.php +++ b/core/core.php @@ -2118,9 +2118,13 @@ class common { if ($this->getData(['config', 'i18n', $key]) === 'site' OR ( + // Le script de traduction est actif et la langue est traduite par script $this->getData(['config', 'i18n','scriptGoogle']) === true AND $this->getData(['config', 'i18n', $key]) === 'script' - AND $this->getUser('group') >= self::GROUP_MODERATOR + // Le drapeau n'est pas actif pour les non admin en mode connecté. + AND + ( $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + OR $this->getUser('group') === self::GROUP_ADMIN ) ) ) { if ( diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index 85288e1c..95a2ccf3 100644 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -199,7 +199,7 @@ class translate extends common { // Valeurs en sortie $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getData(['locale', $this->getUrl(2), 'homePageId' ]) + 'redirect' => helper::baseUrl() . $this->getData(['locale', $this->getUrl(2), 'homePageId' ]) ]); } } \ No newline at end of file