remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Erreur de rebase corrigée

Browse Source
This commit is contained in:
fredtempez 2021-11-25 13:40:14 +01:00
parent 4aa5938953
commit 6ff1444deb
2 changed files with 55 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/core.js.php
View File

@ -220,47 +220,29 @@ core.start = function() {
}); });
/** /**
* Message sur l'utilisation des cookies * Traitement du formulaire cookies
*/ */
var analytics = ""; $("#cookieForm").submit(function(event){
if (<?php echo json_encode($this->getData(['config', 'seo', 'analyticsId'])); ?>) { var samesite = "samesite=lax";
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>").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("Accepter")
.on("click", function() {
// Créé le cookie d'acceptation
var expires = new Date();
expires.setFullYear(expires.getFullYear() + 1);
expires = "expires=" + expires.toUTCString();
var getUrl = window.location; var getUrl = window.location;
document.cookie = "ZWII_COOKIE_CONSENT=true;domain=" + getUrl.host + ";path=" + getUrl.pathname.split('/')[1] + ";samesite=strict;" + expires; var domain = "domain=" + getUrl.host;
// Ferme le message var path = "path=" + getUrl.pathname.split('/')[1];
$(this).parents("#cookieConsent").fadeOut(); var samesite = "samesite=lax";
}), var e = new Date();
$("<span>") e.setFullYear(e.getFullYear() + 1);
.attr("id", "cookieConsentRefuse") var expires = "expires=" + e.toUTCString();
.text("Refuser")
.on("click", function() { // Crée le cookie d'acceptation Google Analytics si nécessaire
// Créé le cookie d'acceptation var analytics = "<?php echo $this->getData(['config', 'seo', 'analyticsId']);?>";
var expires = new Date(); if( analytics.length > 0){
expires.setFullYear(expires.getFullYear() + 1); document.cookie = "ZWII_COOKIE_GA_CONSENT=" + $("#googleAnalytics").prop("checked") + "<?php echo $_SERVER['PHP_SELF']; ?>" +";" + domain + ";" + path + ";" + samesite + ";" + expires;
expires = "expires=" + expires.toUTCString();
var getUrl = window.location;
document.cookie = "ZWII_COOKIE_CONSENT=true;domain=" + getUrl.host + ";path=" + getUrl.pathname.split('/')[1] + ";samesite=strict;" + expires;
// Ferme le message
$(this).parents("#cookieConsent").fadeOut();
}),
)
);
}
} }
document.cookie = "ZWII_COOKIE_CONSENT=<?php echo $_SERVER['PHP_SELF']; ?>;" + domain + ";" + path + ";" + samesite + ";" + expires;
});
$("#cookieConsent .cookieClose").on("click", function() {
$(this).parents("#cookieConsent").fadeOut();
});
/** /**
* Choix de page dans la barre de membre * Choix de page dans la barre de membre
*/ */

15
core/core.php
View File

@ -45,7 +45,7 @@ class common {
// Numéro de version // Numéro de version
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
const ZWII_VERSION = '11.2.00.8'; const ZWII_VERSION = '11.2.00.9';
const ZWII_UPDATE_CHANNEL = "test"; const ZWII_UPDATE_CHANNEL = "test";
public static $actions = []; public static $actions = [];
@ -2276,16 +2276,15 @@ class core extends common {
$css .= 'header{margin:20px 20px 0 20px}'; $css .= 'header{margin:20px 20px 0 20px}';
} }
} }
// Couleur du fonc
$colors = helper::colorVariants($this->getData(['theme', 'header', 'backgroundColor']));
$css .= 'header{background-color:' . $colors['normal'].'}';
if ($this->getData(['theme','header','feature']) === 'wallpaper' ) { if ($this->getData(['theme','header','feature']) === 'wallpaper' ) {
$colors = helper::colorVariants($this->getData(['theme', 'header', 'backgroundColor']));
$css .= 'header{background-size:' . $this->getData(['theme','header','imageContainer']).';}'; $css .= 'header{background-size:' . $this->getData(['theme','header','imageContainer']).'}';
$css .= 'header{background-color:' . $colors['normal'];
// Valeur de hauteur traditionnelle // Valeur de hauteur traditionnelle
$css .= 'header{height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) . ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}'; $css .= ';height:' . $this->getData(['theme', 'header', 'height']) . ';line-height:' . $this->getData(['theme', 'header', 'height']) ;
$css .= ';text-align:' . $this->getData(['theme', 'header', 'textAlign']) . '}';
if($themeHeaderImage = $this->getData(['theme', 'header', 'image'])) { if($themeHeaderImage = $this->getData(['theme', 'header', 'image'])) {
$css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}'; $css .= 'header{background-image:url("../file/source/' . $themeHeaderImage . '");background-position:' . $this->getData(['theme', 'header', 'imagePosition']) . ';background-repeat:' . $this->getData(['theme', 'header', 'imageRepeat']) . '}';
} }