From c004fec8c98af89e86600cdcf1088d5969c0b8f2 Mon Sep 17 00:00:00 2001
From: SylvainLelievre <lelievre.sylvain@gmail.com>
Date: Mon, 22 Nov 2021 13:59:23 +0100
Subject: [PATCH] Nom des cookies unique

---
 core/core.js.php | 24 +++++++++++-------------
 core/core.php    |  6 ++----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/core/core.js.php b/core/core.js.php
index abe89d1f..1e6ee3a8 100644
--- a/core/core.js.php
+++ b/core/core.js.php
@@ -221,27 +221,25 @@ core.start = function() {
 
   /**
 	 * Traitement du formulaire cookies
-	 */
-   $("#cookieForm").submit(function(event){
-        const ga = document.getElementById('googleAnalytics');
+	*/
+	$("#cookieForm").submit(function(event){
+       const ga = document.getElementById('googleAnalytics');
  	   var samesite = "samesite=lax";
  	   var expires = new Date();
-        expires.setFullYear(expires.getFullYear() + 1);
-        expires = "expires=" + expires.toUTCString();
-        // Crée le cookie d'acceptation Google Analytics si nécessaire
+       expires.setFullYear(expires.getFullYear() + 1);
+       expires = "expires=" + expires.toUTCString();
+       // Crée le cookie d'acceptation Google Analytics si nécessaire
  	   <?php $analytics = $this->getData(['config', 'seo', 'analyticsId']);?>
  	   <?php if( $analytics !== null AND $analytics !=='' ){
- 	   $cookieName = 'ZWII_COOKIE_GA_CONSENT'.str_replace('_index.php','',str_replace( '/','_',$_SERVER['PHP_SELF']));?>
+ 	   $path = str_replace('index.php','',str_replace( '/','',$_SERVER['PHP_SELF']));?>
  		   if(ga.checked){
- 			document.cookie = "<?php echo $cookieName; ?>=true;" + expires +";"+ samesite;
+ 			document.cookie = "ZWII_COOKIE_GA_CONSENT=true_<?php echo $path;?>;" + expires +";"+ samesite;
  		   }
  		   else{
- 			document.cookie = "<?php echo $cookieName; ?>=false;" + expires +";"+ samesite;
+ 			document.cookie = "ZWII_COOKIE_GA_CONSENT=false_<?php echo $path;?>;" + expires +";"+ samesite;
  		   }
- 	   <?php }
- 		$cookieName = 'ZWII_COOKIE_CONSENT'.str_replace('_index.php','',str_replace( '/','_',$_SERVER['PHP_SELF']));
- 	   ?>
-        document.cookie = "<?php echo $cookieName; ?>=true;" + expires +";"+ samesite;
+ 	   <?php } ?>
+        document.cookie = "ZWII_COOKIE_CONSENT=true_<?php echo str_replace('index.php','',str_replace( '/','',$_SERVER['PHP_SELF'])); ?>;" + expires +";"+ samesite;
      });
  	$("#cookieConsent .cookieClose").on("click", function() {
  		$(this).parents("#cookieConsent").fadeOut();
diff --git a/core/core.php b/core/core.php
index ad04608a..650a8a81 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1172,9 +1172,8 @@ class common {
 	 * Affiche le script Google Analytics
 	 */
 	 public function showAnalytics() {
- 		$cookieName = 'ZWII_COOKIE_GA_CONSENT'.str_replace('_index.php','',str_replace( '/','_',$_SERVER['PHP_SELF']));
  		if( !empty($code = $this->getData(['config', 'seo', 'analyticsId'])) &&
- 		    $this->getInput($cookieName) === 'true')  {
+ 		    $this->getInput('ZWII_COOKIE_GA_CONSENT') === 'true_'.str_replace('index.php','',str_replace( '/','',$_SERVER['PHP_SELF'])))  {
  			echo '<!-- Global site tag (gtag.js) - Google Analytics -->
  				<script async src="https://www.googletagmanager.com/gtag/js?id='. $code .'"></script>
  				<script>
@@ -1190,8 +1189,7 @@ class common {
 	 * Affiche le consentement aux cookies
 	 */
 	 public function showCookies() {
- 		$cookieName = 'ZWII_COOKIE_CONSENT'.str_replace('_index.php','',str_replace( '/','_',$_SERVER['PHP_SELF']));
- 		if($this->getInput($cookieName) !== 'true' AND $this->getData(['config','cookieConsent']) === true){ ?>
+ 		if($this->getInput('ZWII_COOKIE_CONSENT') !== 'true_'.str_replace('index.php','',str_replace( '/','',$_SERVER['PHP_SELF'])) AND $this->getData(['config','cookieConsent']) === true){ ?>
  			<div id="cookieConsent">
  				<div class="cookieClose">X</div>
 				<h3><?php echo $this->getData(['config', 'cookies', 'cookiesTitleText']); ?></h3>