forked from ZwiiCMS-Team/ZwiiCMS
RGPD + bug search
This commit is contained in:
fredtempez
parent
4406458c11
commit
0aad617a33
@ -1,5 +1,12 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
## 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.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
 
|
||||
|
||||
# ZwiiCMS 10.3.10
|
||||
# ZwiiCMS 10.3.11
|
||||
|
||||
Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
|
||||
|
||||
|
||||
@ -221,14 +221,18 @@ core.start = function() {
|
||||
/**
|
||||
* Message sur l'utilisation des cookies
|
||||
*/
|
||||
var analytics = "";
|
||||
if (<?php echo json_encode($this->getData(['config', 'analyticsId'])); ?>) {
|
||||
analytics = ' grâce au cookie Google Analytics'
|
||||
}
|
||||
if(<?php echo json_encode($this->getData(['config', 'cookieConsent'])); ?>) {
|
||||
if(document.cookie.indexOf("ZWII_COOKIE_CONSENT") === -1) {
|
||||
$("body").append(
|
||||
$("<div>").attr("id", "cookieConsent").append(
|
||||
$("<span>").text("En poursuivant votre navigation sur ce site, vous acceptez l'utilisation de cookies et de vos données de visite."),
|
||||
$("<span>").html("<p>Ce site utilise des cookies pour assurer l'authentification, améliorer l'expérience utilisateur"+analytics+". <br/>En cliquant sur ”J’accepte”, vous acceptez l’utilisation de ces cookies.</p>"),
|
||||
$("<span>")
|
||||
.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();
|
||||
})
|
||||
}),
|
||||
$("<span>")
|
||||
.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();
|
||||
}),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ class common {
|
||||
const ACCESS_TIMER = 1800;
|
||||
|
||||
// Numéro de version
|
||||
const ZWII_VERSION = '10.3.10';
|
||||
const ZWII_VERSION = '10.3.11';
|
||||
const ZWII_UPDATE_CHANNEL = "v10";
|
||||
|
||||
public static $actions = [];
|
||||
@ -2196,14 +2196,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 '<!-- Global site tag (gtag.js) - Google Analytics -->
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id='. $code .'"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag("js", new Date());
|
||||
gtag("config","'. $code .'");
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag("js", new Date());
|
||||
gtag("config","'. $code .'");
|
||||
</script>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -835,31 +835,35 @@ footer #footerSocials .zwiico-github:hover {
|
||||
background: rgba(33, 34, 35, 1);
|
||||
}
|
||||
|
||||
/* Message sur les cookies */
|
||||
#cookieConsent {
|
||||
opacity: .9;
|
||||
background: #212223;
|
||||
position: fixed;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
color: #FFF;
|
||||
padding: 10px;
|
||||
z-index: 60;
|
||||
text-align: center;
|
||||
font-size: .9em;
|
||||
}
|
||||
#cookieConsentConfirm {
|
||||
cursor: pointer;
|
||||
margin-left: 10px;
|
||||
background: #666;
|
||||
padding: 4px 8px;
|
||||
display: inline-block;
|
||||
transition: background .3s ease-out;
|
||||
}
|
||||
#cookieConsentConfirm:hover {
|
||||
background: #777;
|
||||
}
|
||||
/* Message sur les cookies */
|
||||
#cookieConsent {
|
||||
width: 80%;
|
||||
margin: auto;
|
||||
opacity: .9;
|
||||
background: #212223;
|
||||
position: fixed;
|
||||
right: 0;
|
||||
bottom: 5%;
|
||||
left: 0;
|
||||
color: #FFF;
|
||||
padding: 10px;
|
||||
z-index: 60;
|
||||
text-align: center;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
#cookieConsentConfirm, #cookieConsentRefuse {
|
||||
cursor: pointer;
|
||||
margin-left: 10px;
|
||||
background: #666;
|
||||
padding: 4px 8px;
|
||||
display: inline-block;
|
||||
transition: background .3s ease-out;
|
||||
}
|
||||
|
||||
#cookieConsentConfirm:hover, #cookieConsentRefuse:hover {
|
||||
background: #777;
|
||||
}
|
||||
|
||||
/* Bloc */
|
||||
.block {
|
||||
|
||||
@ -126,8 +126,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']);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user