|
|
|
@ -1320,7 +1320,7 @@ class common {
|
|
|
|
|
$this->setData(['user', $this->getUser('id'), 'accessTimer',0]);
|
|
|
|
|
$this->setData(['user', $this->getUser('id'), 'accessUrl','']);
|
|
|
|
|
$this->setData(['user', $this->getUser('id'), 'accessCsrf',$_SESSION['csrf']]);
|
|
|
|
|
// Paramètres de sécurité
|
|
|
|
|
// Paramètres de sécurité
|
|
|
|
|
$this->setData(['config', 'connect', 'attempt',999]);
|
|
|
|
|
$this->setData(['config', 'connect', 'timeout',0]);
|
|
|
|
|
$this->setData(['config', 'connect', 'log',false]);
|
|
|
|
@ -1331,12 +1331,12 @@ class common {
|
|
|
|
|
unlink(self::DATA_DIR . 'theme.css');
|
|
|
|
|
}
|
|
|
|
|
// Créer les en-têtes du journal
|
|
|
|
|
$d = 'Date;Heure;Id;Action' . PHP_EOL;
|
|
|
|
|
$d = 'Date;Heure;IP;Id;Action' . PHP_EOL;
|
|
|
|
|
file_put_contents(self::DATA_DIR . 'journal.log',$d);
|
|
|
|
|
// Init préservation htaccess
|
|
|
|
|
$this->setData(['config','autoUpdateHtaccess',false]);
|
|
|
|
|
// Options de barre de membre simple
|
|
|
|
|
$this->setData(['theme','menu','memberBar',true]);
|
|
|
|
|
$this->setData(['theme','menu','memberBar',true]);
|
|
|
|
|
|
|
|
|
|
// Thème Menu : couleur de page active non définie
|
|
|
|
|
if (!$this->getData(['theme','menu','activeTextColor']) ) {
|
|
|
|
@ -1352,7 +1352,6 @@ class common {
|
|
|
|
|
$this->setData(['theme','menu','memberBar',true]);
|
|
|
|
|
$this->deleteData(['theme','footer','displayMemberAccount']);
|
|
|
|
|
$this->deleteData(['theme','footer','displayMemberLogout']);
|
|
|
|
|
|
|
|
|
|
$this->setData(['core', 'dataVersion', 10201]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1535,31 +1534,31 @@ class core extends common {
|
|
|
|
|
|
|
|
|
|
$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'menu', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'menu', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'menu', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'menu', 'textTransform']) . '}';
|
|
|
|
|
// Pied de page
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$colors = helper::colorVariants($this->getData(['theme', 'footer', 'backgroundColor']));
|
|
|
|
|
if($this->getData(['theme', 'footer', 'margin'])) {
|
|
|
|
|
$css .= 'footer{padding:0 20px;}';
|
|
|
|
|
} else {
|
|
|
|
|
$css .= 'footer{padding:0}';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
|
|
|
|
|
$css .= 'footer{background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
|
|
|
|
|
$css .= 'footer a{color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
|
|
|
|
|
$css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$css .= 'footer #footerbody > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
|
|
|
|
|
$css .= '#footerSocials{text-align:' . $this->getData(['theme', 'footer', 'socialsAlign']) . '}';
|
|
|
|
|
$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
|
|
|
|
|
$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Marge supplémentaire lorsque le pied de page est fixe
|
|
|
|
|
if ( $this->getData(['theme', 'footer', 'fixed']) === true &&
|
|
|
|
|
$this->getData(['theme', 'footer', 'position']) === 'body') {
|
|
|
|
|
$css .= "@media (min-width: 769px) { #site {margin-bottom: 100px;} }";
|
|
|
|
|
$css .= "@media (max-width: 768px) { #site {margin-bottom: 150px;} }";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Enregistre la personnalisation
|
|
|
|
|
file_put_contents(self::DATA_DIR.'theme.css', $css);
|
|
|
|
|
// Effacer le cache pour tenir compte de la couleur de fond TinyMCE
|
|
|
|
@ -1634,6 +1633,7 @@ class core extends common {
|
|
|
|
|
}
|
|
|
|
|
// Journalisation
|
|
|
|
|
$dataLog = strftime('%d/%m/%y',time()) . ';' . strftime('%R',time()) . ';' ;
|
|
|
|
|
$dataLog .= helper::getIp() . ';';
|
|
|
|
|
$dataLog .= $this->getUser('id') ? $this->getUser('id') . ';' : 'anonyme' . ';';
|
|
|
|
|
$dataLog .= $this->getUrl();
|
|
|
|
|
$dataLog .= PHP_EOL;
|
|
|
|
@ -2635,7 +2635,7 @@ class layout extends common {
|
|
|
|
|
helper::checkNewVersion(common::ZWII_UPDATE_CHANNEL)) {
|
|
|
|
|
$this->setData(['core','updateAvailable', true]);
|
|
|
|
|
$this->setData(['core','lastAutoUpdate',$lastAutoUpdate]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Afficher le bouton : Mise à jour détectée + activée
|
|
|
|
|
if ( $this->getData(['core','updateAvailable']) === true &&
|
|
|
|
|
$this->getData(['config','autoUpdate']) === true ) {
|
|
|
|
|