maj 4406

2023-03-22 14:54:21 +01:00 · 2023-03-22 14:54:21 +01:00 · f0c42b9ded
parent 5d95abdcf0
commit f0c42b9ded
139 changed files with 385 additions and 1418 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,5 +1,16 @@
 # Changelog

+## Version 4.4.06 de Deltacms
+- Modifications :
+	- Thème / Footer : nouvelle option 'Qui est en ligne ?', affiche le nombre de visiteurs ou d'utilisateurs connectés,
+	- Réécriture du layout, l'affichage des pages est plus rapide,
+	- Module Form : un brouillon trop ancien est effacé pour détruire les traces de robots malveillants,
+	- Configuration / configuration : message de confirmation avant une mise à jour de DeltaCMS.
+- Corrections : 
+	- Module Form : messages liés au captcha,
+	- Thème / menu : l'aperçu en direct pendant sa configuration est amélioré,
+	- Configuration / configuration : lien du bouton Réinstaller neutralisé si le bouton est désactivé.
+
 ## Version 4.4.05 de Deltacms
 - Modifications :
 	- Chargement ordonné des scripts javascript et des styles, l'affichage des pages est plus rapide,
--- a/README.md
+++ b/README.md
@ -1,12 +1,12 @@

-# DeltaCMS 4.4.05
+# DeltaCMS 4.4.06

 DeltaCMS 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.
-L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une des principales langues européennes.
+L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une langue quelconque.
 2 modes de traduction sont proposés : traduction rédigée, assistée (conseillée) ou à défaut traduction automatique par script.

 DeltaCMS is a database-less (flat-file) CMS that allows you to easily create and manage a website without any programming knowledge.
-The administration of the site is bilingual English or French, the site can be written in one of the main European languages.
+The administration of the site is bilingual English or French, the site can be written in any language.
 2 translation modes are available: written and assisted translation (recommended) or automatic translation by script.

 [Site](http://deltacms.fr/)
--- a/core/core.js.php
+++ b/core/core.js.php
@ -3,7 +3,7 @@
 * For full copyright and license information, please see the LICENSE
 * file that was distributed with this source code.
 * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @copyright Copyright (C) 2021, Sylvain Lelièvre
 * @license GNU General Public License, version 3
 * @link https://deltacms.fr/
 *
--- a/core/core.php
+++ b/core/core.php
@ -5,7 +5,7 @@
 * For full copyright and license information, please see the LICENSE
 * file that was distributed with this source code.
 * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @copyright Copyright (C) 2021, Sylvain Lelièvre
 * @license GNU General Public License, version 3
 * @link https://deltacms.fr/
 *
@ -49,7 +49,7 @@ class common {

 	// Numéro de version
 	const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/';
-	const DELTA_VERSION = '4.4.05';
+	const DELTA_VERSION = '4.4.06';
 	const DELTA_UPDATE_CHANNEL = "v4";

 	public static $actions = [];
@ -221,7 +221,8 @@ class common {
 		'admin' => '',
 		'blacklist' => '',
 		'locale' => '',
-		'fonts' => ''
+		'fonts' => '',
+		'session' =>''
 	];

 	/**
@ -1509,6 +1510,40 @@ class common {
 		$label  = empty($this->getData(['locale', 'cookies', 'cookiesFooterText'])) ? 'Cookies' : $this->getData(['locale', 'cookies', 'cookiesFooterText']) ;
 		$items .= '<wbr>&nbsp;|&nbsp;<a href="javascript:void(0)" class="skiptranslate" id="footerLinkCookie">'. $label .'</a>';
 		$items .= '</span>';
+		// Enregistrement et affichage des personnes en ligne
+		if( $this->getData(['theme', 'footer', 'displayWhois']) === true ){
+			// ajouter 'session' à la liste des descripteurs d'E/S ligne 225
+			if( ! file_exists(self::DATA_DIR . 'session.json'))	file_put_contents(self::DATA_DIR . 'session.json', '{}');
+			$user_type = $this->getUser('id') ? $this->getData(['user', $this->getUser('id'), 'group']) : 0 ;
+			$this->setData(['session', session_id(), 'user_type', $user_type ]);
+			$this->setData(['session', session_id(), 'time', time() ]);
+			// Lexique
+			include('./core/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_core.php');
+			$file = file_get_contents('site/data/session.json');
+			$session_tab = json_decode( $file, true);
+			$whoIs = [0 => 0,1 => 0,2 => 0, 3 => 0,4=> 0];
+			foreach( $session_tab as $key1=>$session_id){
+				foreach($session_id as $key2=>$value){
+					// Temps d'inactivité réglé ici à 300 secondes
+					if( time() >  $value["time"] + 300){
+						$session_tab[$key1]=[];
+					} else {
+						$whoIs[$value['user_type']]++;
+					}
+				}  
+			}
+			$file = json_encode( $session_tab);
+			file_put_contents('site/data/session.json', $file);
+			//	Affichage
+			$textWhoIs ='';
+			foreach( $whoIs as $key=>$value ){
+				if( $value !== 0){
+					$textWhoIs .= ' '. $value.'&nbsp;'. $groupWhoIs[$key];
+					$textWhoIs .= $value > 1 ? 's ':' ';
+				}
+			}
+			$items .= ' | '.$textWhoIs;
+		}
 		// Affichage du lien de connexion
 		if(
            (
@ -1619,27 +1654,71 @@ class common {
 	/**
 	 * Affiche le menu
 	 */
-	public function showMenu() {
+	public function showMenu( $position ='') {
 		// Lexique
 		include('./core/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_core.php');
+		
+		switch ($position) {
+			case 'top':
+				// Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté 
+				if ( $this->getData(['theme', 'menu', 'position']) === 'top' AND $this->getData(['theme', 'menu', 'fixed']) === true ){
+					if( $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD') AND $this->getUser('group') > self::GROUP_MEMBER) {
+						echo '<nav id="navfixedconnected" >';
+					} else {
+						echo '<nav id="navfixedlogout" >';
+					} 
+				} else {
+					echo '<nav>';
+				}
+				$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"'  : 'class="container"';			
+			break;
+			case 'body-first' :
+				// Limitation de la largeur du bandeau menu pour une bannière body et container
+				$navStyle = $this->getData(['theme', 'header', 'wide'])==='container'?  $navStyle = 'class="container"' : '';
+				echo '<nav '.$navStyle.'>';
+				$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"'  : 'class="container"';				
+			break;
+			case 'body-second' :
+				$navStyle = $this->getData(['theme', 'header', 'wide'])==='container'?  $navStyle = 'class="container"' : '';
+				echo '<nav '.$navStyle.'>';
+				$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"'  : 'class="container"';	
+			break;
+			case 'site-first' :
+				echo '<nav>';
+			break;
+			case 'site-second' :
+				echo '<nav>';			
+			break;
+			case 'site' :
+				echo '<nav>';		
+			break;	
+			case 'hide' :
+				?> <nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?> class="displayNone" <?php endif; ?>> <?php		
+			break;			
+		}
+		
+		//Menu burger
+		$fileLogo = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerLogo']);
+		$widthLogo = $this->getData([ 'theme', 'menu', 'widthLogo']); 
+		$heightLogo = $this->getData([ 'theme', 'menu', 'heightLogo']); ;
+		?> 	<div id="toggle">
+		<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
+		<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
+		<?php echo template::ico('menu',null,null,'2em'); ?></div>
+		
+		<div id="menu" <?php echo $menuClass; ?> > <?php
 		// Met en forme les items du menu
 		$itemsLeft = '';
 		$currentPageId = $this->getData(['page', $this->getUrl(0)]) ? $this->getUrl(0) : $this->getUrl(2);
+		// Tableaux des pages parent et de toutes les pages utilisés par core.js.php pour régler la largeur minimale des onglets et la largeur des sous-menus
 		?>
-		<script> var parentPage=[]; var allPage=[];	</script>
+		<script> var parentPage=[]; var allPage=[];	<?php foreach($this->getHierarchy() as $parentPageId => $childrenPageIds) {	if( $childrenPageIds !== [] ){ ?> parentPage.push('<?php echo $parentPageId; ?>');	<?php } ?> allPage.push('<?php echo $parentPageId; ?>'); <?php } ?> </script>
 		<?php
 		foreach($this->getHierarchy() as $parentPageId => $childrenPageIds) {
 			// Passer les entrées masquées
 			// Propriétés de l'item
 			$active = ($parentPageId === $currentPageId OR in_array($currentPageId, $childrenPageIds)) ? 'active ' : '';
 			$targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : '';
-
-			// Tableaux des pages parent et de toutes les pages utilisés par core.js.php pour régler la largeur minimale des onglets et la largeur des sous-menus
-			if( $childrenPageIds !== [] ){ ?>
-				<script> parentPage.push('<?php echo $parentPageId; ?>'); </script>
-			<?php } ?>
-			<script> allPage.push('<?php echo $parentPageId; ?>'); </script>
-			<?php
 			// Mise en page de l'item
 			$itemsLeft .= '<li>';
 			if ( ( $this->getData(['page',$parentPageId,'disable']) === true
@ -1830,7 +1909,7 @@ class common {
 			if( $itemsRight === '' && $flagVisible === true ) echo $space2Menu;
 			if( $flagVisible === true) echo $this->showi18n();
 		}
-		echo '</ul>';
+		echo '</ul></div></nav>';
 	}

 	/**
@ -2113,7 +2192,22 @@ class common {
 	/**
 	 * Affiche la bannière
 	 */
-	public function showHeader( $homePageOnly, $headerClass){
+	public function showHeader( $position = ''){
+		
+		$homePageOnly = false;
+		if( $this->getUrl(0) !== 'theme' ){
+			if( $this->getUrl(0) !== $this->getData(['locale', 'homePageId' ]) && $this->getData(['theme','header','homePageOnly']) === true) $homePageOnly = true;
+		}
+		$headerClass =  ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : '';
+		$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
+		switch ($position){
+			case 'body' :
+				$headerClass .= $this->getData(['theme', 'header', 'wide']) === 'none' ? '' : 'container';
+			break;
+			case 'site' :
+			break;
+		}
+		
 		?><header <?php echo empty($headerClass) ? '' : 'class="' . $headerClass . '"'; ?> >
 			<?php if ($this->getData(['theme','header','feature']) === 'wallpaper' ) { 
 				echo ($this->getData(['theme','header','linkHomePage']) ) ?  '<a class="headertitle" href="' . helper::baseUrl(false) . '">' : ''; 
@ -2255,6 +2349,10 @@ class common {
 				$_SESSION["innerWidth"] = 'done';
 			}
 		}	
+		// Pour capture d'écran
+				if( $type === 'jshead' && isset($_SESSION['screenshot'] ) && $_SESSION['screenshot'] === 'on' ){
+			?> <script src="core/vendor/screenshot/html2canvas.min.js"></script> <?php
+		}
 		switch ($type) {
 			case 'css' :
 				$vendorPath = self::$cssVendorPath;
@ -2595,7 +2693,7 @@ class core extends common {
 			}

 			$css .= '#toggle span,#menu a{padding:' . $this->getData(['theme', 'menu', 'height']) .';font-family:"' . $this->getData(['fonts', $this->getData(['theme', 'menu', 'font']), 'name']) . '",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'])) {
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@ -112,8 +112,12 @@ if ($this->getData(['core', 'dataVersion']) < 4404) {
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 4404]);
 }
-if ($this->getData(['core', 'dataVersion']) < 4405) {
+if ($this->getData(['core', 'dataVersion']) < 4406) {
+	if( ! file_exists(self::DATA_DIR . 'session.json'))	file_put_contents(self::DATA_DIR . 'session.json', '{}');
+	$this->setData(['theme', 'footer', 'displayWhois', false]);
+	$this->setData(['theme', 'menu', 'widthLogo', '30px' ]);
+	$this->setData(['theme', 'menu', 'heightLogo', 'auto' ]);
 	// Mise à jour
-	$this->setData(['core', 'dataVersion', 4405]);
+	$this->setData(['core', 'dataVersion', 4406]);
 }
 ?>
--- a/core/lang/en/lex_core.php
+++ b/core/lang/en/lex_core.php
@ -31,8 +31,13 @@ $text['core']['router'][3] = 'Access denied';
 $text['core']['router'][4] = 'You are not authorised to view this page (error 403)';
 $text['core']['router'][5] = 'Page unavailable';
 $text['core']['router'][6] = 'Oops! The requested page does not exist or cannot be found (error 404)';
-
-
+$groupWhoIs = [
+	0 => 'visitor',
+	1 => 'member',
+	2 => 'editor',
+	3 => 'moderator',
+	4 => 'administrator'
+];
 // core.js.php
 $text['core_js'][0] = "Updating ?";
 // Select File
--- a/core/lang/fr/lex_core.php
+++ b/core/lang/fr/lex_core.php
@ -31,7 +31,13 @@ $text['core']['router'][3] = 'Accès interdit';
 $text['core']['router'][4] = 'Vous n\'êtes pas autorisé à consulter cette page (erreur 403)';
 $text['core']['router'][5] = 'Page indisponible';
 $text['core']['router'][6] = 'Oups ! La page demandée n\'existe pas ou est introuvable (erreur 404)';
-
+$groupWhoIs = [
+	0 => 'visiteur',
+	1 => 'membre',
+	2 => 'éditeur',
+	3 => 'modérateur',
+	4 => 'administrateur'
+];
 // core.js.php
 $text['core_js'][0] = "Effectuer la mise à jour ?";
 // Select File
--- a/core/layout/blank.css
+++ b/core/layout/blank.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /**
--- a/core/layout/common.css
+++ b/core/layout/common.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 html,
@ -294,6 +282,10 @@ header #featureContent {
 	overflow: hidden;
 	margin: 0 10px;
 }
+/* Menu */
+nav {
+ padding: 0 10px; 
+}
 /* Items du menu */
 nav a > img {
 	margin: -4px 0;
@ -887,6 +879,10 @@ input[type="checkbox"]:disabled + label:before {
 	margin: 0 -10px;
 	font-size: 0;
 }
+/* Pour les pages de configuration */
+.row.siteContainer{
+ 	margin: 0; 
+}
 /* Supprime les margins du premier et du dernier élément d'un col, utile pour les cols générés depuis l'éditeur de texte. (Ne s'applique pas aux rows pour ne pas supprimer les margins négatifs) */
 .row > div > :first-child:not(.row) {
 	margin-top: 0;
--- a/core/layout/light.css
+++ b/core/layout/light.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /**
--- a/core/layout/main.php
+++ b/core/layout/main.php
@ -16,8 +16,8 @@ else { echo '<html lang="'.$lang.'">'; }
 		<base href="<?php echo helper::baseUrl(true); ?>">
 		<link rel="stylesheet" href="core/vendor/normalize/normalize.min.css">
 		<link rel="stylesheet" href="core/layout/common.css">
-		<link rel="stylesheet" href="core/layout/mediaqueries.css">
 		<link rel="stylesheet" href="<?php echo self::DATA_DIR; ?>theme.css">
+		<link rel="stylesheet" href="core/layout/mediaqueries.css">
 		<?php $this->showStyle();
 		$this->showSharedVariables();
 		$this->sortVendor();
@ -27,188 +27,76 @@ else { echo '<html lang="'.$lang.'">'; }
 		$this->showFavicon();
 		$this->showVendor('jshead');
 		// Détection RSS 
-		if (  (  $this->getData(['page', $this->getUrl(0), 'moduleId']) === 'blog'
+		if ( ( $this->getData(['page', $this->getUrl(0), 'moduleId']) === 'blog'
 					OR $this->getData(['page', $this->getUrl(0), 'moduleId']) === 'news' )
 					AND $this->getData(['module', $this->getUrl(0), 'config', 'feeds']) === TRUE ): ?>
 			<link rel="alternate" type="application/rss+xml" href="'<?php echo helper::baseUrl(). $this->getUrl(0) . '/rss';?>" title="fLUX rss">
-		<?php endif; ?>
-		<?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
-			include(self::DATA_DIR .'head.inc.html');
-		}?>
-		<?php
-		if( isset ($_SESSION['screenshot'] )){
-			if( $_SESSION['screenshot'] === 'on'){?>
-				<script src="core/vendor/screenshot/html2canvas.min.js"></script>
-		<?php } }?>
+		<?php endif;
+		if (file_exists(self::DATA_DIR .'head.inc.html')) include(self::DATA_DIR .'head.inc.html'); ?>
 	</head>
 	<body>
 		<!-- Barre d'administration -->
-		<?php if($this->getUser('group') > self::GROUP_MEMBER): ?>
-			<?php $this->showBar(); ?>
-		<?php endif;?>
+		<?php if($this->getUser('group') > self::GROUP_MEMBER) $this->showBar(); ?>

 		<!-- Notifications -->
-		<?php $this->showNotification(); ?>
+		<?php $this->showNotification(); 

-		<!-- Taille du Logo pour le menu burger -->
-		<?php $fileLogo = './site/file/source/'. $this->getData(['theme', 'menu', 'burgerLogo']);
-		if( $this->getData(['theme','menu','burgerContent']) === 'logo'
-		    && file_exists( $fileLogo)
-			&& $this->getData(['theme', 'menu', 'burgerLogo']) !== '' ){
-			$fontsize = $this->getData(['theme', 'text', 'fontSize']);
-			$pospx = strpos($fontsize, 'px');
-			$fontsize = (int) substr( $fontsize, 0, $pospx);
-			$height = $this->getData(['theme', 'menu', 'height']);
-			$pospx = strpos($height, 'px');
-			$height = (int) substr( $height, 0, $pospx);
-			$heightLogo = 2*($height + $fontsize) - 4;
-			$arrayImage = getimagesize( $fileLogo );
-			$heightImage = $arrayImage[1];
-			$widthImage = $arrayImage[0];
-			if( $heightImage !== 0 && $heightImage !== null){
-				$widthLogo = (int) ($widthImage * ( ($heightLogo - 1) / $heightImage));
-			}
-			else
-			{
-				$widthLogo = 30;
-			}
-		} ?>
+		// div screenshot
+		if( isset($_SESSION['screenshot'] ) && $_SESSION['screenshot'] === 'on' ) { ?> <div id="main_screenshot"> <?php } ?>

-		<!-- div screenshot -->
-		<?php if( isset ($_SESSION['screenshot'] )){
-			if( $_SESSION['screenshot'] === 'on'){ ?>
-				<div id="main_screenshot">
-		<?php }} ?>
+		<!-- Menu en dehors du site --> 
+		<?php if ( $this->getData(['theme', 'menu', 'position']) === 'top') $this->showMenu( 'top'); ?>
+		
+		<!-- Menu avant la bannière, bannière au dessus du site -->
+		<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first') $this->showMenu( 'body-first'); ?> 

-			<!-- Menu dans en dehors du site ou avant la bannière, au dessus du site -->
-			<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): 
-				// Menu dans le fond du site avant la bannière et bannière limitée au site
-				$navStyle = '';
-				?> <!-- Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté -->	<?php
-				if ( $this->getData(['theme', 'menu', 'position']) === 'top'
-					AND $this->getData(['theme', 'menu', 'fixed']) === true
-					AND $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD')
-					AND $this->getUser('group') > self::GROUP_MEMBER) {
-						echo '<nav '.$navStyle.' id="navfixedconnected" >';
-					} else {
-						echo '<nav '.$navStyle.' id="navfixedlogout" >';
-					}
-				?>
-				<!-- Menu Burger -->
-				<div id="toggle">
-				<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
-				<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
-				<?php echo template::ico('menu',null,null,'2em'); ?></div>
-				<!-- fin du menu burger -->
-				<?php
-					$menuClass = $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"';
-					$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"'  : 'class="container"';
-				?>
-				<div id="menu" <?php echo $menuClass; ?> >
-				<?php $this->showMenu(); ?>
-				</div> <!--fin menu -->
-				</nav>
-			<?php endif; ?>
+		<!-- Bannière au dessus du site -->
+		<?php if($this->getData(['theme', 'header', 'position']) === 'body') $this->showHeader('body'); ?>

-			<!-- Bannière dans le fond du site -->
-			<?php $homePageOnly = false;
-			if( $this->getUrl(0) !== 'theme' ){
-				if( $this->getUrl(0) !== $this->getData(['locale', 'homePageId' ]) && $this->getData(['theme','header','homePageOnly']) === true) $homePageOnly = true;
-			}
-			 if($this->getData(['theme', 'header', 'position']) === 'body'){
-					$headerClass =  ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : '';
-					$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
-					$headerClass .= $this->getData(['theme', 'header', 'wide']) === 'none' ? '' : 'container';
-					$this->showHeader($homePageOnly, $headerClass);
-			 }?>
+		<!-- Menu après la bannière, bannière au dessus du site -->
+		<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second') $this->showMenu( 'body-second'); ?> 

-			<!-- Menu dans le fond du site après la bannière -->
-			<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): 
-				// Menu dans le fond du site après la bannière et bannière limitée au site
-				$navStyle = '';
-				?>
-				<nav <?php echo $navStyle; ?> >
-					<!-- Menu burger -->
-					<div id="toggle">
-					<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
-					<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
-					<?php echo template::ico('menu',null,null,'2em'); ?></div>
-					<!-- fin du menu burger -->
-					<?php
-						$menuClass = $this->getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"'  : 'class="container"';
-					?>
-					<div id="menu" <?php echo $menuClass; ?> >
-						<?php $this->showMenu(); ?></div>
-				</nav>
-			<?php endif; ?>
+		<!-- Site -->
+		<div id="site" class="container">
+		
+		<!-- Menu dans le site avant la bannière -->
+		<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first') $this->showMenu( 'site-first'); ?> 

-			<!-- Site -->
-			<div id="site" class="container">
-				<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?>
-					<!-- Menu dans le site avant la bannière -->
-					<nav>
-						<div id="toggle">
-						<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
-						<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
-						<?php echo template::ico('menu',null,null,'2em'); ?></div>
-						<div id="menu" class="container"><?php $this->showMenu(); ?></div>
-					</nav>
-				<?php endif;
-				if(
-					$this->getData(['theme', 'header', 'position']) === 'site'
-					// Affiche toujours la bannière pour l'édition du thème
-					OR (
-						$this->getData(['theme', 'header', 'position']) === 'hide'
-						AND $this->getUrl(0) === 'theme'
-					)
-					): ?>
-						<!-- Bannière dans le site -->
-						<?php
-						$headerClass =  ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : '';
-						$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
-						$this->showHeader($homePageOnly, $headerClass);
-				endif;
-				if(
-					$this->getData(['theme', 'menu', 'position']) === 'site-second' ||
-					$this->getData(['theme', 'menu', 'position']) === 'site'
-					// Affiche toujours le menu pour l'édition du thème
-					OR (
-						$this->getData(['theme', 'menu', 'position']) === 'hide'
-						AND $this->getUrl(0) === 'theme'
-					)
-				): ?>
-				<!-- Menu dans le site après la bannière -->
-				<nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
-					<div id="toggle">
-					<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
-					<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'. $fileLogo .'" width="'. $widthLogo.'" height="'. $heightLogo .'"></div>' : '' ;?>
-					<?php echo template::ico('menu',null,null,'2em'); ?></div>
-					<div id="menu" class="container"><?php $this->showMenu(); ?></div>
-				</nav>
-				<?php endif; ?>
+		<!-- Bannière dans le site -->
+		<?php if( $this->getData(['theme', 'header', 'position']) === 'site'
+			OR ( $this->getData(['theme', 'header', 'position']) === 'hide' AND $this->getUrl(0) === 'theme' ) ) 
+			$this->showHeader( 'site' ); ?>
+		
+		<!-- Menu après la bannière, bannière dans le site -->
+		<?php if( $this->getData(['theme', 'menu', 'position']) === 'site-second' ) $this->showMenu( 'site-second'); ?> 
+		
+		<!-- Menu dans le site, bannière au dessus du site -->
+		<?php if( $this->getData(['theme', 'menu', 'position']) === 'site' ) $this->showMenu( 'site'); ?> 
+		
+		<!-- Menu caché  -->
+		<?php if( $this->getData(['theme', 'menu', 'position']) === 'hide') $this->showMenu( 'hide'); ?> 

-				<!-- Corps de page -->
-				<?php $this->showSection();?>
+		<!-- Corps de page -->
+		<?php $this->showSection();?>

-				<!-- footer -->
-				<?php $this->showFooter();?>
+		<!-- footer -->
+		<?php $this->showFooter();?>

-			<!-- Fin du site -->
-			<?php echo $this->getData(['theme', 'footer', 'position']) === 'site'? '</div>' : '';?>
+		<!-- Fin du site -->
+		<?php echo $this->getData(['theme', 'footer', 'position']) === 'site'? '</div>' : '';

-		<!-- fin de la div main_screenshot et bouton screenshot -->
-		<?php if( isset ($_SESSION['screenshot'] )){
-			if( $_SESSION['screenshot'] === 'on'){ ?>
-				</div>
-				<div><button id="screenshot" class="buttonScreenshot" type="button" ><img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div>
-		<?php }}?>
+		// fin de la div main_screenshot et bouton screenshot
+		if( isset($_SESSION['screenshot'] ) && $_SESSION['screenshot'] === 'on' ){ 	?>	</div><div><button id="screenshot" class="buttonScreenshot" type="button" >
+		<img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div> <?php } ?>

 		<!-- Lien remonter en haut -->
 		<div id="backToTop"><?php echo template::ico('up'); ?></div>
+		
 		<!-- Affichage du consentement aux cookies-->
 		<?php $this->showCookies(); ?>
+		
 		<!-- Les scripts -->
-		<?php $this->showVendor('jsbody'); ?>
-		<?php $this->showScript();?>
+		<?php $this->showVendor('jsbody');
+		$this->showScript();?>
 	</body>
 </html>
--- a/core/layout/mediaqueries.css
+++ b/core/layout/mediaqueries.css
@ -1,25 +1,10 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /*					Ecrans >= 800px					*/

@media (min-width: 800px) {
-	body {
-	   margin: 0;
-	}
 /* Barre de membre */
 	#bar #barLeft {
 	   float: left;
@ -29,9 +14,6 @@
 	   font-size: 12px;
 	}
 /* Bannière */
-	body > header {
-	   margin: 0;
-	}
 	header {
 	   margin: 0;
 	}
@ -255,6 +237,10 @@
 	.bannerDisplay {
 	   display: none;
 	}
+/* Largeur du menu */
+	.navBodyWidth {
+		width: 100%;
+	}
 }

 /*					Autres tailles d'écrans					*/
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@ -5,7 +5,7 @@
 * For full copyright and license information, please see the LICENSE
 * file that was distributed with this source code.
 * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @copyright Copyright (C) 2021, Sylvain Lelièvre
 * @license GNU General Public License, version 3
 * @link https://deltacms.fr/
 *
--- a/core/module/addon/view/import/import.css
+++ b/core/module/addon/view/import/import.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/addon/view/index/index.css
+++ b/core/module/addon/view/index/index.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/addon/view/index/index.js.php
+++ b/core/module/addon/view/index/index.js.php
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /**
--- a/core/module/addon/view/item/item.css
+++ b/core/module/addon/view/item/item.css
@ -1,16 +1,4 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

--- a/core/module/addon/view/store/store.css
+++ b/core/module/addon/view/store/store.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/addon/view/upload/upload.css
+++ b/core/module/addon/view/upload/upload.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@ -5,7 +5,7 @@
 * For full copyright and license information, please see the LICENSE
 * file that was distributed with this source code.
 * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @copyright Copyright (C) 2021, Sylvain Lelièvre
 * @license GNU General Public License, version 3
 * @link https://deltacms.fr/
 *
--- a/core/module/config/lang/en/lex_config.php
+++ b/core/module/config/lang/en/lex_config.php
@ -155,6 +155,7 @@ $text['core_config_view']['setup'][38] = "Transmission of a malfunction";
 $text['core_config_view']['setup'][39] = "1 - Log in or register at ";
 $text['core_config_view']['setup'][40] = "2 - In Configuration or Modules create a new topic, explain your problem";
 $text['core_config_view']['setup'][41] = "3 - Copy and paste the information into your post";
+$text['core_config_view']['setup'][42] = "Do you confirm the upgrade of DeltaCMS to the version ";
 $text['core_config_view']['social'][0] = 'Settings';
 $text['core_config_view']['social'][1] = 'Disable Open Graph capture mode';
 $text['core_config_view']['social'][2] = 'Enable Open Graph capture mode';
--- a/core/module/config/lang/fr/lex_config.php
+++ b/core/module/config/lang/fr/lex_config.php
@ -155,6 +155,7 @@ $text['core_config_view']['setup'][38] = "Transmission d'un dysfonctionnement";
 $text['core_config_view']['setup'][39] = "1 - Connectez-vous ou inscrivez-vous sur ";
 $text['core_config_view']['setup'][40] = "2 - Dans Configuration ou Modules créez un nouveau sujet, expliquez votre problème";
 $text['core_config_view']['setup'][41] = "3 - Copiez puis collez les informations dans votre message";
+$text['core_config_view']['setup'][42] = "Confirmez-vous la mise à jour de DeltaCMS vers la version ";
 $text['core_config_view']['social'][0] = 'Paramètres';
 $text['core_config_view']['social'][1] = 'Désactiver le mode de capture Open Graph';
 $text['core_config_view']['social'][2] = 'Activer le mode de capture Open Graph';
--- a/core/module/config/view/backup/backup.css
+++ b/core/module/config/view/backup/backup.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /** NE PAS EFFACER
--- a/core/module/config/view/backup/backup.js.php
+++ b/core/module/config/view/backup/backup.js.php
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 $( document).ready(function() {
--- a/core/module/config/view/index/index.css
+++ b/core/module/config/view/index/index.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/config/view/index/index.js.php
+++ b/core/module/config/view/index/index.js.php
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 $( document).ready(function() {
@ -300,3 +288,12 @@ $("#buttonHtmlToClipboard").on("click", function() {
    document.execCommand("copy");
    document.body.removeChild(infoTextarea);
 });
+
+// Confirmation d'update
+$(".configUpdate").on("click", function() {
+	var _this = $(this);
+	return core.confirm(textConfirm, function() {
+		$(location).attr("href", _this.attr("href"));
+	});
+});
+
--- a/core/module/config/view/restore/restore.css
+++ b/core/module/config/view/restore/restore.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/config/view/restore/restore.js.php
+++ b/core/module/config/view/restore/restore.js.php
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 $( document).ready(function() {
--- a/core/module/config/view/script/script.css
+++ b/core/module/config/view/script/script.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */


--- a/core/module/config/view/setup/setup.php
+++ b/core/module/config/view/setup/setup.php
@ -67,10 +67,10 @@ include('./core/module/config/lang/'. $this->getData(['config', 'i18n', 'langAdm
 				</div>
 				<?php 
 				if( $this->getData(['config', 'autoUpdate']) === true){
-					$updateError = helper::urlGetContents(common::DELTA_UPDATE_URL . common::DELTA_UPDATE_CHANNEL . '/version');
-					if( $updateError === false) $this->setData(['config', 'autoUpdate', false]);
+					$updateVersion = helper::urlGetContents(common::DELTA_UPDATE_URL . common::DELTA_UPDATE_CHANNEL . '/version');
+					if( $updateVersion === false) $this->setData(['config', 'autoUpdate', false]);
 				} else {
-					$updateError = false;
+					$updateVersion = false;
 				}?>
 				<div class="row">
 					<div class="col4">
@ -83,16 +83,16 @@ include('./core/module/config/lang/'. $this->getData(['config', 'i18n', 'langAdm
 						<?php echo template::checkbox('configAutoUpdateHtaccess', true, $text['core_config_view']['setup'][15], [
 								'checked' => $this->getData(['config', 'autoUpdateHtaccess']),
 								'help' => $text['core_config_view']['setup'][16],
-								'disabled' => !$updateError
+								'disabled' => !$updateVersion
 							]); ?>
 					</div>
 					<div class="col2 offset1">
 						<?php echo template::button('configUpdateForced', [
 							'ico' => 'download-cloud',
-							'href' => helper::baseUrl() . 'install/update',
+							'href' => $updateVersion === false ? 'javascript:void(0);' : helper::baseUrl() . 'install/update',
 							'value' => $text['core_config_view']['setup'][17],
-							'class' => 'buttonRed',
-							'disabled' => !$updateError
+							'class' => $updateVersion === false ? 'buttonRed' : 'configUpdate buttonRed',
+							'disabled' => !$updateVersion
 						]); ?>
 					</div>
 				</div>
@ -255,3 +255,6 @@ include('./core/module/config/lang/'. $this->getData(['config', 'i18n', 'langAdm
 		</div>
 	</div>
 </div>
+<script>
+	var textConfirm = <?php echo '"'.$text['core_config_view']['setup'][42].$updateVersion.' ?"'; ?>;
+</script>
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@ -5,7 +5,7 @@
 * For full copyright and license information, please see the LICENSE
 * file that was distributed with this source code.
 * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @copyright Copyright (C) 2021, Sylvain Lelièvre
 * @license GNU General Public License, version 3
 * @link https://deltacms.fr/
 *
--- a/core/module/install/ressource/database_en/base/module.json
+++ b/core/module/install/ressource/database_en/base/module.json
@ -141,7 +141,7 @@
                "logoUrl": "",
                "logoWidth": "40",
                "maxSizeUpload": "500000",
-                "versionData": "4.7",
+                "versionData": "4.8",
                "uploadJpg": true,
                "uploadPng": true,
                "uploadPdf": false,
--- a/core/module/install/ressource/database_fr/base/module.json
+++ b/core/module/install/ressource/database_fr/base/module.json
@ -141,7 +141,7 @@
                "logoUrl": "",
                "logoWidth": "40",
                "maxSizeUpload": "1000000",
-                "versionData": "4.7",
+                "versionData": "4.8",
                "uploadJpg": true,
                "uploadPng": true,
                "uploadPdf": false,
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@ -69,7 +69,7 @@ class init extends common {
 			]
 		],
 		'core' => [
-			'dataVersion' => 4405,
+			'dataVersion' => 4406,
 			'lastBackup' => 0,
 			'lastClearTmp' => 0,
 			'lastAutoUpdate' => 0,
@ -372,7 +372,9 @@ class init extends common {
 				'burgerFontSize' => '1.5em',
 				'burgerTextColor' => '#DDD',
 				'minWidthTab' => 'auto',
-				'minWidthParentOrAll' => false				
+				'minWidthParentOrAll' => false,
+				'widthLogo' => '30px',
+				'heightLogo' => 'auto'
 			],
 			'site' => [
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
--- a/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip
+++ b/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip
--- a/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip
+++ b/core/module/install/ressource/themes/theme_sombre_islande_fluide.zip
--- a/core/module/install/view/index/index.js.php
+++ b/core/module/install/view/index/index.js.php
@ -1,18 +1,6 @@

 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric Tempez
 */

 /**
--- a/core/module/install/view/update/update.css
+++ b/core/module/install/view/update/update.css
@ -1,17 +1,5 @@
 /**
 * This file is part of DeltaCMS.
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- * @author Sylvain Lelièvre <lelievresylvain@free.fr>
- * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
- * @license GNU General Public License, version 3
- * @link https://deltacms.fr/
- *
- * Delta was created from version 11.2.00.24 of ZwiiCMS
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2021, Frédéric