From 2ff4051509f70bdbbe42960bcb65bd7ab4994f78 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 9 Sep 2019 20:23:33 +0200 Subject: [PATCH] wait #2745 --- composer.json | 3 +-- src/app/Magic/Models/Settings.php | 18 ++++++++++++++++++ src/app/Middleware/EmailObfuscate.php | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0cdddf4..3c49936 100644 --- a/composer.json +++ b/composer.json @@ -43,8 +43,7 @@ "league/commonmark-ext-autolink": "^1.0", "cviebrock/laravel-elasticsearch": "^3.6", "spatie/laravel-honeypot": "^1.3", - "chrisjean/php-ico": "^1.0", - "spatie/laravel-cookie-consent": "^2.9" + "chrisjean/php-ico": "^1.0" }, "require-dev": { diff --git a/src/app/Magic/Models/Settings.php b/src/app/Magic/Models/Settings.php index 78a6b13..6981e67 100644 --- a/src/app/Magic/Models/Settings.php +++ b/src/app/Magic/Models/Settings.php @@ -47,6 +47,7 @@ class Settings extends CubistMagicModel $this->_seo(); $this->_pwa(); $this->_favicon(); + $this->_privacy(); } protected function _favicon() @@ -120,6 +121,23 @@ class Settings extends CubistMagicModel ]); } + public function _privacy() + { + $tab = 'Vie privée'; + + $this->addField(['name' => 'cookies_consent_text', + 'label' => 'Barre de consentement des cookies', + 'type' => 'Markdown', + 'hint' => 'Par exemple : « En poursuivant votre navigation sur ce site, vous acceptez l’utilisation de traceurs pour vous proposer réaliser des statistiques de visites. »', + 'tab' => $tab]); + + $this->addField(['name' => 'cookies_consent_button', + 'label' => 'Intitulé du bouton de consentement', + 'type' => 'Text', + 'hint' => 'Par exemple : « J\'ai compris »', + 'tab' => $tab]); + } + public static function getSettingsClass() { $class = self::class; diff --git a/src/app/Middleware/EmailObfuscate.php b/src/app/Middleware/EmailObfuscate.php index fa74db5..81e4e21 100644 --- a/src/app/Middleware/EmailObfuscate.php +++ b/src/app/Middleware/EmailObfuscate.php @@ -15,6 +15,10 @@ class EmailObfuscate $response = $next($request); + if (strpos($request->getPathInfo(), '/admin/') === 0) { + return $response; + } + // Apply logic differently based on the nature of $response. if ($response instanceof Renderable) { $response = $this->obfuscate($response->render()); -- 2.39.5