Merge remote-tracking branch 'remotes/origin/rel_1.x'

# Conflicts:
#	Application/views/admin/de/module_options.php
#	Application/views/ga4/view_item_list.tpl
#	CHANGELOG.md
#	Modules/Core/ViewConfig.php
#	metadata.php

Modules/Core/ViewConfig.php

@@ -37,9 +37,21 @@ class ViewConfig extends ViewConfig_parent
         return $this->sContainerId;
     }
 
-    public function getModuleConsentmanagerSettingSelectValue() :bool
+    /**
+     * @return mixed
+     */
+    public function getModuleSettingExplicitManagerSelectValue()
     {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_CONSENTMANAGER') === 'YES';
+        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER');
+    }
+
+    /**
+     * @return false|mixed
+     */
+    public function getExplicitManager()
+    {
+        $sManagerName = $this->getModuleSettingExplicitManagerSelectValue();
+        return $sManagerName === "NONE" ? false : $sManagerName;
     }
 
     public function getCookieManagerType()
@@ -62,13 +74,21 @@ class ViewConfig extends ViewConfig_parent
             }
         }
 
-        if ($this->sCookieManagerType === false and $this->getModuleConsentmanagerSettingSelectValue()){
-            return "consentmanager";
+        if ($this->sCookieManagerType === false and $this->getExplicitManager()){
+            return "externalService";
         }
 
         return $this->sCookieManagerType;
     }
 
+    /**
+     * @return bool
+     */
+    public function shallUseOwnCookieManager()
+    {
+        return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager');
+    }
+
     /**
      * @return bool
      */
@@ -78,7 +98,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;
         }
 
@@ -99,13 +119,12 @@ class ViewConfig extends ViewConfig_parent
             }
         }
 
-        // UserCentrics
-        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'consentmanager') {
+        // UserCentrics or consentmanager
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'externalService') {
             // Always needs the script-tags delivered to the DOM.
             return true;
         }
 
-        // Cookie Manager not (yet) supported
         return false;
     }
 
@@ -118,15 +137,18 @@ class ViewConfig extends ViewConfig_parent
     {
         $oConfig = Registry::getConfig();
 
-        if ($this->getCookieManagerType() == "oxps_usercentrics") {
+        if (false === $this->shallUseOwnCookieManager()){
+            return "";
+        }
+
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getExplicitManager() === 'USERCENTRICS') {
             $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
             if ($sCookieId) {
-                return 'type="text/plain" data-usercentrics="' . $sCookieId . '"';
+                return 'data-usercentrics="' . $sCookieId . '" type="text/plain" async=""';
             }
         }
-
-        if ($this->getCookieManagerType() == "consentmanager") {
+        if ($this->getCookieManagerType() === "externalService" and $this->getExplicitManager() === 'CONSENTMANAGER') {
             $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
             if ($sCookieId) {