From 88f50b825ca98e7f4d1e67fd71291a93c3cd6f9b Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 26 Nov 2020 10:56:03 +0100
Subject: [PATCH] trad auto ok

---
 core/core.php                       | 45 ++++++++++++++---------------
 core/module/translate/translate.php |  4 +--
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/core/core.php b/core/core.php
index 239e80e3..cd4ff1d4 100755
--- a/core/core.php
+++ b/core/core.php
@@ -2184,20 +2184,23 @@ class core extends common {
 		}
 
 		// Chargement de la bibliothèque googtrans
-		// Le multi langue est sélectionné et la traduction n'est pas manuelle
-		if ($this->getData(['config','translate','scriptGoogle']) === true 
-			) {
-				// Cas  des pages d'administration
-				/*
-				AND  $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
-					OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-					    AND $this->getData(['config','translate','admin']) === true )
-				)	{
-					*/
+		// Le multi langue est sélectionné 
+		if (  	$this->getData(['config','translate','scriptGoogle']) === true
+			AND
+				// et la traduction n'est pas manuelle
+				(   isset($_COOKIE['googtrans'])
+					AND $this->getData(['config','translate', substr($_COOKIE['googtrans'],4,2)]) === 'script'
+				)
+			// Cas  des pages d'administration
+			AND  $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
+				OR ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
+					AND $this->getData(['config','translate','admin']) === true 
+				)
+			)	{
 					$this->addOutput([
 						'vendor' => array_merge($this->output['vendor'], ['i18n'])
 					]);
-			
+
 		}
 		// Erreurs
 		if($access === 'login') {
@@ -2340,17 +2343,13 @@ class layout extends common {
 		 * La traduction est active et le site n'est pas en français.
 		 * La fonction est activée.
 		 */
-		if ( (
-				( $this->getData(['config','translate','scriptGoogle']) === true
-				  AND isset($_COOKIES['googtrans'])
-				  AND substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) !== 'fr'
-		        )
-			   OR ( isset($_COOKIES['ZWII_I18N_SITE'])
-				   AND array_key_exists($_COOKIES['ZWII_I18N_SITE'],$this->i18nList
-				   AND $_COOKIES['ZWII_I18N_SITE'] !== 'fr' )
-				)
-			 )
+		if ( $this->getData(['config','translate','scriptGoogle']) === true
 			 AND $this->getData(['config','translate','showCredits']) === true
+			 AND
+				// et la traduction n'est pas manuelle
+				(   isset($_COOKIE['googtrans'])
+					AND $this->getData(['config','translate', substr($_COOKIE['googtrans'],4,2)]) === 'script'
+				)
            )
 		{
 		   echo '<div id="googTransLogo"><a href="//policies.google.com/terms#toc-content" data-lity><img src="core/module/translate/ressource/googtrans.png" /></a></div>';
@@ -3042,9 +3041,9 @@ class layout extends common {
 	public function showi18n() {
 		echo '<div id="i18nContainer"><ul>';
 		foreach (self::$i18nList as $key => $value) {
-			if ($this->getData(['config','translate',$key]) === 'site' 
+			if ($this->getData(['config','translate',$key]) === 'site'
 				OR (
-					$this->getData(['config','translate','scriptGoogle']) === true 
+					$this->getData(['config','translate','scriptGoogle']) === true
 					AND $this->getData(['config','translate',$key]) === 'script'
 				)
 			) {
diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php
index 58728c73..42172433 100755
--- a/core/module/translate/translate.php
+++ b/core/module/translate/translate.php
@@ -102,9 +102,9 @@ class translate extends common {
 		if ($this->getUrl(3) === 'script') {
 			setrawcookie("googtrans", '/fr/'. $this->getUrl(2), time() + 3600, helper::baseUrl());
 			helper::deleteCookie('ZWII_I18N_SITE');
-		} else {
+		} elseif ($this->getUrl(3) === 'site') {
 			setcookie('ZWII_I18N_SITE', $this->getUrl(2), time() + 3600, helper::baseUrl(false, false)  , '', helper::isHttps(), true);
-			helper::deleteCookie ('googtrans');
+			setrawcookie("googtrans", '/fr/fr', time() + 3600, helper::baseUrl());
 		}
 		// Valeurs en sortie
 		$this->addOutput([