From c17ae1cef5c48b3bf35e4faea37a1f85e31f3c7d Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Wed, 31 May 2023 14:11:50 +0200
Subject: [PATCH] fix explicit manager bug

bug would adjust the script even if the check for an own cookieManager is not set
---
 Application/views/blocks/_gtm_nojs.tpl |  2 +-
 Modules/Core/ViewConfig.php            | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Application/views/blocks/_gtm_nojs.tpl b/Application/views/blocks/_gtm_nojs.tpl
index 05c78fb..98a47ad 100644
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@@ -1,4 +1,4 @@
-[{if $oViewConf->D3blShowGtmScript() && !$oViewConf->getCookieManagerType()}]
+[{if $oViewConf->D3blShowGtmScript()}]
     [{if $oViewConf->getGtmContainerId()}][{strip}]
     <!-- Google Tag Manager (noscript) -->
     <noscript>
diff --git a/Modules/Core/ViewConfig.php b/Modules/Core/ViewConfig.php
index 66c49ee..2ea8f49 100644
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@@ -27,7 +27,6 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->sContainerId === null)
         {
-
             $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
         }
         return $this->sContainerId;
@@ -77,6 +76,14 @@ class ViewConfig extends ViewConfig_parent
         return $this->sCookieManagerType;
     }
 
+    /**
+     * @return bool
+     */
+    public function shallUseOwnCookieManager()
+    {
+        return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager');
+    }
+
     /**
      * @return bool
      */
@@ -86,7 +93,7 @@ class ViewConfig extends ViewConfig_parent
         $oConfig = Registry::getConfig();
 
         // No Cookie Manager in use
-        if (!$oConfig->getConfigParam('d3_gtm_settings_hasOwnCookieManager')) {
+        if (false === $this->shallUseOwnCookieManager()) {
             return true;
         }
 
@@ -113,7 +120,6 @@ class ViewConfig extends ViewConfig_parent
             return true;
         }
 
-        // Cookie Manager not (yet) supported
         return false;
     }
 
@@ -126,6 +132,10 @@ class ViewConfig extends ViewConfig_parent
     {
         $oConfig = Registry::getConfig();
 
+        if (false === $this->shallUseOwnCookieManager()){
+            return "";
+        }
+
         if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getExplicitManager() === 'USERCENTRICS') {
             $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');