w3designweb / laravel-cookie-consent

config/config.php

Indentation +11 added lines, -11 removed lines

@@ -4,31 +4,31 @@
 $COOKIE_LIFETIME_UM = 'months';
 
 return [
-	/*
+    /*
 	 * Use this setting to enable the cookie consent dialog.
 	 */
-	'enabled' => env('COOKIE_CONSENT_ENABLED', true),
+    'enabled' => env('COOKIE_CONSENT_ENABLED', true),
 
-	/*
+    /*
 	 * The name of the cookie in which we store if the user
 	 * has agreed to accept the conditions.
 	 */
-	'cookie_name' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent'),
+    'cookie_name' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent'),
 
-	/*
+    /*
 	 * Set the cookie duration in days.
 	 */
-	'cookie_lifetime' => $COOKIE_LIFETIME, // Six months
+    'cookie_lifetime' => $COOKIE_LIFETIME, // Six months
 
     /*
      * 4 types of cookie
      */
-	'cookie_types' => [
-		'necessary' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_necessary',
-		'statistics' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_statistics',
+    'cookie_types' => [
+        'necessary' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_necessary',
+        'statistics' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_statistics',
         'marketing' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_marketing',
-		'functional' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_functional',
-	],
+        'functional' => env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_functional',
+    ],
 
     /*
      * All cookies by type

Spacing +12 added lines, -12 removed lines

@@ -42,7 +42,7 @@ 
                     'um' => 'minutes'
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             'laravel_session' => [
                 'duration' => [
@@ -50,7 +50,7 @@ 
                     'um' => 'minutes'
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             // Laravel Cookie Consent
             env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent') => [
@@ -59,7 +59,7 @@ 
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_statistics' => [
                 'duration' => [
@@ -67,7 +67,7 @@ 
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_marketing' => [
                 'duration' => [
@@ -75,7 +75,7 @@ 
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             env('COOKIE_CONSENT_NAME', 'laravel_cookie_consent').'_functions' => [
                 'duration' => [
@@ -83,7 +83,7 @@ 
                     'um' => $COOKIE_LIFETIME_UM
                 ],
                 'provider' => env('APP_NAME'),
-                'domain' => str_replace(['http://', 'https://'], '', env('APP_URL')),
+                'domain' => str_replace([ 'http://', 'https://' ], '', env('APP_URL')),
             ],
             // Google reCAPTCHA
             '_GRECAPTCHA' => [
@@ -103,7 +103,7 @@ 
                     'um' => 'years'
                 ],
                 'provider' => 'Google Analytics',
-                'domain' => str_replace(['http://', 'https://'], '', str_replace('www', '', env('APP_URL'))),
+                'domain' => str_replace([ 'http://', 'https://' ], '', str_replace('www', '', env('APP_URL'))),
             ],
             '_gid' => [
                 'duration' => [
@@ -111,7 +111,7 @@ 
                     'um' => 'day'
                 ],
                 'provider' => 'Google Analytics',
-                'domain' => str_replace(['http://', 'https://'], '', str_replace('www', '', env('APP_URL'))),
+                'domain' => str_replace([ 'http://', 'https://' ], '', str_replace('www', '', env('APP_URL'))),
             ],
             '_ga_*' => [
                 'duration' => [
@@ -119,7 +119,7 @@ 
                     'um' => 'years'
                 ],
                 'provider' => 'Google Analytics',
-                'domain' => str_replace(['http://', 'https://'], '', str_replace('www', '', env('APP_URL'))),
+                'domain' => str_replace([ 'http://', 'https://' ], '', str_replace('www', '', env('APP_URL'))),
             ],
             '_gat_*' => [
                 'duration' => [
@@ -127,10 +127,10 @@ 
                     'um' => 'minute'
                 ],
                 'provider' => 'Google Analytics',
-                'domain' => str_replace(['http://', 'https://'], '', str_replace('www', '', env('APP_URL'))),
+                'domain' => str_replace([ 'http://', 'https://' ], '', str_replace('www', '', env('APP_URL'))),
             ],
         ],
-        'marketing' => [],
-        'functional' => [],
+        'marketing' => [ ],
+        'functional' => [ ],
     ]
 ];

resources/views/_banner.blade.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
         data-session-secure="{{ config('session.secure') }}"
         data-button-label-accept-selected="{{ trans('laravel-cookie-consent::translations.button_accept_selected') }}"
         data-button-label-accept-all="{{ trans('laravel-cookie-consent::translations.button_accept') }}"
-        data-cookie-types='<?php echo json_encode($config['cookie_types']) ?>'
+        data-cookie-types='<?php echo json_encode($config[ 'cookie_types' ]) ?>'
         data-cookie-selected='<?php echo json_encode($cookieTypesAccepted) ?>'
     ></script>
 @endif

resources/lang/it/translations.php

Indentation +22 added lines, -22 removed lines

@@ -2,33 +2,33 @@
 
 return [
 
-	'title' => 'Utilizziamo cookie',
+    'title' => 'Utilizziamo cookie',
     'title_description' => 'Tutti i cookie che utilizziamo',
-	'description' => '<p>Utilizziamo cookie per personalizzare i contenuti, avere statistiche e migliorare la tua esperienza nel nostro sito web.</p>',
+    'description' => '<p>Utilizziamo cookie per personalizzare i contenuti, avere statistiche e migliorare la tua esperienza nel nostro sito web.</p>',
     'description_policy' => '<p>Per maggiori informazioni ti consigliamo di leggere la nostra <a href=":cookie_policy_link" target="_blank">Cookie Policy</a>.</p>',
-	'button_accept' => 'Consenti tutti',
+    'button_accept' => 'Consenti tutti',
     'button_accept_necessary' => 'Rifiuta tutti',
-	'button_accept_selected' => 'Consenti selezionati',
+    'button_accept_selected' => 'Consenti selezionati',
     'button_save_changes' => 'Salva modifiche',
-	'button_more_info' => 'Maggiori informazioni',
-	'no_cookies_used' => 'Nessun cookie utilizzato per questa categoria',
+    'button_more_info' => 'Maggiori informazioni',
+    'no_cookies_used' => 'Nessun cookie utilizzato per questa categoria',
 
-	'necessary' => [
-		'title' => 'Strettamente necessari',
-		'description' => '<p>Questi cookie sono necessari per il funzionamento del sito Web e non possono essere disattivati nei nostri sistemi.</p><p>È possibile impostare il browser in modo che blocchi questi cookie o ne avvisi l\'utilizzo, ma alcune parti del sito non funzioneranno. Questi cookie non memorizzano alcuna informazione personale identificativa.</p>',
-	],
-	'statistics' => [
-		'title' => 'Statistici',
-		'description' => '<p>Questi cookie ci consentono di contare le visite e le sorgenti di traffico in modo da poter misurare e migliorare le prestazioni del nostro sito. Ci aiutano a sapere quali sono le pagine più e meno popolari e vedere come i visitatori si muovono nel sito.</p><p>Tutte le informazioni raccolte da questi cookie sono aggregate e quindi anonime. Se non autorizzi questi cookie, non sapremo quando avrai visitato il nostro sito e non saremo in grado di monitorarne le prestazioni.</p>',
-	],
-	'functional' => [
-		'title' => 'Funzionali e di terze parti',
-		'description' => '<p>Questi cookie consentono al sito Web di fornire funzionalità e personalizzazione avanzate. Possono essere impostati da noi o da fornitori di terze parti, i cui servizi sono stati aggiunti alle nostre pagine.</p><p>Se non si consente questi cookie, alcuni o tutti questi servizi potrebbero non funzionare correttamente.</p>',
-	],
-	'marketing' => [
-		'title' => 'Marketing e targeting',
-		'description' => '<p>Questi cookie possono essere impostati tramite il nostro sito dai nostri partner pubblicitari. Possono essere utilizzati da tali società per creare un profilo dei tuoi interessi e mostrarti annunci pertinenti su altri siti.</p><p>Non memorizzano direttamente informazioni personali, ma si basano sull\'identificazione univoca del browser e del dispositivo Internet. Se non si consente questi cookie, si verificherà una pubblicità meno mirata.</p>',
-	],
+    'necessary' => [
+        'title' => 'Strettamente necessari',
+        'description' => '<p>Questi cookie sono necessari per il funzionamento del sito Web e non possono essere disattivati nei nostri sistemi.</p><p>È possibile impostare il browser in modo che blocchi questi cookie o ne avvisi l\'utilizzo, ma alcune parti del sito non funzioneranno. Questi cookie non memorizzano alcuna informazione personale identificativa.</p>',
+    ],
+    'statistics' => [
+        'title' => 'Statistici',
+        'description' => '<p>Questi cookie ci consentono di contare le visite e le sorgenti di traffico in modo da poter misurare e migliorare le prestazioni del nostro sito. Ci aiutano a sapere quali sono le pagine più e meno popolari e vedere come i visitatori si muovono nel sito.</p><p>Tutte le informazioni raccolte da questi cookie sono aggregate e quindi anonime. Se non autorizzi questi cookie, non sapremo quando avrai visitato il nostro sito e non saremo in grado di monitorarne le prestazioni.</p>',
+    ],
+    'functional' => [
+        'title' => 'Funzionali e di terze parti',
+        'description' => '<p>Questi cookie consentono al sito Web di fornire funzionalità e personalizzazione avanzate. Possono essere impostati da noi o da fornitori di terze parti, i cui servizi sono stati aggiunti alle nostre pagine.</p><p>Se non si consente questi cookie, alcuni o tutti questi servizi potrebbero non funzionare correttamente.</p>',
+    ],
+    'marketing' => [
+        'title' => 'Marketing e targeting',
+        'description' => '<p>Questi cookie possono essere impostati tramite il nostro sito dai nostri partner pubblicitari. Possono essere utilizzati da tali società per creare un profilo dei tuoi interessi e mostrarti annunci pertinenti su altri siti.</p><p>Non memorizzano direttamente informazioni personali, ma si basano sull\'identificazione univoca del browser e del dispositivo Internet. Se non si consente questi cookie, si verificherà una pubblicità meno mirata.</p>',
+    ],
 
     // Cookies descriptions
     'cookies' => [

resources/lang/en/translations.php

Indentation +22 added lines, -22 removed lines

@@ -2,33 +2,33 @@
 
 return [
 
-	'title' => 'We use cookies',
+    'title' => 'We use cookies',
     'title_description' => 'All cookies we use',
-	'description' => '<p>We use cookies to personalize content, to get statistics and to improve your experience on our website.</p>',
+    'description' => '<p>We use cookies to personalize content, to get statistics and to improve your experience on our website.</p>',
     'description_policy' => '<p>For more information please read our <a href=":cookie_policy_link" target="_blank">Cookie Policy</a>.</p>',
-	'button_accept' => 'Accept all',
+    'button_accept' => 'Accept all',
     'button_accept_necessary' => 'Reject all',
-	'button_accept_selected' => 'Accept selected',
+    'button_accept_selected' => 'Accept selected',
     'button_save_changes' => 'Save changes',
-	'button_more_info' => 'More information',
-	'no_cookies_used' => 'No cookies used for this type',
+    'button_more_info' => 'More information',
+    'no_cookies_used' => 'No cookies used for this type',
 
-	'necessary' => [
-		'title' => 'Strictly necessary',
-		'description' => '<p>These cookies are necessary for the website to function and cannot be switched off in our systems.</p><p>You can set your browser to block or alert you about these cookies, but some parts of the site will not then work. These cookies do not store any personally identifiable information.</p>',
-	],
-	'statistics' => [
-		'title' => 'Statistics',
-		'description' => '<p>These cookies allow us to count visits and traffic sources so we can measure and improve the performance of our site. They help us to know which pages are the most and least popular and see how visitors move around the site.</p><p>All information these cookies collect is aggregated and therefore anonymous. If you do not allow these cookies we will not know when you have visited our site, and will not be able to monitor its performance.</p>',
-	],
-	'functional' => [
-		'title' => 'Functional and third party',
-		'description' => '<p>These cookies enable the website to provide enhanced functionality and personalisation. They may be set by us or by third party providers whose services we have added to our pages.</p><p>If you do not allow these cookies then some or all of these services may not function properly.</p>',
-	],
-	'marketing' => [
-		'title' => 'Marketing and targeting',
-		'description' => '<p>These cookies may be set through our site by our advertising partners. They may be used by those companies to build a profile of your interests and show you relevant adverts on other sites.</p><p>They do not store directly personal information, but are based on uniquely identifying your browser and internet device. If you do not allow these cookies, you will experience less targeted advertising.</p>',
-	],
+    'necessary' => [
+        'title' => 'Strictly necessary',
+        'description' => '<p>These cookies are necessary for the website to function and cannot be switched off in our systems.</p><p>You can set your browser to block or alert you about these cookies, but some parts of the site will not then work. These cookies do not store any personally identifiable information.</p>',
+    ],
+    'statistics' => [
+        'title' => 'Statistics',
+        'description' => '<p>These cookies allow us to count visits and traffic sources so we can measure and improve the performance of our site. They help us to know which pages are the most and least popular and see how visitors move around the site.</p><p>All information these cookies collect is aggregated and therefore anonymous. If you do not allow these cookies we will not know when you have visited our site, and will not be able to monitor its performance.</p>',
+    ],
+    'functional' => [
+        'title' => 'Functional and third party',
+        'description' => '<p>These cookies enable the website to provide enhanced functionality and personalisation. They may be set by us or by third party providers whose services we have added to our pages.</p><p>If you do not allow these cookies then some or all of these services may not function properly.</p>',
+    ],
+    'marketing' => [
+        'title' => 'Marketing and targeting',
+        'description' => '<p>These cookies may be set through our site by our advertising partners. They may be used by those companies to build a profile of your interests and show you relevant adverts on other sites.</p><p>They do not store directly personal information, but are based on uniquely identifying your browser and internet device. If you do not allow these cookies, you will experience less targeted advertising.</p>',
+    ],
 
     // Cookies descriptions
     'cookies' => [

src/LaravelCookieConsentServiceProvider.php

Spacing +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'laravel-cookie-consent');
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'laravel-cookie-consent');
 
-        $this->publishes([__DIR__.'/../config/config.php' => config_path('laravel-cookie-consent.php')], 'config');
-        $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-cookie-consent')], 'lang');
-        $this->publishes([__DIR__.'/../resources/js' => public_path('vendor/laravel-cookie-consent')], 'public');
-        $this->publishes([__DIR__.'/../resources/css' => public_path('vendor/laravel-cookie-consent')], 'public');
-        $this->publishes([__DIR__.'/../resources/views' => resource_path('views/vendor/laravel-cookie-consent')], 'views');
+        $this->publishes([ __DIR__.'/../config/config.php' => config_path('laravel-cookie-consent.php') ], 'config');
+        $this->publishes([ __DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-cookie-consent') ], 'lang');
+        $this->publishes([ __DIR__.'/../resources/js' => public_path('vendor/laravel-cookie-consent') ], 'public');
+        $this->publishes([ __DIR__.'/../resources/css' => public_path('vendor/laravel-cookie-consent') ], 'public');
+        $this->publishes([ __DIR__.'/../resources/views' => resource_path('views/vendor/laravel-cookie-consent') ], 'views');
     }
 
     /**

src/Http/Middleware/LaravelCookieConsent.php

Indentation +49 added lines, -49 removed lines

@@ -8,27 +8,27 @@ 
 
 class LaravelCookieConsent
 {
-	/**
-	 * Handle an incoming request.
-	 * @param $request
-	 * @param Closure $next
-	 *
-	 * @return LaravelCookieConsent|mixed
-	 * @throws Throwable
-	 */
-	public function handle($request, Closure $next)
-	{
-		$alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
+    /**
+     * Handle an incoming request.
+     * @param $request
+     * @param Closure $next
+     *
+     * @return LaravelCookieConsent|mixed
+     * @throws Throwable
+     */
+    public function handle($request, Closure $next)
+    {
+        $alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
         $cookieTypesAccepted = $this->getCookieTypesConsent($request);
-		$response = $next($request);
-		if (! $response instanceof Response) {
-			return $response;
-		}
-		if (! $this->containsBodyTag($response)) {
-			return $response;
-		}
-		return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
-	}
+        $response = $next($request);
+        if (! $response instanceof Response) {
+            return $response;
+        }
+        if (! $this->containsBodyTag($response)) {
+            return $response;
+        }
+        return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
+    }
 
     /**
      * Get the cookie preference for the user
@@ -45,16 +45,16 @@ 
         return $cookieTypesConsent;
     }
 
-	/**
-	 * Check if the application contains body tag
-	 * @param Response $response
-	 *
-	 * @return bool
-	 */
-	protected function containsBodyTag(Response $response): bool
+    /**
+     * Check if the application contains body tag
+     * @param Response $response
+     *
+     * @return bool
+     */
+    protected function containsBodyTag(Response $response): bool
     {
-		return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
-	}
+        return $this->getLastClosingBodyTagPosition($response->getContent()) != false;
+    }
 
     /**
      * Add cookie consent container to the response
@@ -66,27 +66,27 @@ 
      * @return Response
      * @throws Throwable
      */
-	protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
+    protected function addCookieConsentScriptToResponse(Response $response, $alreadyAccepted, $cookieTypesAccepted): Response
     {
-		$content = $response->getContent();
-		//if(!$alreadyAccepted) {
-			$closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
-			$content = ''
-			           .substr($content, 0, $closingBodyTagPosition)
-			           .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
-			           .substr($content, $closingBodyTagPosition);
-		//}
-		return $response->setContent($content);
-	}
+        $content = $response->getContent();
+        //if(!$alreadyAccepted) {
+            $closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
+            $content = ''
+                        .substr($content, 0, $closingBodyTagPosition)
+                        .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
+                        .substr($content, $closingBodyTagPosition);
+        //}
+        return $response->setContent($content);
+    }
 
-	/**
-	 * Get last closing body tag position
-	 * @param string $content
-	 *
-	 * @return int
-	 */
-	protected function getLastClosingBodyTagPosition(string $content = ''): int
+    /**
+     * Get last closing body tag position
+     * @param string $content
+     *
+     * @return int
+     */
+    protected function getLastClosingBodyTagPosition(string $content = ''): int
     {
-		return strripos($content, '</body>');
-	}
+        return strripos($content, '</body>');
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -21,10 +21,10 @@ 
 		$alreadyAccepted = array_key_exists(config('laravel-cookie-consent.cookie_name'), $request->cookie());
         $cookieTypesAccepted = $this->getCookieTypesConsent($request);
 		$response = $next($request);
-		if (! $response instanceof Response) {
+		if (!$response instanceof Response) {
 			return $response;
 		}
-		if (! $this->containsBodyTag($response)) {
+		if (!$this->containsBodyTag($response)) {
 			return $response;
 		}
 		return $this->addCookieConsentScriptToResponse($response, $alreadyAccepted, $cookieTypesAccepted);
@@ -38,9 +38,9 @@ 
      */
     public function getCookieTypesConsent($request): array
     {
-        $cookieTypesConsent = [];
-        foreach(config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
-            if(array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[] = $cookie_name;
+        $cookieTypesConsent = [ ];
+        foreach (config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
+            if (array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[ ] = $cookie_name;
         }
         return $cookieTypesConsent;
     }
@@ -73,7 +73,7 @@ 
 			$closingBodyTagPosition = $this->getLastClosingBodyTagPosition($content);
 			$content = ''
 			           .substr($content, 0, $closingBodyTagPosition)
-			           .view('laravel-cookie-consent::_banner', ['alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted])->render()
+			           .view('laravel-cookie-consent::_banner', [ 'alreadyAccepted' => $alreadyAccepted, 'cookieTypesAccepted' => $cookieTypesAccepted ])->render()
 			           .substr($content, $closingBodyTagPosition);
 		//}
 		return $response->setContent($content);

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
     {
         $cookieTypesConsent = [];
         foreach(config('laravel-cookie-consent.cookie_types') as $type => $cookie_name) {
-            if(array_key_exists($cookie_name, $request->cookie())) $cookieTypesConsent[] = $cookie_name;
+            if(array_key_exists($cookie_name, $request->cookie())) {
+                $cookieTypesConsent[] = $cookie_name;
+            }
         }
         return $cookieTypesConsent;
     }