Merge pull request #48 from RRZE-Webteam/dev

Dev
RRZE-Webteam · Jul 14, 2022 · a683d3e · a683d3e
2 parents 5d858b8 + 396a227
commit a683d3e
Show file tree

Hide file tree

Showing 11 changed files with 279 additions and 258 deletions.
diff --git a/build/banner.js b/build/banner.js
diff --git a/build/banner.js.map b/build/banner.js.map
diff --git a/includes/Consent/JavaScript.php b/includes/Consent/JavaScript.php
@@ -78,6 +78,15 @@ public function registerFooter()
             true
         );
 
+        $defaultHideBannerOnPages = [
+            tos()->endpointUrl('imprint'),
+            tos()->endpointUrl('accessibility'),
+            tos()->endpointUrl('privacy'),
+        ];
+        $hideBannerOnUrls = consent()->getOption('banner', 'hide_on_url');
+        $hideBannerOnUrls = explode(PHP_EOL, $hideBannerOnUrls);
+        $hideBannerOnUrls = array_merge($hideBannerOnUrls, $defaultHideBannerOnPages);
+
         $jsConfig = [
             'ajaxURL' => admin_url('admin-ajax.php'),
             'animation' => false, //bannerAnimation
@@ -97,11 +106,7 @@ public function registerFooter()
             'cookieBeforeConsent' => false,
             'cookiesForBots' => consent()->isCookieForBotsActive(),
             'cookieVersion' => $this->cookieVersion,
-            'hideBannerOnPages' => [
-                tos()->endpointUrl('imprint'),
-                tos()->endpointUrl('accessibility'),
-                tos()->endpointUrl('privacy'),
-            ],
+            'hideBannerOnUrls' => $hideBannerOnUrls,
             'respectDoNotTrack' => consent()->isRespectDoNotTrackActive(),
             'hasOnlyEssentialCookies' => consent()->hasOnlyEssentialCookies(),
             'reloadAfterConsent' => false,

diff --git a/languages/rrze-legal-de_DE.mo b/languages/rrze-legal-de_DE.mo