wait #2745

diff --git a/composer.json b/composer.json
index 0cdddf433ff64afe29aca5fe473ebbab5b3c932f..3c49936523bbc0fbde34224b9c0576e2baece0ed 100644 (file)
--- 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 78a6b13f613bbe1010a40eaa5d9200a645c8ff6d..6981e67ab6b0898982d85a34d0ff52c58e358630 100644 (file)
--- 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 fa74db5ee8cf0b39fe81eb087384226c63edecc7..81e4e214cd380a344a713883fe77a4e55234d839 100644 (file)
--- 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());