From b5d31033ffccb56dbc33b557ce5694ceab3fc1a7 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 18 Feb 2021 10:07:05 +0100
Subject: [PATCH] Blog Balise de fermeture de commentaire - constantes dans les
 modules

---
 CHANGES.md                                |  6 ++++++
 README.md                                 |  2 +-
 core/core.php                             |  2 +-
 module/blog/blog.php                      |  9 ++++++++-
 module/blog/view/article/article.php      |  1 +
 module/blog/view/config/config.php        |  2 +-
 module/form/form.php                      | 10 +++++++++-
 module/form/view/config/config.php        |  2 +-
 module/form/view/data/data.php            |  2 +-
 module/gallery/gallery.php                | 11 ++++++++++-
 module/gallery/view/config/config.php     |  2 +-
 module/gallery/view/edit/edit.php         |  2 +-
 module/gallery/view/theme/theme.php       |  2 +-
 module/news/news.php                      |  9 ++++++++-
 module/news/view/config/config.php        |  2 +-
 module/redirection/redirection.php        |  9 ++++++++-
 module/redirection/view/config/config.php |  2 +-
 module/search/search.php                  |  9 ++++++++-
 module/search/view/config/config.php      |  2 +-
 19 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3857a8e6..d8eca2fe 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## version 10.4.04
+- Correction :
+    - Module Blog : balise non fermée dans les commentaires.
+- Modifications : 
+    -Constantes de modules.
+
 ## version 10.4.03
 - Corrections :
     - En-tête html : absence de la langue.
diff --git a/README.md b/README.md
index 487b18c0..7a84065d 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# ZwiiCMS 10.4.03
+# ZwiiCMS 10.4.04
 
 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.
 
diff --git a/core/core.php b/core/core.php
index 17cf9ca2..66b8fbdc 100755
--- a/core/core.php
+++ b/core/core.php
@@ -44,7 +44,7 @@ class common {
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '10.4.03';
+	const ZWII_VERSION = '10.4.04';
 	const ZWII_UPDATE_CHANNEL = "v10";
 
 	public static $actions = [];
diff --git a/module/blog/blog.php b/module/blog/blog.php
index ae1d44e9..2e7e0538 100755
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -14,6 +14,14 @@
 
 class blog extends common {
 
+	const VERSION = '4.4';
+	const REALNAME = 'Blog';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	const EDIT_OWNER = 'owner';
 	const EDIT_GROUP = 'group';
 	const EDIT_ALL = 'all';
@@ -87,7 +95,6 @@ class blog extends common {
 
 	public static $users = [];
 
-	const BLOG_VERSION = '4.3';
 
 		/**
 	 * Flux RSS
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 6706ffa4..aa19fe55 100755
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -144,6 +144,7 @@
 										? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
 										: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn']));
 				?>
+				</h4>
 				<?php echo $comment['content']; ?>
 			</div>
 		<?php endforeach; ?>
diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php
index 7830d8fd..fee5671a 100755
--- 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>
 
diff --git a/module/form/form.php b/module/form/form.php
index a47a0ec7..597a0323 100755
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -16,6 +16,14 @@
 
 class form extends common {
 
+	const VERSION = '2.8';
+	const REALNAME = 'Formulaire';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
 		'data' => self::GROUP_MODERATOR,
@@ -32,7 +40,7 @@ class form extends common {
 
 	public static $pagination;
 
-	const FORM_VERSION = '2.7';
+
 
 	// Objets
 	const TYPE_MAIL = 'mail';
diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php
index 5d2e8946..fea6d9ff 100755
--- 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>
diff --git a/module/form/view/data/data.php b/module/form/view/data/data.php
index c60511b4..947e20db 100755
--- 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>
\ No newline at end of file
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 77d0f2c3..a3bb4618 100755
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -16,10 +16,19 @@
 
 class gallery extends common {
 
+
+	const VERSION = '2.6';
+	const REALNAME = 'Galerie';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	const SORT_ASC = 'SORT_ASC';
 	const SORT_DSC = 'SORT_DSC';
 	const SORT_HAND = 'SORT_HAND';
-	const GALLERY_VERSION = '2.5';
+
 
 	public static $directories = [];
 
diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 0c41378b..91400a98 100755
--- 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>
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index 9b243d32..c745d1e5 100755
--- 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(); ?>
diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php
index 8ada32ed..694ecaf9 100755
--- 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>
\ No newline at end of file
diff --git a/module/news/news.php b/module/news/news.php
index 13fcb2fa..89eb1aca 100755
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -14,6 +14,14 @@
 
 class news extends common {
 
+	const VERSION = '2.1';
+	const REALNAME = 'Actualités';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	public static $actions = [
 		'add' => self::GROUP_MODERATOR,
 		'config' => self::GROUP_MODERATOR,
@@ -33,7 +41,6 @@ class news extends common {
 		false => 'Brouillon',
 		true => 'Publié'
 	];
-	const NEWS_VERSION = '2.0';
 
 	public static $users = [];
 
diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php
index f25fe3d0..73929b9d 100755
--- 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>
\ No newline at end of file
diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php
index 5c92521c..e39d70d4 100755
--- a/module/redirection/redirection.php
+++ b/module/redirection/redirection.php
@@ -14,12 +14,19 @@
 
 class redirection extends common {
 
+	const VERSION = '1.5';
+	const REALNAME = 'Redirection';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
 		'index' => self::GROUP_VISITOR
 	];
 
-	const REDIRECTION_VERSION = '1.4';
 
 	/**
 	 * Configuration
diff --git a/module/redirection/view/config/config.php b/module/redirection/view/config/config.php
index 72071f4c..ff421b39 100755
--- 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>
\ No newline at end of file
diff --git a/module/search/search.php b/module/search/search.php
index f84dfdeb..56e71f05 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -18,6 +18,14 @@
 
 class search extends common {
 
+	const VERSION = '1.3';
+	const REALNAME = 'Recherche';
+	const DELETE = true;
+	const UPDATE = true;
+	const DATADIRECTORY = [
+		'fr/module.json'
+	];
+
 	public static $actions = [
 		'index' => self::GROUP_VISITOR,
 		'config' => self::GROUP_MODERATOR
@@ -38,7 +46,6 @@ class search extends common {
 		400 => '400 caractères',
 	];
 
-	const SEARCH_VERSION = '1.2';
 
 	// Configuration vide
 	public function config() {
diff --git a/module/search/view/config/config.php b/module/search/view/config/config.php
index 37a60653..f54674d7 100755
--- 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>
\ No newline at end of file