From 6fcb9f8b84f3433939de88d70a9afb23d067836d Mon Sep 17 00:00:00 2001 From: MaxBuhe01 Date: Sat, 21 Sep 2024 16:20:48 +0200 Subject: [PATCH] [Changed] add "internal_names" to constant --- Application/Model/ManagerTypes.php | 24 ++++++++++++++---------- Modules/Core/ViewConfig.php | 10 +++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Application/Model/ManagerTypes.php b/Application/Model/ManagerTypes.php index 899dea9..ab7ada8 100644 --- a/Application/Model/ManagerTypes.php +++ b/Application/Model/ManagerTypes.php @@ -7,20 +7,25 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics; class ManagerTypes { const EXTERNAL_SERVICE = "eigener Service"; + const INTERNAL_EXTERNAL_SERVICE = "externalService"; const NET_COOKIE_MANAGER = "Netensio Cookie Manager"; + const INTERNAL_NET_COOKIE_MANAGER = "net_cookie_manager"; /** * Further information's: * https://github.com/aggrosoft/oxid-cookie-compliance */ const AGCOOKIECOMPLIANCE = "Aggrosoft Cookie Compliance"; + const INTERNAL_AGCOOKIECOMPLIANCE = "agcookiecompliance"; const CONSENTMANAGER = "Consentmanager"; const INTERNAL_CONSENTMANAGER = "cmconsentmanager"; const COOKIEFIRST = "Cookiefirst"; + const INTERNAL_COOKIEFIRST = "cookiefirst"; const COOKIEBOT = "Cookiebot"; + const INTERNAL_COOKIEBOT = "cookiebot"; /** * @return array @@ -28,14 +33,14 @@ class ManagerTypes public function getManagerList(): array { return [ - "externalService" => self::EXTERNAL_SERVICE, - "agcookiecompliance" => self::AGCOOKIECOMPLIANCE, - "net_cookie_manager" => self::NET_COOKIE_MANAGER, + self::INTERNAL_EXTERNAL_SERVICE => self::EXTERNAL_SERVICE, + self::INTERNAL_AGCOOKIECOMPLIANCE => self::AGCOOKIECOMPLIANCE, + self::INTERNAL_NET_COOKIE_MANAGER => self::NET_COOKIE_MANAGER, Usercentrics::sModuleIncludationInternalName => Usercentrics::sModuleIncludationPublicName, Usercentrics::sExternalIncludationInternalName => Usercentrics::sExternalIncludationPublicName, - "cmconsentmanager" => self::CONSENTMANAGER, - "cookiefirst" => self::COOKIEFIRST, - "cookiebot" => self::COOKIEBOT, + self::INTERNAL_CONSENTMANAGER => self::CONSENTMANAGER, + self::INTERNAL_COOKIEFIRST => self::COOKIEFIRST, + self::INTERNAL_COOKIEBOT => self::COOKIEBOT, ]; } @@ -58,11 +63,10 @@ class ManagerTypes return [ Usercentrics::sModuleIncludationInternalName, Usercentrics::sExternalIncludationInternalName, - ManagerTypes::CONSENTMANAGER, ManagerTypes::INTERNAL_CONSENTMANAGER, - ManagerTypes::COOKIEFIRST, - ManagerTypes::COOKIEBOT, - ManagerTypes::EXTERNAL_SERVICE + ManagerTypes::INTERNAL_COOKIEFIRST, + ManagerTypes::INTERNAL_COOKIEBOT, + ManagerTypes::INTERNAL_EXTERNAL_SERVICE ]; } } \ No newline at end of file diff --git a/Modules/Core/ViewConfig.php b/Modules/Core/ViewConfig.php index b4cf47a..e2fc6a6 100644 --- a/Modules/Core/ViewConfig.php +++ b/Modules/Core/ViewConfig.php @@ -88,7 +88,7 @@ class ViewConfig extends ViewConfig_parent $sCookieID = trim($this->d3GetModuleConfigParam('_sControlParameter')); // Netensio Cookie Manager - if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) { + if ($this->sCookieManagerType === ManagerTypes::INTERNAL_NET_COOKIE_MANAGER) { $oSession = Registry::getSession(); $aCookies = $oSession->getVariable("aCookieSel"); @@ -96,7 +96,7 @@ class ViewConfig extends ViewConfig_parent } // Aggrosoft Cookie Consent - if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) { + if ($this->sCookieManagerType === ManagerTypes::INTERNAL_AGCOOKIECOMPLIANCE) { if (method_exists($this, "isCookieCategoryEnabled")) { return $this->isCookieCategoryEnabled($sCookieID); } @@ -139,16 +139,16 @@ class ViewConfig extends ViewConfig_parent return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""'; } - if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER) + if ($this->sCookieManagerType === ManagerTypes::INTERNAL_CONSENTMANAGER) { return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"'; } - if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){ + if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEFIRST){ return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"'; } - if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){ + if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEBOT){ return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"'; }