diff --git a/CHANGES.md b/CHANGES.md index 48ff1e1c..12b2ebbb 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,12 @@ - Traduction automatique dans la langue du navigateur. - Amélioration de la structure du flux RSS. +## Version 10.3.11 +Modification : + - Message sur l'utilisation des cookies +Coorection : + - Recherche inopérante dans les articles des blogs. + ## Version 10.3.10 Corrections : - Conflit page inactive et droit d'un membre. diff --git a/core/core.js.php b/core/core.js.php index e59e5c9f..12d5f08b 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -221,14 +221,18 @@ core.start = function() { /** * Message sur l'utilisation des cookies */ + var analytics = ""; + if (getData(['config', 'analyticsId'])); ?>) { + analytics = ' grâce au cookie Google Analytics' + } if(getData(['config', 'cookieConsent'])); ?>) { if(document.cookie.indexOf("ZWII_COOKIE_CONSENT") === -1) { $("body").append( $("
").attr("id", "cookieConsent").append( - $("").text("En poursuivant votre navigation sur ce site, vous acceptez l'utilisation de cookies et de vos données de visite."), + $("").html("

Ce site utilise des cookies pour assurer l'authentification, améliorer l'expérience utilisateur"+analytics+".
En cliquant sur ”J’accepte”, vous acceptez l’utilisation de ces cookies.

"), $("") .attr("id", "cookieConsentConfirm") - .text("OK") + .text("Accepter") .on("click", function() { // Créé le cookie d'acceptation var expires = new Date(); @@ -237,7 +241,19 @@ core.start = function() { document.cookie = "ZWII_COOKIE_CONSENT=true;" + expires; // Ferme le message $(this).parents("#cookieConsent").fadeOut(); - }) + }), + $("") + .attr("id", "cookieConsentRefuse") + .text("Refuser") + .on("click", function() { + // Créé le cookie d'acceptation + var expires = new Date(); + expires.setFullYear(expires.getFullYear() + 1); + expires = "expires=" + expires.toUTCString(); + document.cookie = "ZWII_COOKIE_CONSENT=false;" + expires; + // Ferme le message + $(this).parents("#cookieConsent").fadeOut(); + }), ) ); } diff --git a/core/core.php b/core/core.php index 0728f8af..43a314fb 100755 --- a/core/core.php +++ b/core/core.php @@ -1934,9 +1934,9 @@ class core extends common { } // Empêcher l'accès aux page désactivée par URL directe if ( ( $this->getData(['page', $this->getUrl(0),'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page', $this->getUrl(0),'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page', $this->getUrl(0),'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) @@ -2311,14 +2311,15 @@ class layout extends common { * Affiche le script Google Analytics */ public function showAnalytics() { - if($code = $this->getData(['config', 'analyticsId'])) { + if($code = $this->getData(['config', 'analyticsId']) + AND $this->getInput('ZWII_COOKIE_CONSENT') === 'true') { echo ' '; } } @@ -2576,9 +2577,9 @@ class layout extends common { $itemsLeft .= '
  • '; if ( ( $this->getData(['page',$parentPageId,'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page',$parentPageId,'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) @@ -2636,9 +2637,9 @@ class layout extends common { // Mise en page du sous-item $itemsLeft .= '
  • '; if ( ( $this->getData(['page',$childKey,'disable']) === true - AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ) OR ( - $this->getData(['page',$childKey,'disable']) === true + AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') + ) OR ( + $this->getData(['page',$childKey,'disable']) === true AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('group') < self::GROUP_MODERATOR ) diff --git a/core/layout/common.css b/core/layout/common.css index d72acee4..ad3c9a15 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -975,20 +975,22 @@ footer #footerSocials .zwiico-github:hover { /* Message sur les cookies */ #cookieConsent { + width: 80%; + margin: auto; opacity: .9; background: #212223; position: fixed; right: 0; - bottom: 0; + bottom: 5%; left: 0; color: #FFF; padding: 10px; z-index: 60; text-align: center; - font-size: .9em; + font-size: 1em; } -#cookieConsentConfirm { +#cookieConsentConfirm, #cookieConsentRefuse { cursor: pointer; margin-left: 10px; background: #666; @@ -997,10 +999,12 @@ footer #footerSocials .zwiico-github:hover { transition: background .3s ease-out; } -#cookieConsentConfirm:hover { +#cookieConsentConfirm:hover, #cookieConsentRefuse:hover { background: #777; } + + /* Bloc */ .block { /* border: 1px solid #D8DFE3;*/ diff --git a/module/search/search.php b/module/search/search.php index 8a0a789b..f525f941 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -163,8 +163,8 @@ class search extends common { foreach($childIds as $childId) { // Sous page if ($this->getData(['page', $childId, 'disable']) === false && - $this->getUser('group') >= $this->getData(['page', $childId, 'group']) && - $this->getData(['page', $childId, 'block']) !== 'bar') { + $this->getUser('group') >= $this->getData(['page', $parentId, 'group']) && + $this->getData(['page', $parentId, 'block']) !== 'bar') { $url = $childId; $titre = $this->getData(['page', $childId, 'title']); $contenu = ' ' . $titre . ' ' . $this->getData(['page', $childId, 'content']);