Merge branch '10500' into 11000

2021-02-17 08:51:39 +01:00 · 2021-02-17 08:51:39 +01:00 · 8a3d876e8f
commit 8a3d876e8f
parent 0dc4420bff 688c923214
42 changed files with 733 additions and 285 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -10,6 +10,19 @@
    - Configuration du site :
        - Activation et désactivation de la déconnexion automatique empêchant plusieurs sessions avec le même compte.

+## version 10.4.03
+- Corrections :
+    - En-tête html : absence de la langue.
+    - Suppression de la balise sémantique <article>.
+    - Génération image Opengraph, mauvaise redirection.
+    - Nouvelle structure de données articles de blog dans le sitemap.
+
+## version 10.4.02
+- Corrections :
+    - Thème : aperçu du site amélioré.
+    - Thème : rétablissement du contrôle de l'import d'une version ancienne d'un thème.
+    - Éditeur de texte : couleur de fond parasite quand une image en arrière-plan est sélectionnée.
+
 ## version 10.4.01
 Corrections :
    - Module form, erreur de syntaxe.
@ -69,7 +82,7 @@ Correction :
 Corrections :
    - Conflit page inactive et droit d'un membre.
    - Module de recherche, correction dans les pages enfants.
-    - Module formulaire, perte des données en cas d'édition du fomulaire ou des champs.
+    - Module formulaire, perte des données en cas d'édition du formulaire ou des champs.
 Modification :
    - TinyMCE nettoyage init.js d'options non supportées.

@ -77,7 +90,7 @@ Modification :
 Corrections :
    - Configuration : persistance de l'ouverture des blocs.
    - Réinitialisation du mot de passe :
-        - Remise à zéro du timer après renouvèlement du mot de passe.
+        - Remise à zéro du timer après renouvellement du mot de passe.
        - Affichage de le fenêtre "Nouveau mot de passe" allégée.
        - Redirection sur la page d'accueil.
    - Modules news et blog : transparence icône RSS.
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@

-# ZwiiCMS 10.4.00
+# ZwiiCMS 10.4.03

 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.

--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@ -1,4 +1,5 @@
 <?php
+
 class helper {

 	/** Statut de la réécriture d'URL (pour éviter de lire le contenu du fichier .htaccess à chaque self::baseUrl()) */
@ -19,7 +20,7 @@ class helper {



-	/** 
+	/**
 	 * Récupérer l'adresse IP sans tenit compte du proxy
 	 * @return string IP adress
 	 * Cette focntion est utilisé par user
@ -127,6 +128,72 @@ class helper {
 		return ($fileName);
 	}

+
+
+	/**
+	 * Retourne la liste des modules installés dans un tableau composé
+	 * du nom réel
+	 * du numéro de version
+	 */
+	public  static function getModules() {
+		$modules = array();
+		$dirs = array_diff(scandir('module'), array('..', '.'));
+		foreach ($dirs as $key => $value) {
+			// Dossier non vide
+			if (file_exists('module/' . $value . '/' . $value . '.php')) {
+				// Lire les constantes en gérant les erreurs de nom de classe
+				try  {
+					$class_reflex = new \ReflectionClass($value);
+					$class_constants = $class_reflex->getConstants();
+					// Constante REALNAME
+					if (array_key_exists('REALNAME', $class_constants)) {
+							$realName = $value::REALNAME;
+					} else {
+							$realName = ucfirst($value);
+					}
+					// Constante VERSION
+					if (array_key_exists('VERSION', $class_constants)) {
+							$version = $value::VERSION;
+					} else {
+							$version = '0.0';
+					}
+					// Constante UPDATE
+					if (array_key_exists('UPDATE', $class_constants)) {
+							$update = $value::UPDATE;
+					} else {
+							$update = false;
+					}
+					// Constante DELETE
+					if (array_key_exists('DELETE', $class_constants)) {
+							$delete = $value::DELETE;
+					} else {
+							$delete = false;
+					}
+					// Constante DATADIRECTORY
+					if (array_key_exists('DATADIRECTORY', $class_constants)) {
+							$dataDirectory= $value::DATADIRECTORY;
+					} else {
+							$dataDirectory = '';
+					}
+					// Affection
+					$modules [$value]  = [
+					'realName' => $realName,
+					'version' => $version,
+					'update' => $update,
+					'delete' => $delete,
+					'dataDirectory' => $dataDirectory
+					];
+
+				} catch (Exception $e){
+					//  on ne fait rien
+				}
+			}
+		}
+		return($modules);
+	}
+
+
+
 	/**
 	 * Retourne true si le protocole est en TLS
 	 * @return bool
@ -504,4 +571,4 @@ class helper {
 		return openssl_decrypt($encrypted_data, 'aes-256-cbc', $key, 0, $iv);
 	}

-}
+}
--- a/core/core.php
+++ b/core/core.php
@ -56,7 +56,8 @@ class common {
 		'sitemap',
 		'theme',
 		'user',
-		'translate'
+		'translate',
+		'addon'
 	];
 	public static $accessList = [
 		'user',
@ -799,6 +800,16 @@ class common {
 			if ($this->getData(['page', $parentPageId, 'disable']) !== true ) {
 				$sitemap->addUrl ($parentPageId,$datetime);
 			}
+			// Articles du blog
+			if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog' &&
+				!empty($this->getData(['module',$parentPageId])) ) {
+				foreach($this->getData(['module',$parentPageId,'posts']) as $articleId => $article) {
+					if($this->getData(['module',$parentPageId,'posts',$articleId,'state']) === true) {
+						$date = $this->getData(['module',$parentPageId,'posts',$articleId,'publishedOn']);
+						$sitemap->addUrl( $parentPageId . '/' . $articleId , new DateTime("@{$date}",new DateTimeZone($timezone)));
+					}
+				}
+			}
 			// Sous-pages
 			foreach($childrenPageIds as $childKey) {
 				if ($this->getData(['page',$childKey,'group']) !== 0 || $this->getData(['page', $childKey, 'disable']) === true)  {
@ -809,24 +820,15 @@ class common {
 				// La sous-page est un blog
 				if ($this->getData(['page', $childKey, 'moduleId']) === 'blog' &&
 				   !empty($this->getData(['module',$childKey])) ) {
-					foreach($this->getData(['module',$childKey]) as $articleId => $article) {
-						if($this->getData(['module',$childKey,$articleId,'state']) === true) {
-							$date = $this->getData(['module',$childKey,$articleId,'publishedOn']);
+					foreach($this->getData(['module',$childKey,'posts']) as $articleId => $article) {
+						if($this->getData(['module',$childKey,'posts',$articleId,'state']) === true) {
+							$date = $this->getData(['module',$childKey,'posts',$articleId,'publishedOn']);
 							$sitemap->addUrl( $childKey . '/' . $articleId , new DateTime("@{$date}",new DateTimeZone($timezone)));
 						}
 					}
 				}
 			}
-			// Articles du blog
-			if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog' &&
-				!empty($this->getData(['module',$parentPageId])) ) {
-				foreach($this->getData(['module',$parentPageId]) as $articleId => $article) {
-					if($this->getData(['module',$parentPageId,$articleId,'state']) === true) {
-						$date = $this->getData(['module',$parentPageId,$articleId,'publishedOn']);
-						$sitemap->addUrl( $parentPageId . '/' . $articleId , new DateTime("@{$date}",new DateTimeZone($timezone)));
-					}
-				}
-			}
+
 		}

 		// generating internally a sitemap
@ -1005,8 +1007,7 @@ class common {
 				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5],$keys[6], true);
 				break;
 			case 8:
-				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6],$keys[7] );
-				$db->save();
+				$db->set($keys[0].'.'.$keys[1].'.'.$keys[2].'.'.$keys[3].'.'.$keys[4].'.'.$keys[5].'.'.$keys[6],$keys[7], true );
 				break;
 		}
 		return true;
@ -1042,11 +1043,11 @@ class common {
 	* @param string URL du dossier à supprimer
 	*/
 	public function removeDir ( $path ) {
-		foreach ( new DirectoryIterator($path) as $item ):
-			if ( $item->isFile() ) unlink($item->getRealPath());
+		foreach ( new DirectoryIterator($path) as $item ) {
+			if ( $item->isFile() ) @unlink($item->getRealPath());
 			if ( !$item->isDot() && $item->isDir() ) $this->removeDir($item->getRealPath());
-		endforeach;
-		rmdir($path);
+		}
+		return ( rmdir($path) );
 	}

 	/**
@ -1714,15 +1715,18 @@ class core extends common {
 			} else {
 				// Pas d'image couleur du body
 				$css .= 'html{background-color:' . $colors['normal'] . ';}';
+				// Même couleur dans le fond de l'éditeur
+				$css .= 'div.mce-edit-area{background-color:' . $colors['normal'] . ' !important}';
 			}
 			// Icône BacktoTop
 			$css .= '#backToTop {background-color:' .$this->getData(['theme', 'body', 'toTopbackgroundColor']). ';color:'.$this->getData(['theme', 'body', 'toTopColor']).';}';
 			// Site
 			$colors = helper::colorVariants($this->getData(['theme', 'text', 'linkColor']));
 			$css .= 'a{color:' . $colors['normal'] . '}';
-			// Fond TinyMCe
-			$css .= 'div.mce-edit-area{background-color:' . $colors['normal'] . ' !important}';
-			$css .= 'div.mce-edit-area{background-color:' . $colors['normal'] . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'text', 'font'])) . '",sans-serif}';
+			// Couleurs de site dans TinyMCe
+			$css .= 'div.mce-edit-area{font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'text', 'font'])) . '",sans-serif}';
+			// Site dans TinyMCE
+			$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
 			//$css .= 'a:hover:not(.inputFile, button){color:' . $colors['darken'] . '}';
 			$css .= 'body,.row > div{font-size:' . $this->getData(['theme', 'text', 'fontSize']) . '}';
 			$css .= 'body{color:' . $this->getData(['theme', 'text', 'textColor']) . '}';
@ -1736,7 +1740,6 @@ class core extends common {
 			$css .= $this->getData(['theme', 'site', 'width']) === '100%' ? '#site.light{margin:5% auto !important;}#site{margin:0 auto !important;} body{margin:0 auto !important;}  #bar{margin:0 auto !important;} body > header{margin:0 auto !important;} body > nav {margin: 0 auto !important;} body > footer {margin:0 auto !important;}': "#site.light{margin: 5% auto !important;}#site{margin: " . $margin . " auto !important;} body{margin:0px 10px;}  #bar{margin: 0 -10px;} body > header{margin: 0 -10px;} body > nav {margin: 0 -10px;} body > footer {margin: 0 -10px;} ";
 			$css .= $this->getData(['theme', 'site', 'width']) === '750px' ? '.button, button{font-size:0.8em;}' : '';
 			$css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}';
-			$css .= '.editorWysiwyg {background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';}';
 			$colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor']));
 			$css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}';
 			$css .= '.helpButton span{color:' . $colors['normal'] . '}';
@ -3002,6 +3005,7 @@ class layout extends common {
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'user" data-tippy-content="Configurer les utilisateurs">' . template::ico('users') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'theme" data-tippy-content="Personnaliser les thèmes">' . template::ico('brush') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'translate" data-tippy-content="Gestion des langues">' . template::ico('flag') . '</a></li>';
+				$rightItems .= '<li><a href="' . helper::baseUrl() . 'addon" data-tippy-content="Gérer les modules">' . template::ico('puzzle') . '</a></li>';
 				$rightItems .= '<li><a href="' . helper::baseUrl() . 'config" data-tippy-content="Configurer le site">' . template::ico('cog-alt') . '</a></li>';
 				// Mise à jour automatique
 				$today = mktime(0, 0, 0);
--- a/core/layout/main.php
+++ b/core/layout/main.php
@ -1,7 +1,6 @@
-<?php $layout = new layout($this);
-$lan = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); ?>
+<?php $layout = new layout($this);?>
 <!DOCTYPE html>
-<html prefix="og: http://ogp.me/ns#" lang="<?php echo $lan;?>">
+<html prefix="og: http://ogp.me/ns#" lang="fr">
 	<head>
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@ -0,0 +1,291 @@
+<?php
+
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @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-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+class addon extends common {
+
+	public static $actions = [
+		'index' => self::GROUP_ADMIN,
+		'moduleDelete' => self::GROUP_ADMIN
+	];
+
+	// Gestion des modules
+	public static $modInstal = [];
+
+	// pour tests
+	public static $valeur = [];
+
+	/*
+	* Effacement d'un module installé et non utilisé
+	*/
+	public function moduleDelete() {
+
+		// Jeton incorrect
+		if ($this->getUrl(3) !== $_SESSION['csrf']) {
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl()  . 'addon',
+				'state' => false,
+				'notification' => 'Action non autorisée'
+			]);
+		}
+		else{
+			// Suppression des dossiers
+			if( $this->removeDir('./module/'.$this->getUrl(2) ) === true){
+				$success = true;
+				$notification = 'Module '.$this->getUrl(2) .' effacé du dossier /module/, il peut rester des données dans d\'autres dossiers';
+			}
+			else{
+				$success = false;
+				$notification = 'La suppression a échouée';
+			}
+			// Valeurs en sortie
+			$this->addOutput([
+				'redirect' => helper::baseUrl() . 'addon',
+				'notification' => $notification,
+				'state' => $success
+			]);
+		}
+	}
+
+
+	/**
+	 * Gestion des modules
+	 */
+	public function index() {
+
+		// Lister les modules
+		// $infoModules[nom_module]['realName'], ['version'], ['update'], ['delete'], ['dataDirectory']
+		$infoModules = helper::getModules();
+
+		// Clés moduleIds dans les pages
+		$inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC');
+		foreach( $inPages as $key=>$value){
+			$inPagesTitle[ $this->getData(['page', $key, 'title' ]) ] = $value;
+		}
+
+		// Parcourir les données des modules
+		foreach ($infoModules as $key=>$value) {
+			// Construire le tableau de sortie
+			self::$modInstal[] = [
+				$key,
+				$infoModules[$key]['realName'],
+				$infoModules[$key]['version'],
+				implode(', ', array_keys($inPagesTitle,$key)),
+				array_key_exists('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) ===''
+											? template::button('moduleDelete' . $key, [
+													'class' => 'moduleDelete buttonRed',
+													'href' => helper::baseUrl() . $this->getUrl(0) . '/moduleDelete/' . $key . '/' . $_SESSION['csrf'],
+													'value' => template::ico('cancel')
+												])
+											: '',
+				array_key_exists('dataDirectory',$infoModules[$key])  && $infoModules[$key]['dataDirectory'] !== ''
+											? template::button('moduleExport' . $key, [
+												'class' => 'buttonBlue',
+												'href' => helper::baseUrl(false).$this->exportZip( $key ),
+												'value' => template::ico('upload')
+												])
+											: ''
+			];
+		}
+
+		// Retour du formulaire ?
+		if($this->isPost()) {
+			// Installation d'un module
+			$success = true;
+			$checkValidMaj = $this->getInput('configModulesCheck', helper::FILTER_BOOLEAN);
+			$zipFilename =	$this->getInput('configModulesInstallation', helper::FILTER_STRING_SHORT);
+			if( $zipFilename !== ''){
+				$tempFolder = 'datamodules';//uniqid();
+				$zip = new ZipArchive();
+				if ($zip->open(self::FILE_DIR.'source/'.$zipFilename) === TRUE) {
+					$notification = 'Archive ouverte';
+					mkdir (self::TEMP_DIR . $tempFolder);
+					$zip->extractTo(self::TEMP_DIR . $tempFolder );
+					// Archive de module ?
+					$success = false;
+					$notification = 'Ce n\'est pas l\'archive d\'un module !';
+					$moduleDir = self::TEMP_DIR . $tempFolder . '/module';
+					$moduleName = '';
+					if ( is_dir( $moduleDir )) {
+						// Lire le nom du module
+						if ($dh = opendir( $moduleDir )) {
+							while (($file = readdir($dh)) !== false) {
+								$moduleName = $file;
+							}
+							closedir($dh);
+						}
+						// Module normalisé ?
+						if( is_file( $moduleDir.'/'.$moduleName.'/'.$moduleName.'.php' ) AND is_file( $moduleDir.'/'.$moduleName.'/view/index/index.php' ) ){
+
+							// Lecture de la version du module pour validation de la mise à jour
+							// Pour une version <= version installée l'utilisateur doit cocher 'Mise à jour forcée'
+							$version = '0.0';
+							$file = file_get_contents( $moduleDir.'/'.$moduleName.'/'.$moduleName.'.php');
+							$file = str_replace(' ','',$file);
+							$file = str_replace("\t",'',$file);
+							$pos1 = strpos($file, 'constVERSION');
+							if( $pos1 !== false){
+								$posdeb = strpos($file, "'", $pos1);
+								$posend = strpos($file, "'", $posdeb + 1);
+								$version = substr($file, $posdeb + 1, $posend - $posdeb - 1);
+							}
+
+							// Module déjà installé ?
+							$moduleInstal = false;
+							foreach( self::$modInstal as $key=>$value){
+								if($moduleName === $value[0]){
+									$moduleInstal = true;
+								}
+							}
+
+							// Validation de la maj si autorisation du concepteur du module ET
+							// ( Version plus récente OU Check de forçage )
+							$valNewVersion = floatval($version);
+							$valInstalVersion = floatval( $infoModules[$moduleName]['version'] );
+							$newVersion = false;
+							if( $valNewVersion > $valInstalVersion ) $newVersion = true;
+							$validMaj = $infoModules[$moduleName]['update'] && ( $newVersion || $checkValidMaj);
+
+							// Nouvelle installation ou mise à jour du module
+							if( ! $moduleInstal ||  $validMaj ){
+								// Copie récursive des dossiers
+								$this -> custom_copy( self::TEMP_DIR . $tempFolder, './' );
+								$success = true;
+								if( ! $moduleInstal ){
+									$notification = 'Module '.$moduleName.' installé';
+								}
+								else{
+									$notification = 'Module '.$moduleName.' mis à jour';
+								}
+							}
+							else{
+								$success = false;
+								if( $valNewVersion == $valInstalVersion){
+									$notification = ' Version détectée '.$version.' = à celle installée '.$infoModules[$moduleName]['version'];
+								}
+								else{
+									$notification = ' Version détectée '.$version.' < à celle installée '.$infoModules[$moduleName]['version'];
+								}
+								if( $infoModules[$moduleName]['update'] === false){
+									$notification = ' Mise à jour par ce procédé interdite par le concepteur du module';
+								}
+							}
+						}
+					}
+					// Supprimer le dossier temporaire même si le module est invalide
+					$this->removeDir(self::TEMP_DIR . $tempFolder);
+					$zip->close();
+				} else {
+					// erreur à l'ouverture
+					$success = false;
+					$notification = 'Impossible d\'ouvrir l\'archive';
+				}
+			}
+
+			$this->addOutput([
+				'redirect' => helper::baseUrl() . $this->getUrl(),
+				'notification' => $notification,
+				'state' => $success
+			]);
+		}
+
+		// Valeurs en sortie
+		$this->addOutput([
+			'title' => 'Gestion des modules',
+			'view' => 'index'
+		]);
+	}
+
+	/*
+	* Copie récursive de dossiers
+	*
+	*/
+	private function custom_copy($src, $dst) {
+		// open the source directory
+		$dir = opendir($src);
+		// Make the destination directory if not exist
+		if (!is_dir($dst)) {
+			mkdir($dst);
+		}
+		// Loop through the files in source directory
+		while( $file = readdir($dir) ) {
+			if (( $file != '.' ) && ( $file != '..' )) {
+				if ( is_dir($src . '/' . $file) ){
+					// Recursively calling custom copy function
+					// for sub directory
+					$this -> custom_copy($src . '/' . $file, $dst . '/' . $file);
+				}
+				else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
+
+	/*
+	* Création récursive d'un zip
+	* https://makitweb.com/how-to-create-and-download-a-zip-file-with-php/
+	*/
+	private function createZip($zip,$dir){
+		if (is_dir($dir)){
+			if ($dh = opendir($dir)){
+				while (($file = readdir($dh)) !== false){
+					// If file
+					if (is_file($dir.$file)) {
+						if($file != '' && $file != '.' && $file != '..'){
+						   $zip->addFile($dir.$file);
+						}
+					}
+					else{
+						// If directory
+						if(is_dir($dir.$file) ){
+							if($file != '' && $file != '.' && $file != '..'){
+								// Add empty directory
+								$zip->addEmptyDir($dir.$file);
+								$folder = $dir.$file.'/';
+								// Read data of the folder
+								$this->createZip($zip,$folder);
+							}
+						}
+					}
+				}
+				closedir($dh);
+			}
+		}
+	}
+
+	/*
+	* Export des données d'un module externes à module.json
+	*/
+	private function exportZip( $exportModule ){
+			$infoModules = helper::getModules();
+			// création du zip
+			$zip = new ZipArchive();
+			if( ! is_dir('tmp/exportDataModules')) mkdir('tmp/exportDataModules',0777, true);
+			$filename = 'tmp/exportDataModules/'.$exportModule.'dataExport.zip';
+			if( is_file( $filename )) unlink( $filename);
+			$directory = $infoModules[$exportModule]['dataDirectory'].'/';
+			if($zip->open( $filename, ZipArchive::CREATE) !== TRUE){
+				exit;
+			}
+			else{
+				$this->createZip($zip,$directory);
+				$zip->close();
+			}
+			return( $filename );
+	}
+}
--- a/core/module/addon/view/index/index.css
+++ b/core/module/addon/view/index/index.css
@ -0,0 +1,18 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @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-2020, Frédéric Tempez
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+
+/** NE PAS EFFACER
+* admin.css
+*/
--- a/core/module/addon/view/index/index.js.php
+++ b/core/module/addon/view/index/index.js.php
@ -0,0 +1,21 @@
+/**
+ * This file is part of Zwii.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @license GNU General Public License, version 3
+ * @link http://zwiicms.fr/
+ */
+
+/**
+ * Confirmation de suppression
+ */
+$(".moduleDelete").on("click", function() {
+	var _this = $(this);
+	return core.confirm("Êtes-vous sûr de vouloir supprimer, effacer ce module ?", function() {
+		$(location).attr("href", _this.attr("href"));
+	});
+});
--- a/core/module/addon/view/index/index.php
+++ b/core/module/addon/view/index/index.php
@ -0,0 +1,46 @@
+<?php echo template::formOpen('configModulesGestion'); ?>
+    <div class="row">
+        <div class="col2">
+            <?php echo template::button('configModulesBack', [
+                'class' => 'buttonGrey',
+                'href' => helper::baseUrl(),
+                'ico' => 'left',
+                'value' => 'Retour'
+            ]); ?>
+        </div>
+        <div class="col2 offset8">
+            <?php echo template::submit('configModulesSubmit',[
+                'value' => 'Valider',
+                'ico' => 'check'
+            ]); ?>
+        </div>
+    </div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+			<h4>Installer ou mettre à jour un module </h4>
+				<div class="row">
+					<div class="col6 offset3">
+						<?php echo template::file('configModulesInstallation', [
+								'label' => 'Archive ZIP :',
+								'type' => 2
+						]); ?>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::checkbox('configModulesCheck', true, 'Mise à jour forcée', [
+								'checked' => false,
+								'help' => 'Permet de forcer une mise à jour même si la version du module est inférieure ou égale à celle du module installé.',
+							]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php echo template::formClose(); ?>
+<?php if($module::$modInstal): ?>
+	<?php echo template::table([2, 3, 2, 3, 1, 1], $module::$modInstal, ['Module installé', 'Alias', 'Version', 'Page(s)', 'Supprimer', 'Exporter']); ?>
+<?php else: ?>
+	<?php echo template::speech('Aucun module installé.'); ?>
+<?php endif; ?>
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@ -30,7 +30,6 @@ class config extends common {
 		'logDownload'=> self::GROUP_ADMIN,
 		'blacklistReset' => self::GROUP_ADMIN,
 		'blacklistDownload' => self::GROUP_ADMIN
-
 	];

 	public static $timezones = [
@ -286,16 +285,20 @@ class config extends common {
 			$data = str_replace('_','/',$googlePagespeedData['lighthouseResult']['audits']['final-screenshot']['details']['data']);
 			$data = str_replace('-','+',$data);
 			$img = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data));
-			$success = file_put_contents( self::FILE_DIR.'source/screenshot.jpg',$img) ;
-			// Effacer la miniature png
-			if (file_exists(self::FILE_DIR.'source/screenshot.png')) {
-				unlink (self::FILE_DIR.'source/screenshot.png');
+			// Effacer l'image et la miniature png
+			if (file_exists(self::FILE_DIR.'thumb/screenshot.jpg')) {
+				unlink (self::FILE_DIR.'thumb/screenshot.jpg');
 			}
+			if (file_exists(self::FILE_DIR.'source/screenshot.jpg')) {
+				unlink (self::FILE_DIR.'source/screenshot.jpg');
+			}
+			$success = file_put_contents( self::FILE_DIR.'source/screenshot.jpg',$img) ;
+
 		}
 		// Valeurs en sortie
 		$this->addOutput([
 			'notification' => $success === false  ? 'Service inaccessible ou erreur d\'écriture de l\'image' : 'Image générée avec succès',
-			'redirect' => helper::baseUrl() . 'advanced',
+			'redirect' => helper::baseUrl() . 'config/advanced',
 			'state' => $success === false ? false : true
 		]);
 	}
@ -376,13 +379,6 @@ class config extends common {
 				$this->getInput('configManageImportUser', helper::FILTER_BOOLEAN) === true) {
 					$this->setData(['user',$users]);
 			}
-			/*
-			if ($version === '9' ) {
-				$this->importData($this->getInput('configManageImportUser', helper::FILTER_BOOLEAN));
-				$this->setData(['core','dataVersion',0]);
-			}*/
-
-			// Met à jours les URL dans les contenus de page

 			// Message de notification
 			$notification  = $success === true ? 'Restauration réalisée avec succès' : 'Erreur inconnue';
@ -453,12 +449,7 @@ class config extends common {
 				'state' => $success
 			]);
 		}
-		// Initialisation du screen - APPEL AUTO DESACTIVE POUR EVITER UN RALENTISSEMENT
-		/*
-		if (!file_exists(self::FILE_DIR.'source/screenshot.jpg')) {
-			$this->configMetaImage();
-		}
-		*/
+
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' => 'Configuration',
@ -585,9 +576,10 @@ class config extends common {
 			// Générer robots.txt et sitemap
 			$this->generateFiles();
 			// Valeurs en sortie
+			$notification = $notification . 'Modifications enregistrées';
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . $this->getUrl(),
-				'notification' => 'Modifications enregistrées',
+				'notification' => $notification,
 				'state' => $success
 			]);
 		}
@ -818,5 +810,4 @@ class config extends common {
 		}
 		return $newArray;
 	}
-
 }
--- a/core/module/config/view/advanced/advanced.php
+++ b/core/module/config/view/advanced/advanced.php
@ -516,4 +516,5 @@
 		</div>
 	</div>
 </div>
+
 <?php echo template::formClose(); ?>
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@ -29,15 +29,7 @@ class page extends common {
 		'' => 'Aucune'
 	];
 	public static $moduleIds = [];
-	// Nom des modules
-	public static $moduleNames = [
-		'news'			=> 'Nouvelles',
-		'blog' 			=> 'Blog',
-		'form' 			=> 'Formulaire',
-		'gallery' 		=> 'Galerie',
-		'redirection' 	=> 'Redirection',
-		'search'        => 'Recherche'
-	];
+
 	public static $typeMenu = [
 		'text' => 'Texte',
 		'icon' => 'Icône',
@ -449,22 +441,7 @@ class page extends common {
 					]);
 				}
 			}
-			// Liste des modules
-			$moduleIds = [];
-			$iterator = new DirectoryIterator('module/');
-			foreach($iterator as $fileInfos) {
-				if(is_file($fileInfos->getPathname() . '/' . $fileInfos->getFilename() . '.php')) {
-					if (array_key_exists($fileInfos->getBasename(),self::$moduleNames)) {
-						$moduleIds[$fileInfos->getBasename()] = self::$moduleNames[$fileInfos->getBasename()];
-					} else {
-						$moduleIds[$fileInfos->getBasename()] = ucfirst($fileInfos->getBasename());
-					}
-				}
-			}
-			self::$moduleIds = 	$moduleIds;
-			asort(self::$moduleIds);
-			self::$moduleIds = array_merge( ['' => 'Aucun'] , self::$moduleIds);
-			// Pages sans parent
+			self::$moduleIds = array_merge( ['' => 'Aucun'] , helper::arrayCollumn(helper::getModules(),'realName','SORT_ASC'));			// Pages sans parent
 			foreach($this->getHierarchy() as $parentPageId => $childrenPageIds) {
 				if($parentPageId !== $this->getUrl(2)) {
 					self::$pagesNoParentId[$parentPageId] = $this->getData(['page', $parentPageId, 'title']);
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
@ -54,7 +54,7 @@ echo template::formOpen('pageEditForm');
 								]); ?>
 								<?php echo template::hidden('pageEditModuleIdOld',['value' => $this->getData(['page', $this->getUrl(2), 'moduleId'])]); ?>
 								<?php echo template::hidden('pageEditModuleIdOldText',[
-									'value' => array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']),$module::$moduleNames)? $module::$moduleNames[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId']))
+									'value' => array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']),$module::$moduleIds)? $module::$moduleIds[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId']))
 								]); ?>
 							</div>
 							<div class="col3 verticalAlignBottom">
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@ -746,7 +746,6 @@ class theme extends common {
 					foreach ($itemKeys as $key2 => $value) {
 						// Données nulles ou vides instaurer la donnée par défaut
 						if ($this->getData(['theme',$key1,$key2]) ===  NULL
-							OR empty($this->getData(['theme',$key1,$key2]) )
 						) {
 							$this->setData(['theme',$key1,$key2,$value]);
 						}
@ -761,7 +760,6 @@ class theme extends common {
 				foreach ($itemKeys as $key1 => $value) {
 					// Données nulles ou vides instaurer la donnée par défaut
 					if ($this->getData(['admin',$key1]) ===  NULL
-						OR empty($this->getData(['admin',$key1]) )
 					) {
 						$this->setData(['admin',$key1,$value]);
 					}
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
@ -13,7 +13,7 @@
 /*
 * Chargement de l'aperçu
 */
-$(document).ready(function() {	
+$(document).ready(function() {

 	/**
 	* Option de marge si la taille n'est pas fluide
@ -34,7 +34,7 @@ $(document).ready(function() {
 /**
 * Aperçu en direct
 */
-$("input, select").on("change",function() {	
+$("input, select").on("change",function() {
 	previewDOM();
 });

@ -48,8 +48,8 @@ function previewDOM() {
 	var titleFont = $("#themeTitleFont").val();
 	var textFont = $("#themeTextFont").val();
 	var css = "@import url('https://fonts.googleapis.com/css?family=" + titleFont + "|" + textFont + "');";
-	// Couleurs des boutons		
-	var colors = core.colorVariants($("#themeButtonBackgroundColor").val());	
+	// Couleurs des boutons
+	var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
 	css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}";
 	css += ".button.buttonSubmitPreview:hover{background-color:" + colors.darken + "}";
 	css += ".button.buttonSubmitPreview{color:" + colors.text + ";}";
@ -90,16 +90,27 @@ function previewDOM() {
 	}
 	// Couleur du site, arrondi sur les coins du site et ombre sur les bords du site
 	//css += "#site{background-color:" + $("#themeSiteBackgroundColor").val() + ";border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
-	
-	css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";	
+
+	css += "#site{border-radius:" + $("#themeSiteRadius").val() + ";box-shadow:" + $("#themeSiteShadow").val() + " #212223}";
+
+	// Couleur ou image de fond
 	var backgroundImage = <?php echo json_encode(helper::baseUrl(false) . self::FILE_DIR . 'source/' . $this->getData(['theme','body','image'])); ?>;
-	var backgroundcolor = <?php echo json_encode($this->getdata(['theme','body','backgroundColor'])); ?>;						
-	css += "div.bodybackground{background-color:" +  backgroundcolor + "; background-image: url(" + backgroundImage + ");background-size:cover;}";
+	console.log(backgroundImage);
+	var backgroundcolor = <?php echo json_encode($this->getdata(['theme','body','backgroundColor'])); ?>;
+	if(backgroundImage) {
+		css += "div.bodybackground{background-image:url(" + backgroundImage + ");background-repeat:" + $("#themeBodyImageRepeat").val() + ";background-position:" + $("#themeBodyImagePosition").val() + ";background-attachment:" + $("#themeBodyImageAttachment").val() + ";background-size:" + $("#themeBodyImageSize").val() + "}";
+		css += "div.bodybackground{background-color:rgba(0,0,0,0);}";
+	}
+	else {
+		css += "div.bodybackground{background-image:none}";
+	}
+	css += '#backToTop {background-color:'  + backgroundcolor + ';color:' + $("#themeBodyToTopColor").val() + ';}';
+
 	css += "div.bgPreview{padding: 5px;background-color:" + $("#themeSiteBackgroundColor").val() + ";}";
-	
+
 	// Les blocs

-	var colors = core.colorVariants($("#themeBlockBackgroundColor").val());  
+	var colors = core.colorVariants($("#themeBlockBackgroundColor").val());
 	css += ".block.preview {padding: 20px 20px 10px;margin: 20px 0;	word-wrap: break-word;border-radius: 2px;border: 1px solid " + $("#themeBlockBorderColor").val() + ";}.block.preview h4.preview {background: "  + colors.normal + ";color:" + colors.text + ";margin: -20px -20px 10px -20px; padding: 10px;}";

 	/**
--- a/core/vendor/zwiico/css/zwiico-codes.css
+++ b/core/vendor/zwiico/css/zwiico-codes.css
@ -1,8 +1,5 @@

 .zwiico-plus-circled:before { content: '\2191'; } /* '↑' */
-.zwiico-flag:before { content: '\2691'; } /* '⚑' */
-.zwiico-mail:before { content: '\2709'; } /* '✉' */
-.zwiico-divide:before { content: '\e05b'; } /* '' */
 .zwiico-logout:before { content: '\e800'; } /* '' */
 .zwiico-plus:before { content: '\e801'; } /* '' */
 .zwiico-cancel:before { content: '\e802'; } /* '' */
@ -16,6 +13,7 @@
 .zwiico-folder:before { content: '\e80a'; } /* '' */
 .zwiico-users:before { content: '\e80b'; } /* '' */
 .zwiico-left:before { content: '\e80c'; } /* '' */
+.zwiico-mail:before { content: '\e80d'; } /* '' */
 .zwiico-user:before { content: '\e80e'; } /* '' */
 .zwiico-update:before { content: '\e80f'; } /* '' */
 .zwiico-home:before { content: '\e810'; } /* '' */
@ -38,6 +36,8 @@
 .zwiico-login:before { content: '\e821'; } /* '' */
 .zwiico-lock:before { content: '\e822'; } /* '' */
 .zwiico-mimi:before { content: '\e823'; } /* '' */
+.zwiico-divide:before { content: '\e824'; } /* '' */
+.zwiico-flag:before { content: '\e825'; } /* '' */
 .zwiico-spin:before { content: '\e831'; } /* '' */
 .zwiico-twitter:before { content: '\f099'; } /* '' */
 .zwiico-facebook:before { content: '\f09a'; } /* '' */
@ -48,6 +48,7 @@
 .zwiico-download-cloud:before { content: '\f0ed'; } /* '' */
 .zwiico-upload-cloud:before { content: '\f0ee'; } /* '' */
 .zwiico-code:before { content: '\f121'; } /* '' */
+.zwiico-puzzle:before { content: '\f12e'; } /* '' */
 .zwiico-youtube:before { content: '\f167'; } /* '' */
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
 .zwiico-brush:before { content: '\f1fc'; } /* '' */
--- a/core/vendor/zwiico/css/zwiico-embedded.css
+++ b/core/vendor/zwiico/css/zwiico-embedded.css
--- a/core/vendor/zwiico/css/zwiico-ie7-codes.css
+++ b/core/vendor/zwiico/css/zwiico-ie7-codes.css
@ -1,8 +1,5 @@

 .zwiico-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2191;&nbsp;'); }
-.zwiico-flag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2691;&nbsp;'); }
-.zwiico-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2709;&nbsp;'); }
-.zwiico-divide { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe05b;&nbsp;'); }
 .zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .zwiico-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .zwiico-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
@ -16,6 +13,7 @@
 .zwiico-folder { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
 .zwiico-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80b;&nbsp;'); }
 .zwiico-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80c;&nbsp;'); }
+.zwiico-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80d;&nbsp;'); }
 .zwiico-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80e;&nbsp;'); }
 .zwiico-update { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80f;&nbsp;'); }
 .zwiico-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe810;&nbsp;'); }
@ -38,6 +36,8 @@
 .zwiico-login { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe821;&nbsp;'); }
 .zwiico-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
 .zwiico-mimi { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe823;&nbsp;'); }
+.zwiico-divide { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe824;&nbsp;'); }
+.zwiico-flag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe825;&nbsp;'); }
 .zwiico-spin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe831;&nbsp;'); }
 .zwiico-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf099;&nbsp;'); }
 .zwiico-facebook { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09a;&nbsp;'); }
@ -48,6 +48,7 @@
 .zwiico-download-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ed;&nbsp;'); }
 .zwiico-upload-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ee;&nbsp;'); }
 .zwiico-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf121;&nbsp;'); }
+.zwiico-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12e;&nbsp;'); }
 .zwiico-youtube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf167;&nbsp;'); }
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16d;&nbsp;'); }
 .zwiico-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1fc;&nbsp;'); }
--- a/core/vendor/zwiico/css/zwiico-ie7.css
+++ b/core/vendor/zwiico/css/zwiico-ie7.css
@ -11,9 +11,6 @@
 }
 
 .zwiico-plus-circled { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2191;&nbsp;'); }
-.zwiico-flag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2691;&nbsp;'); }
-.zwiico-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#x2709;&nbsp;'); }
-.zwiico-divide { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe05b;&nbsp;'); }
 .zwiico-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .zwiico-plus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .zwiico-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
@ -27,6 +24,7 @@
 .zwiico-folder { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
 .zwiico-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80b;&nbsp;'); }
 .zwiico-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80c;&nbsp;'); }
+.zwiico-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80d;&nbsp;'); }
 .zwiico-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80e;&nbsp;'); }
 .zwiico-update { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80f;&nbsp;'); }
 .zwiico-home { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe810;&nbsp;'); }
@ -49,6 +47,8 @@
 .zwiico-login { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe821;&nbsp;'); }
 .zwiico-lock { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe822;&nbsp;'); }
 .zwiico-mimi { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe823;&nbsp;'); }
+.zwiico-divide { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe824;&nbsp;'); }
+.zwiico-flag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe825;&nbsp;'); }
 .zwiico-spin { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe831;&nbsp;'); }
 .zwiico-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf099;&nbsp;'); }
 .zwiico-facebook { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09a;&nbsp;'); }
@ -59,6 +59,7 @@
 .zwiico-download-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ed;&nbsp;'); }
 .zwiico-upload-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ee;&nbsp;'); }
 .zwiico-code { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf121;&nbsp;'); }
+.zwiico-puzzle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12e;&nbsp;'); }
 .zwiico-youtube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf167;&nbsp;'); }
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16d;&nbsp;'); }
 .zwiico-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1fc;&nbsp;'); }
--- a/core/vendor/zwiico/css/zwiico.css
+++ b/core/vendor/zwiico/css/zwiico.css
@ -1,11 +1,11 @@
@font-face {
  font-family: 'zwiico';
-  src: url('../font/zwiico.eot?96515118');
-  src: url('../font/zwiico.eot?96515118#iefix') format('embedded-opentype'),
-       url('../font/zwiico.woff2?96515118') format('woff2'),
-       url('../font/zwiico.woff?96515118') format('woff'),
-       url('../font/zwiico.ttf?96515118') format('truetype'),
-       url('../font/zwiico.svg?96515118#zwiico') format('svg');
+  src: url('../font/zwiico.eot?44489499');
+  src: url('../font/zwiico.eot?44489499#iefix') format('embedded-opentype'),
+       url('../font/zwiico.woff2?44489499') format('woff2'),
+       url('../font/zwiico.woff?44489499') format('woff'),
+       url('../font/zwiico.ttf?44489499') format('truetype'),
+       url('../font/zwiico.svg?44489499#zwiico') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
  @font-face {
    font-family: 'zwiico';
-    src: url('../font/zwiico.svg?96515118#zwiico') format('svg');
+    src: url('../font/zwiico.svg?44489499#zwiico') format('svg');
  }
 }
 */
@ -56,9 +56,6 @@
 }
 
 .zwiico-plus-circled:before { content: '\2191'; } /* '↑' */
-.zwiico-flag:before { content: '\2691'; } /* '⚑' */
-.zwiico-mail:before { content: '\2709'; } /* '✉' */
-.zwiico-divide:before { content: '\e05b'; } /* '' */
 .zwiico-logout:before { content: '\e800'; } /* '' */
 .zwiico-plus:before { content: '\e801'; } /* '' */
 .zwiico-cancel:before { content: '\e802'; } /* '' */
@ -72,6 +69,7 @@
 .zwiico-folder:before { content: '\e80a'; } /* '' */
 .zwiico-users:before { content: '\e80b'; } /* '' */
 .zwiico-left:before { content: '\e80c'; } /* '' */
+.zwiico-mail:before { content: '\e80d'; } /* '' */
 .zwiico-user:before { content: '\e80e'; } /* '' */
 .zwiico-update:before { content: '\e80f'; } /* '' */
 .zwiico-home:before { content: '\e810'; } /* '' */
@ -94,6 +92,8 @@
 .zwiico-login:before { content: '\e821'; } /* '' */
 .zwiico-lock:before { content: '\e822'; } /* '' */
 .zwiico-mimi:before { content: '\e823'; } /* '' */
+.zwiico-divide:before { content: '\e824'; } /* '' */
+.zwiico-flag:before { content: '\e825'; } /* '' */
 .zwiico-spin:before { content: '\e831'; } /* '' */
 .zwiico-twitter:before { content: '\f099'; } /* '' */
 .zwiico-facebook:before { content: '\f09a'; } /* '' */
@ -104,6 +104,7 @@
 .zwiico-download-cloud:before { content: '\f0ed'; } /* '' */
 .zwiico-upload-cloud:before { content: '\f0ee'; } /* '' */
 .zwiico-code:before { content: '\f121'; } /* '' */
+.zwiico-puzzle:before { content: '\f12e'; } /* '' */
 .zwiico-youtube:before { content: '\f167'; } /* '' */
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
 .zwiico-brush:before { content: '\f1fc'; } /* '' */
--- a/core/vendor/zwiico/font/zwiico.eot
+++ b/core/vendor/zwiico/font/zwiico.eot
--- a/core/vendor/zwiico/font/zwiico.svg
+++ b/core/vendor/zwiico/font/zwiico.svg
@ -1,19 +1,13 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2021 by original authors @ fontello.com</metadata>
 <defs>
 <font id="zwiico" horiz-adv-x="1000" >
 <font-face font-family="zwiico" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
 <glyph glyph-name="plus-circled" unicode="&#x2191;" d="M420 770q174 0 297-123t123-297-123-297-297-123-297 123-123 297 123 297 297 123z m52-470l200 0 0 102-200 0 0 202-102 0 0-202-202 0 0-102 202 0 0-202 102 0 0 202z" horiz-adv-x="840" />

-<glyph glyph-name="flag" unicode="&#x2691;" d="M179 707q0-40-36-61v-707q0-7-5-12t-13-6h-36q-7 0-12 6t-6 12v707q-35 21-35 61 0 30 21 51t50 21 51-21 21-51z m821-36v-425q0-14-7-22t-22-15q-120-65-206-65-34 0-69 12t-60 27-65 27-79 12q-107 0-259-81-10-5-19-5-14 0-25 10t-10 25v415q0 17 17 30 12 8 44 24 132 67 235 67 60 0 112-16t122-49q21-11 49-11 30 0 65 12t62 26 49 26 30 12q15 0 25-10t11-26z" horiz-adv-x="1000" />
-
-<glyph glyph-name="mail" unicode="&#x2709;" d="M929 11v428q-18-20-39-36-149-115-238-189-28-24-46-37t-48-28-57-13h-2q-26 0-57 13t-48 28-46 37q-88 74-238 189-21 16-39 36v-428q0-7 6-13t12-5h822q7 0 12 5t6 13z m0 586v14t-1 7-1 7-3 5-5 4-8 2h-822q-7 0-12-6t-6-12q0-94 83-159 107-84 223-176 4-3 20-17t25-21 25-17 28-16 24-5h2q11 0 24 5t28 16 25 17 25 21 20 17q116 92 224 176 30 24 56 65t26 73z m71 21v-607q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63v607q0 37 26 63t63 26h822q37 0 63-26t26-63z" horiz-adv-x="1000" />
-
-<glyph glyph-name="divide" unicode="&#xe05b;" d="M300 663q0 117 116 117 118 0 118-117t-118-118q-116 0-116 118z m0-625q0 117 116 117 118 0 118-117t-118-118q-116 0-116 118z m-300 312q0 43 30 73t74 31l625 0q44 0 74-31t31-73-31-73-74-31l-625 0q-44 0-74 31t-30 73z" horiz-adv-x="834" />
-
 <glyph glyph-name="logout" unicode="&#xe800;" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-26t-27-64v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />

 <glyph glyph-name="plus" unicode="&#xe801;" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" />
@ -40,6 +34,8 @@

 <glyph glyph-name="left" unicode="&#xe80c;" d="M357 600v-500q0-14-10-25t-26-11-25 11l-250 250q-10 11-10 25t10 25l250 250q11 11 25 11t26-11 10-25z" horiz-adv-x="357.1" />

+<glyph glyph-name="mail" unicode="&#xe80d;" d="M929 11v428q-18-20-39-36-149-115-238-189-28-24-46-37t-48-28-57-13h-2q-26 0-57 13t-48 28-46 37q-88 74-238 189-21 16-39 36v-428q0-7 6-13t12-5h822q7 0 12 5t6 13z m0 586v14t-1 7-1 7-3 5-5 4-8 2h-822q-7 0-12-6t-6-12q0-94 83-159 107-84 223-176 4-3 20-17t25-21 25-17 28-16 24-5h2q11 0 24 5t28 16 25 17 25 21 20 17q116 92 224 176 30 24 56 65t26 73z m71 21v-607q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63v607q0 37 26 63t63 26h822q37 0 63-26t26-63z" horiz-adv-x="1000" />
+
 <glyph glyph-name="user" unicode="&#xe80e;" d="M714 69q0-60-35-104t-84-44h-476q-49 0-84 44t-35 104q0 48 5 90t17 85 33 73 52 50 76 19q73-72 174-72t175 72q42 0 75-19t52-50 33-73 18-85 4-90z m-143 495q0-88-62-151t-152-63-151 63-63 151 63 152 151 63 152-63 62-152z" horiz-adv-x="714.3" />

 <glyph glyph-name="update" unicode="&#xe80f;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
@ -84,6 +80,10 @@

 <glyph glyph-name="mimi" unicode="&#xe823;" d="M909 286c0-241-203-436-454-436s-455 195-455 436 204 564 455 564 454-324 454-564z m-454 396c-141 0-255-114-255-254s114-255 255-255 254 114 254 255-114 254-254 254z m91-254c0-51-41-91-91-91s-91 40-91 91 40 90 91 90 91-40 91-90z" horiz-adv-x="909" />

+<glyph glyph-name="divide" unicode="&#xe824;" d="M300 663q0 117 116 117 118 0 118-117t-118-118q-116 0-116 118z m0-625q0 117 116 117 118 0 118-117t-118-118q-116 0-116 118z m-300 312q0 43 30 73t74 31l625 0q44 0 74-31t31-73-31-73-74-31l-625 0q-44 0-74 31t-30 73z" horiz-adv-x="834" />
+
+<glyph glyph-name="flag" unicode="&#xe825;" d="M179 707q0-40-36-61v-707q0-7-5-12t-13-6h-36q-7 0-12 6t-6 12v707q-35 21-35 61 0 30 21 51t50 21 51-21 21-51z m821-36v-425q0-14-7-22t-22-15q-120-65-206-65-34 0-69 12t-60 27-65 27-79 12q-107 0-259-81-10-5-19-5-14 0-25 10t-10 25v415q0 17 17 30 12 8 44 24 132 67 235 67 60 0 112-16t122-49q21-11 49-11 30 0 65 12t62 26 49 26 30 12q15 0 25-10t11-26z" horiz-adv-x="1000" />
+
 <glyph glyph-name="spin" unicode="&#xe831;" d="M46 144l0 0c0 0-1 0-1 0-8 18-15 37-21 55-6 19-11 38-15 58-19 99-8 203 35 298 3 6 10 8 15 5 1 0 2 0 2-1l0 0 80-59c5-3 6-9 4-14-5-12-9-25-12-37-4-13-7-26-9-40-11-67-3-137 23-201 2-5 0-10-4-13l0 0-80-56c-5-4-12-2-16 3-1 0-1 1-1 2l0 0z m120 574l0 0c0 1 0 1 0 1 15 13 30 25 46 37 16 11 33 22 51 31 89 50 192 72 297 60 6-1 10-6 10-13 0-1-1-1-1-2l0 0-31-94c-2-5-8-8-13-7-13 0-27 0-40 0-14-1-27-2-40-4-68-11-133-40-186-84-4-3-10-3-14 0l0 0-79 58c-5 3-6 11-2 16 0 0 1 1 2 1l0 0z m588 65l0 0c0 0 1 0 1 0 17-10 34-21 50-32 16-12 31-25 46-38 74-69 127-160 148-262 2-6-2-12-9-13-1 0-1 0-2 0l0 0-100 1c-5 0-10 4-11 9-3 13-8 26-12 38-5 12-10 25-17 36-31 61-78 113-137 150-5 3-6 8-5 13l0 0 31 92c2 6 9 9 15 7 1 0 2-1 2-1l0 0z m244-535l0 0c0 0 0 0 0 0-4-20-9-39-15-57-7-19-14-37-22-55-44-92-114-170-205-221-6-3-13-1-16 4 0 1-1 2-1 2l0 0-30 94c-2 6 1 12 6 14 11 7 22 15 32 23 11 9 21 18 30 27 49 48 84 109 101 176 2 5 6 8 11 8l0 0 98-1c6 0 11-5 11-11 0-1 0-2 0-3l0 0z m-438-395l0 0c0 0 0 0 0 0-20-2-40-3-60-3-20 0-40 1-59 4-102 12-198 54-276 125-5 4-5 11 0 16 0 0 1 1 1 1l0 0 81 58c5 3 12 2 16-2 10-8 20-16 32-23 11-7 22-14 34-20 62-31 131-45 200-41 6 0 10-3 12-8l0 0 29-92c2-6-1-12-7-14-1-1-2-1-3-1l0 0z" horiz-adv-x="1000" />

 <glyph glyph-name="twitter" unicode="&#xf099;" d="M904 622q-37-54-90-93 0-8 0-23 0-73-21-145t-64-139-103-117-144-82-181-30q-151 0-276 81 19-2 43-2 126 0 224 77-59 1-105 36t-64 89q19-3 34-3 24 0 48 6-63 13-104 62t-41 115v2q38-21 82-23-37 25-59 64t-22 86q0 49 25 91 68-83 164-133t208-55q-5 21-5 41 0 75 53 127t127 53q79 0 132-57 61 12 115 44-21-64-80-100 52 6 104 28z" horiz-adv-x="928.6" />
@ -104,6 +104,8 @@

 <glyph glyph-name="code" unicode="&#xf121;" d="M344 69l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13t-6-13z m330 596l-208-721q-2-7-9-11t-13-1l-34 9q-8 3-11 9t-2 14l209 720q2 8 8 11t13 2l35-10q7-2 11-9t1-13z m367-363l-260-261q-6-5-13-5t-13 5l-28 28q-5 6-5 13t5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13t-5-12z" horiz-adv-x="1071.4" />

+<glyph glyph-name="puzzle" unicode="&#xf12e;" d="M929 237q0-45-25-75t-69-30q-23 0-43 10t-33 21-32 21-39 10q-62 0-62-69 0-22 9-65t8-64v-3q-12 0-18 0-19-2-54-7t-65-7-54-3q-35 0-58 15t-23 47q0 20 9 39t22 32 21 33 10 43q0 44-31 69t-75 25q-47 0-80-26t-33-71q0-24 9-46t18-36 19-30 8-28q0-25-25-50-21-19-65-19-54 0-137 13-5 1-16 2t-15 3l-7 1q-1 0-2 0-1 0-1 1v571q1 0 10-2t19-2 12-2q83-14 137-14 44 0 65 20 25 24 25 49 0 13-8 29t-19 29-18 36-9 47q0 45 33 71t81 25q44 0 74-25t31-69q0-23-10-43t-21-33-22-31-9-40q0-32 23-47t58-14q35 0 100 8t91 9v-1q-1-1-2-9t-3-19-2-12q-13-84-13-137 0-45 19-65 25-26 50-26 12 0 28 8t30 19 36 19 46 8q46 0 71-33t26-80z" horiz-adv-x="928.6" />
+
 <glyph glyph-name="youtube" unicode="&#xf167;" d="M542 156v-118q0-37-22-37-13 0-25 12v168q12 12 25 12 22 0 22-37z m189-1v-25h-51v25q0 38 25 38t26-38z m-540 122h60v52h-174v-52h59v-318h55v318z m161-318h50v276h-50v-211q-17-23-32-23-10 0-11 11-1 2-1 20v203h-50v-218q0-28 5-41 7-21 32-21 27 0 57 34v-30z m240 83v110q0 41-5 55-10 31-40 31-28 0-52-30v121h-50v-370h50v27q25-31 52-31 30 0 40 31 5 15 5 56z m188 6v7h-51q0-29-1-34-4-20-22-20-26 0-26 38v49h100v57q0 44-15 65-22 28-59 28-38 0-60-28-15-21-15-65v-96q0-44 16-65 22-29 60-29 40 0 60 30 10 15 12 30 1 5 1 33z m-339 509v117q0 39-24 39t-24-39v-117q0-39 24-39t24 39z m401-419q0-131-14-195-8-33-33-56t-57-25q-102-12-309-12t-310 12q-32 3-57 25t-32 56q-15 62-15 195 0 131 15 195 7 33 32 56t57 26q103 11 310 11t309-11q33-4 58-26t32-56q14-62 14-195z m-557 712h57l-67-223v-151h-56v151q-8 42-34 119-21 57-37 104h60l39-147z m207-186v-97q0-46-16-66-21-29-59-29-37 0-59 29-15 21-15 66v97q0 45 15 66 22 28 59 28 38 0 59-28 16-21 16-66z m187 91v-279h-51v31q-30-35-58-35-25 0-33 21-4 13-4 42v220h51v-205q0-19 0-20 2-12 12-12 15 0 32 24v213h51z" horiz-adv-x="857.1" />

 <glyph glyph-name="instagram" unicode="&#xf16d;" d="M571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m77 0q0-91-64-156t-155-64-156 64-64 156 64 156 156 64 155-64 64-156z m61 229q0-21-15-36t-37-15-36 15-15 36 15 36 36 15 37-15 15-36z m-280 123q-4 0-43 0t-59 0-54-2-57-5-40-11q-28-11-49-32t-33-49q-6-16-10-40t-6-58-1-53 0-59 0-43 0-43 0-59 1-53 6-58 10-40q12-28 33-49t49-32q16-6 40-11t57-5 54-2 59 0 43 0 42 0 59 0 54 2 58 5 39 11q28 11 50 32t32 49q6 16 10 40t6 58 1 53 0 59 0 43 0 43 0 59-1 53-6 58-10 40q-11 28-32 49t-50 32q-16 6-39 11t-58 5-54 2-59 0-42 0z m428-352q0-128-3-177-5-116-69-180t-179-69q-50-3-177-3t-177 3q-116 6-180 69t-69 180q-3 49-3 177t3 177q5 116 69 180t180 69q49 3 177 3t177-3q116-6 179-69t69-180q3-49 3-177z" horiz-adv-x="857.1" />
--- a/core/vendor/zwiico/font/zwiico.ttf
+++ b/core/vendor/zwiico/font/zwiico.ttf
--- a/core/vendor/zwiico/font/zwiico.woff
+++ b/core/vendor/zwiico/font/zwiico.woff
--- a/core/vendor/zwiico/font/zwiico.woff2
+++ b/core/vendor/zwiico/font/zwiico.woff2
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@ -87,7 +87,8 @@ class blog extends common {

 	public static $users = [];

-	const BLOG_VERSION = '4.2';
+	const VERSION = '4.3';
+	const REALNAME = 'Blog';

 		/**
 	 * Flux RSS
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@ -1,154 +1,152 @@
-<article>
-	<div class="row">
-		<div class="col10">
-			<div class="blogDate">
-				<i class="far fa-calendar-alt"></i>
-				<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-								? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-								: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-					  $heure =  mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-					  			? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-								:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-					  echo $date . ' à ' . $heure; 
-				?>
-			</div>
-		</div>
-			<div class="col2">
-			<?php if (
-					$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-					AND
-					(  // Propriétaire
-						(
-							 $this->getData(['module',  $this->getUrl(0), 'posts', $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER
-							 AND ( $this->getData(['module',  $this->getUrl(0), 'posts', $this->getUrl(1),'userId']) === $this->getUser('id')
-							 OR $this->getUser('group') === self::GROUP_ADMIN )
-					)
-					OR (
-							// Groupe
-							( $this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === self::GROUP_ADMIN
-							OR $this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === self::GROUP_MODERATOR)
-							AND $this->getUser('group') >=  $this->getData(['module',$this->getUrl(0), 'posts', $this->getUrl(1),'editConsent'])
-					)
-					OR (
-							// Tout le monde
-							$this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === $module::EDIT_ALL
-							AND $this->getUser('group') >= $module::$actions['config']
-						)
-					)
-				): ?>
-					<?php echo template::button('blogEdit', [
-								'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
-								'value' => 'Editer'
-					]); ?>
-			<?php endif; ?>
+<div class="row">
+	<div class="col10">
+		<div class="blogDate">
+			<i class="far fa-calendar-alt"></i>
+			<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+							? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+							: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+					$heure =  mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+							? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+							:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+					echo $date . ' à ' . $heure; 
+			?>
 		</div>
 	</div>
-		<?php $pictureSize =  $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'pictureSize']) === null ? '100' : $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'pictureSize']); ?>
-		<?php if ($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'hidePicture']) == false) {
-			echo '<img class="blogArticlePicture blogArticlePicture' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picturePosition']) .
-			' pict' . $pictureSize . '" src="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picture']) .
-			'" alt="' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picture']) . '">';
-		} ?>
-	<?php echo $this->getData(['module', $this->getUrl(0),'posts', $this->getUrl(1), 'content']); ?>
-	<p class="clearBoth signature"><?php echo $module::$articleSignature;?></p>
-		<!-- Bloc RSS-->
-	<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
-		<div id="rssFeed">
-			<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
-				<img  src='module/news/ressource/feed-icon-16.gif' />
-				<?php 
-					echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
-				?>
-			</a>
-		</div>
-	<?php endif; ?>
-	<?php if($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentClose'])): ?>
-		<p>Cet article ne reçoit pas de commentaire.</p>
-	<?php else: ?>
-		<h3 id="comment">
-			<?php  //$commentsNb = count($module::$comments); ?>
-			<?php $commentsNb = $module::$nbCommentsApproved; ?>
-			<?php $s =  $commentsNb === 1 ? '': 's' ?>
-			<?php echo $commentsNb > 0 ? $commentsNb . ' ' .  'commentaire' . $s : 'Pas encore de commentaire'; ?>
-		</h3>
-		<?php echo template::formOpen('blogArticleForm'); ?>
-			<?php echo template::text('blogArticleCommentShow', [
-				'placeholder' => 'Rédiger un commentaire...',
-				'readonly' => true
-			]); ?>
-			<div id="blogArticleCommentWrapper" class="displayNone">
-					<?php if($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')): ?>
-					<?php echo template::text('blogArticleUserName', [
-						'label' => 'Nom',
-						'readonly' => true,
-						'value' => $module::$editCommentSignature
-					]); ?>
-					<?php echo template::hidden('blogArticleUserId', [
-						'value' => $this->getUser('id')
-					]); ?>
-				<?php else: ?>
-					<div class="row">
-						<div class="col9">
-							<?php echo template::text('blogArticleAuthor', [
-								'label' => 'Nom'
-							]); ?>
-						</div>
-						<div class="col1 textAlignCenter verticalAlignBottom">
-							<div id="blogArticleOr">Ou</div>
-						</div>
-						<div class="col2 verticalAlignBottom">
-							<?php echo template::button('blogArticleLogin', [
-								'href' => helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()) . '__comment',
-								'value' => 'Connexion'
-							]); ?>
-						</div>
-					</div>
-				<?php endif; ?>
-				<?php echo template::textarea('blogArticleContent', [
-						'label' => 'Commentaire avec maximum '.$this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentMaxlength']).' caractères',
-						'class' => 'editorWysiwygComment',
-						'noDirty' => true,
-						'maxlength' => $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentMaxlength'])
+		<div class="col2">
+		<?php if (
+				$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
+				AND
+				(  // Propriétaire
+					(
+							$this->getData(['module',  $this->getUrl(0), 'posts', $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER
+							AND ( $this->getData(['module',  $this->getUrl(0), 'posts', $this->getUrl(1),'userId']) === $this->getUser('id')
+							OR $this->getUser('group') === self::GROUP_ADMIN )
+				)
+				OR (
+						// Groupe
+						( $this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === self::GROUP_ADMIN
+						OR $this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === self::GROUP_MODERATOR)
+						AND $this->getUser('group') >=  $this->getData(['module',$this->getUrl(0), 'posts', $this->getUrl(1),'editConsent'])
+				)
+				OR (
+						// Tout le monde
+						$this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1),'editConsent']) === $module::EDIT_ALL
+						AND $this->getUser('group') >= $module::$actions['config']
+					)
+				)
+			): ?>
+				<?php echo template::button('blogEdit', [
+							'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
+							'value' => 'Editer'
 				]); ?>
-				<div id="blogArticleContentAlarm"> </div>
-				<?php if($this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')): ?>
-					<div class="row">
-						<div class="col12">
-							<?php echo template::captcha('blogArticleCaptcha', [
-								'limit' => $this->getData(['config','captchaStrong'])
-							]); ?>
-						</div>
-					</div>
-				<?php endif; ?>
+		<?php endif; ?>
+	</div>
+</div>
+	<?php $pictureSize =  $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'pictureSize']) === null ? '100' : $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'pictureSize']); ?>
+	<?php if ($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'hidePicture']) == false) {
+		echo '<img class="blogArticlePicture blogArticlePicture' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picturePosition']) .
+		' pict' . $pictureSize . '" src="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picture']) .
+		'" alt="' . $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'picture']) . '">';
+	} ?>
+<?php echo $this->getData(['module', $this->getUrl(0),'posts', $this->getUrl(1), 'content']); ?>
+<p class="clearBoth signature"><?php echo $module::$articleSignature;?></p>
+	<!-- Bloc RSS-->
+<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
+	<div id="rssFeed">
+		<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
+			<img  src='module/news/ressource/feed-icon-16.gif' />
+			<?php 
+				echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
+			?>
+		</a>
+	</div>
+<?php endif; ?>
+<?php if($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentClose'])): ?>
+	<p>Cet article ne reçoit pas de commentaire.</p>
+<?php else: ?>
+	<h3 id="comment">
+		<?php  //$commentsNb = count($module::$comments); ?>
+		<?php $commentsNb = $module::$nbCommentsApproved; ?>
+		<?php $s =  $commentsNb === 1 ? '': 's' ?>
+		<?php echo $commentsNb > 0 ? $commentsNb . ' ' .  'commentaire' . $s : 'Pas encore de commentaire'; ?>
+	</h3>
+	<?php echo template::formOpen('blogArticleForm'); ?>
+		<?php echo template::text('blogArticleCommentShow', [
+			'placeholder' => 'Rédiger un commentaire...',
+			'readonly' => true
+		]); ?>
+		<div id="blogArticleCommentWrapper" class="displayNone">
+				<?php if($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')): ?>
+				<?php echo template::text('blogArticleUserName', [
+					'label' => 'Nom',
+					'readonly' => true,
+					'value' => $module::$editCommentSignature
+				]); ?>
+				<?php echo template::hidden('blogArticleUserId', [
+					'value' => $this->getUser('id')
+				]); ?>
+			<?php else: ?>
 				<div class="row">
-					<div class="col2 offset8">
-						<?php echo template::button('blogArticleCommentHide', [
-							'class' => 'buttonGrey',
-							'value' => 'Annuler'
+					<div class="col9">
+						<?php echo template::text('blogArticleAuthor', [
+							'label' => 'Nom'
 						]); ?>
 					</div>
-					<div class="col2">
-						<?php echo template::submit('blogArticleSubmit', [
-							'value' => 'Envoyer',
-							'ico' => ''
+					<div class="col1 textAlignCenter verticalAlignBottom">
+						<div id="blogArticleOr">Ou</div>
+					</div>
+					<div class="col2 verticalAlignBottom">
+						<?php echo template::button('blogArticleLogin', [
+							'href' => helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()) . '__comment',
+							'value' => 'Connexion'
 						]); ?>
 					</div>
 				</div>
+			<?php endif; ?>
+			<?php echo template::textarea('blogArticleContent', [
+					'label' => 'Commentaire avec maximum '.$this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentMaxlength']).' caractères',
+					'class' => 'editorWysiwygComment',
+					'noDirty' => true,
+					'maxlength' => $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentMaxlength'])
+			]); ?>
+			<div id="blogArticleContentAlarm"> </div>
+			<?php if($this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')): ?>
+				<div class="row">
+					<div class="col12">
+						<?php echo template::captcha('blogArticleCaptcha', [
+							'limit' => $this->getData(['config','captchaStrong'])
+						]); ?>
+					</div>
+				</div>
+			<?php endif; ?>
+			<div class="row">
+				<div class="col2 offset8">
+					<?php echo template::button('blogArticleCommentHide', [
+						'class' => 'buttonGrey',
+						'value' => 'Annuler'
+					]); ?>
+				</div>
+				<div class="col2">
+					<?php echo template::submit('blogArticleSubmit', [
+						'value' => 'Envoyer',
+						'ico' => ''
+					]); ?>
+				</div>
 			</div>
-	<?php endif;?>
-	<div class="row">
-		<div class="col12">
-			<?php foreach($module::$comments as $commentId => $comment): ?>
-				<div class="block">
-					<h4><?php echo $module::$commentsSignature[$commentId]; ?>
-					le <?php  echo mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
-										 ? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
-										 : utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn']));
-					?>
-					<?php echo $comment['content']; ?>
-				</div>
-			<?php endforeach; ?>
 		</div>
+<?php endif;?>
+<div class="row">
+	<div class="col12">
+		<?php foreach($module::$comments as $commentId => $comment): ?>
+			<div class="block">
+				<h4><?php echo $module::$commentsSignature[$commentId]; ?>
+				le <?php  echo mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
+										? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
+										: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn']));
+				?>
+				<?php echo $comment['content']; ?>
+			</div>
+		<?php endforeach; ?>
 	</div>
-	<?php echo $module::$pages; ?>
-</article>
+</div>
+<?php echo $module::$pages; ?>
--- a/module/blog/view/config/config.php
+++ b/module/blog/view/config/config.php
@ -47,6 +47,6 @@
 	<?php echo template::speech('Aucun article.'); ?>
 <?php endif; ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::BLOG_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>

--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@ -21,7 +21,6 @@
 						</a>
 					</div>
 					<div class="col9">
-						<article>
 						<h1 class="blogTitle">
 							<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">
 								<?php echo $article['title']; ?>
@ -45,7 +44,6 @@
 							<?php echo helper::subword(strip_tags($article['content']), 0, 400); ?>...
 							<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">Lire la suite</a>
 						</p>
-						</article>
 					</div>
 				</div>
 			<?php endforeach; ?>
--- a/module/form/form.php
+++ b/module/form/form.php
@ -32,7 +32,8 @@ class form extends common {

 	public static $pagination;

-	const FORM_VERSION = '2.7';
+	const VERSION = '2.7';
+	const REALNAME = 'Formulaire';

 	// Objets
 	const TYPE_MAIL = 'mail';
--- a/module/form/view/config/config.php
+++ b/module/form/view/config/config.php
@ -164,5 +164,5 @@
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::FORM_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>
--- a/module/form/view/data/data.php
+++ b/module/form/view/data/data.php
@ -26,5 +26,5 @@
 <?php echo template::table([11, 1], $module::$data, ['Données', '']); ?>
 <?php echo $module::$pagination; ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::FORM_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@ -19,7 +19,9 @@ class gallery extends common {
 	const SORT_ASC = 'SORT_ASC';
 	const SORT_DSC = 'SORT_DSC';
 	const SORT_HAND = 'SORT_HAND';
-	const GALLERY_VERSION = '2.5';
+
+	const VERSION = '2.5';
+	const REALNAME = 'Galerie';

 	public static $directories = [];

--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@ -58,6 +58,6 @@
 			<?php endif; ?>
 	</div>
 	<div class="moduleVersion">Version n°
-		<?php echo $module::GALLERY_VERSION; ?>
+		<?php echo $module::VERSION; ?>
 	</div>
 </div>
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@ -64,6 +64,6 @@
 	</div>

 		<div class="moduleVersion">Version n°
-			<?php echo $module::GALLERY_VERSION; ?>
+			<?php echo $module::VERSION; ?>
 		</div>
 <?php echo template::formClose(); ?>
--- a/module/gallery/view/theme/theme.php
+++ b/module/gallery/view/theme/theme.php
@ -139,7 +139,7 @@
 <div class="row">
    <div class="col12">
        <div class="moduleVersion">Version n°
-            <?php echo $module::GALLERY_VERSION; ?>
+            <?php echo $module::VERSION; ?>
        </div>
    </div>
 </div>
--- a/module/news/news.php
+++ b/module/news/news.php
@ -33,10 +33,12 @@ class news extends common {
 		false => 'Brouillon',
 		true => 'Publié'
 	];
-	const NEWS_VERSION = '2.0';

 	public static $users = [];

+	const VERSION = '2.0';
+	const REALNAME = 'Nouvelles';
+
 	/**
 	 * Flux RSS
 	 */
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@ -48,5 +48,5 @@
 	<?php endif; ?>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::NEWS_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>
--- a/module/redirection/redirection.php
+++ b/module/redirection/redirection.php
@ -19,7 +19,8 @@ class redirection extends common {
 		'index' => self::GROUP_VISITOR
 	];

-	const REDIRECTION_VERSION = '1.4';
+	const VERSION = '1.4';
+	const REALNAME = 'Redirection';

 	/**
 	 * Configuration
--- a/module/redirection/view/config/config.php
+++ b/module/redirection/view/config/config.php
@ -37,5 +37,5 @@
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::REDIRECTION_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>
--- a/module/search/search.php
+++ b/module/search/search.php
@ -38,7 +38,8 @@ class search extends common {
 		400 => '400 caractères',
 	];

-	const SEARCH_VERSION = '1.2';
+	const VERSION = '1.2';
+	const REALNAME = 'Recherche';

 	// Configuration vide
 	public function config() {
--- a/module/search/view/config/config.php
+++ b/module/search/view/config/config.php
@ -68,5 +68,5 @@
 	</div>
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::SEARCH_VERSION; ?>
+	<?php echo $module::VERSION; ?>
 </div>