From b147f447765dd7bf555102444a2368d786d24c4d Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Mon, 6 Jan 2025 16:17:44 +0100
Subject: [PATCH] =?UTF-8?q?-=20Remplacement=20du=20nom=20g=C3=A9n=C3=A9riq?=
 =?UTF-8?q?ue=20de=20classe=20dans=20les=20vues.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/blog/blog.php                   |  2 +-
 module/blog/changes.md                 |  4 +++-
 module/form/changes.md                 |  4 +++-
 module/form/form.php                   |  2 +-
 module/suscribe/changes.md             |  2 ++
 module/suscribe/suscribe.php           |  2 +-
 module/suscribe/view/config/config.php |  6 +++---
 module/suscribe/view/edit/edit.php     | 14 +++++++-------
 module/suscribe/view/users/users.php   |  4 ++--
 module/workshop/changes.md             |  2 ++
 module/workshop/view/config/config.php |  6 +++---
 module/workshop/view/index/index.php   |  4 ++--
 module/workshop/workshop.php           |  2 +-
 13 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 module/workshop/changes.md

diff --git a/module/blog/blog.php b/module/blog/blog.php
index 84b0508..f45ace4 100755
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -16,7 +16,7 @@
 class blog extends common
 {
 
-	const VERSION = '8.1';
+	const VERSION = '8.2';
 	const REALNAME = 'Blog';
 	const DELETE = true;
 	const UPDATE = '0.0';
diff --git a/module/blog/changes.md b/module/blog/changes.md
index cbc5770..ef98e12 100755
--- a/module/blog/changes.md
+++ b/module/blog/changes.md
@@ -1,4 +1,6 @@
-# Version 8.01
+# Version 8.2
+- Remplacement du nom générique de classe dans les vues.
+# Version 8.1
 - Un mail de notification est seulement envoyé lorsque le captcha est passé et que le commentaire est déposé.
 - Le mail de notification contient désormais le nom de l'auteur du commentaire ainsi que le commentaire.
 # Version 8.00
diff --git a/module/form/changes.md b/module/form/changes.md
index 8536f3e..2863224 100644
--- a/module/form/changes.md
+++ b/module/form/changes.md
@@ -1,4 +1,6 @@
-# Versions 4.4
+# Version 4.5
+- Remplacement du nom générique de classe dans les vues.
+# Version 4.4
 - Le sélecteur de fichier affiche par défaut le chemin vers le fichier présent dans le champ.
 # Version 4.3
 - Contrôle de la variable de session liée au contenu. Evite des erreurs lorsque plusieurs onglets sont ouverts.
diff --git a/module/form/form.php b/module/form/form.php
index 13fd1b5..5dd2a66 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -17,7 +17,7 @@
 class form extends common
 {
 
-	const VERSION = '4.4';
+	const VERSION = '4.5';
 	const REALNAME = 'Formulaire';
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
diff --git a/module/suscribe/changes.md b/module/suscribe/changes.md
index 697608f..4157ab9 100644
--- a/module/suscribe/changes.md
+++ b/module/suscribe/changes.md
@@ -1,3 +1,5 @@
+# Version 2.7
+- Remplacement du nom générique de classe dans les vues.
 # Version 2.6
 - Corrige d'un bug empêchat de terminer la procédure d'inscription après approbation.
 # Version 2.5
diff --git a/module/suscribe/suscribe.php b/module/suscribe/suscribe.php
index 708d470..06d37be 100755
--- a/module/suscribe/suscribe.php
+++ b/module/suscribe/suscribe.php
@@ -15,7 +15,7 @@
 class suscribe extends common
 {
 
-	const VERSION = '2.6';
+	const VERSION = '2.7';
 	const REALNAME = 'Auto Inscription';
 	const DELETE = true;
 	const UPDATE = '0.0';
diff --git a/module/suscribe/view/config/config.php b/module/suscribe/view/config/config.php
index 061e7cc..58ed61e 100755
--- a/module/suscribe/view/config/config.php
+++ b/module/suscribe/view/config/config.php
@@ -25,7 +25,7 @@
             <h4>Paramètres</h4>
             <div class="row">
                 <div class="col4">
-                    <?php echo template::select('registrationConfigLayout', $module::$layout, [
+                    <?php echo template::select('registrationConfigLayout', suscribe::$layout, [
                         'label' => 'Disposition',
                         'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'layout'])
                     ]); ?>
@@ -52,7 +52,7 @@
             <h4>Communication</h4>
             <div class="row">
                 <div class="col6">
-                    <?php echo template::select('registrationConfigTimeOut', $module::$timeLimit, [
+                    <?php echo template::select('registrationConfigTimeOut', suscribe::$timeLimit, [
                         'label' => 'Validité du lien',
                         'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'timeOut']) / 60
                     ]); ?>
@@ -99,5 +99,5 @@
     </div>
 </div>
 <?php echo template::formClose(); ?>
-<div class="moduleVersion">Version n°<?php echo $module::VERSION; ?>
+<div class="moduleVersion">Version n°<?php echo suscribe::VERSION; ?>
 </div>
\ No newline at end of file
diff --git a/module/suscribe/view/edit/edit.php b/module/suscribe/view/edit/edit.php
index 52ad2e0..2833eec 100755
--- a/module/suscribe/view/edit/edit.php
+++ b/module/suscribe/view/edit/edit.php
@@ -26,7 +26,7 @@
 				</div>
 				<div class="col4">
 					<?php if ($this->getUser('group') === self::GROUP_ADMIN): ?>
-						<?php echo template::select('registrationUserEditGroup', $module::$groups, [
+						<?php echo template::select('registrationUserEditGroup', suscribe::$groups, [
 							'disabled' => ($this->getUrl(2) === $this->getUser('id')),
 							'help' => ($this->getUrl(2) === $this->getUser('id') ? 'Impossible de modifier votre propre groupe.' : ''),
 							'label' => 'Groupe',
@@ -37,7 +37,7 @@
 				<div class="col4">
 					<div class="registrationUserEditGroupProfil"
 						id="registrationUserEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
-						<?php echo template::select('registrationUserEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
+						<?php echo template::select('registrationUserEditProfil' . self::GROUP_MEMBER, suscribe::$userProfils[self::GROUP_MEMBER], [
 							'label' => 'Profil',
 							'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
 							'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
@@ -45,7 +45,7 @@
 					</div>
 					<div class="registrationUserEditGroupProfil"
 						id="registrationUserEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
-						<?php echo template::select('registrationUserEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
+						<?php echo template::select('registrationUserEditProfil' . self::GROUP_EDITOR, suscribe::$userProfils[self::GROUP_EDITOR], [
 							'label' => 'Profil',
 							'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
 							'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
@@ -58,7 +58,7 @@
 							class="col12  registrationUserCommentProfil">
 							<?php echo template::textarea('registrationUserEditProfilComment' . self::GROUP_MEMBER, [
 								'label' => 'Commentaire',
-								'value' => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]),
+								'value' => implode("\n", suscribe::$userProfilsComments[self::GROUP_MEMBER]),
 								'readonly' => true,
 
 							]);
@@ -68,7 +68,7 @@
 							class="col12  registrationUserCommentProfil">
 							<?php echo template::textarea('registrationUserEditProfilComment' . self::GROUP_EDITOR, [
 								'label' => 'Commentaire',
-								'value' => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]),
+								'value' => implode("\n", suscribe::$userProfilsComments[self::GROUP_EDITOR]),
 								'readonly' => true,
 
 							]);
@@ -78,7 +78,7 @@
 							class="col12  registrationUserCommentProfil">
 							<?php echo template::textarea('registrationUserEditProfilComment' . self::GROUP_ADMIN, [
 								'label' => 'Commentaire',
-								'value' => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]),
+								'value' => implode("\n", suscribe::$userProfilsComments[self::GROUP_ADMIN]),
 								'readonly' => true,
 							]);
 							?>
@@ -127,7 +127,7 @@
 						<div class="col8">
 							<?php echo template::text('registrationUserState', [
 								'label' => 'État de l\'inscription',
-								'value' => $module::$statusGroups[$this->getData(['module', $this->getUrl(0), 'users', $this->getUrl(2), 'status'])],
+								'value' => suscribe::$statusGroups[$this->getData(['module', $this->getUrl(0), 'users', $this->getUrl(2), 'status'])],
 								'disabled' => true,
 								'help' => 'En attente : le mail n\'a pas encore été validé<br>Email validé : approbation nécessaire.'
 							]); ?>
diff --git a/module/suscribe/view/users/users.php b/module/suscribe/view/users/users.php
index 3cad998..0c6df3f 100644
--- a/module/suscribe/view/users/users.php
+++ b/module/suscribe/view/users/users.php
@@ -8,8 +8,8 @@
 	</div>
 </div>
 
-<?php if($module::$users): ?>
-<?php echo template::table([3, 3, 2,21, 1, 1], $module::$users, ['Identifiant', 'Nom', 'Etat', 'Date', '', '']); ?>
+<?php if(suscribe::$users): ?>
+<?php echo template::table([3, 3, 2,21, 1, 1], suscribe::$users, ['Identifiant', 'Nom', 'Etat', 'Date', '', '']); ?>
 <?php else: ?>
 	<?php echo template::speech('Pas d\'inscription en attente.'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/module/workshop/changes.md b/module/workshop/changes.md
new file mode 100644
index 0000000..4cfc998
--- /dev/null
+++ b/module/workshop/changes.md
@@ -0,0 +1,2 @@
+# Version 1.2
+- Remplacement du nom générique de classe dans les vues.
\ No newline at end of file
diff --git a/module/workshop/view/config/config.php b/module/workshop/view/config/config.php
index 91b2444..501129c 100644
--- a/module/workshop/view/config/config.php
+++ b/module/workshop/view/config/config.php
@@ -13,7 +13,7 @@
 </div>
 <div class="row">
 	<div class="col6">
-		<?php echo template::select('coursesConfigCategories', $module::$courseCategories, [
+		<?php echo template::select('coursesConfigCategories', workshop::$courseCategories, [
 			'label' => 'Catégorie à afficher',
 			'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'category'])
 		]); ?>
@@ -76,7 +76,7 @@
 			</h4>
 			<div class="row">
 				<div class="col12">
-					<?php echo template::select('coursesConfigLayout', $module::$coursesLayout, [
+					<?php echo template::select('coursesConfigLayout', workshop::$coursesLayout, [
 						'label' => 'Présentation en colonnes',
 						'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'layout']),
 						'help' => 'Chaque contenu est présenté dans une colonne'
@@ -186,5 +186,5 @@
 
 <?php echo template::formClose(); ?>
 <div class="moduleVersion">Version n°
-	<?php echo $module::VERSION; ?>
+	<?php echo workshop::VERSION; ?>
 </div>
\ No newline at end of file
diff --git a/module/workshop/view/index/index.php b/module/workshop/view/index/index.php
index c26dce8..2776ec8 100644
--- a/module/workshop/view/index/index.php
+++ b/module/workshop/view/index/index.php
@@ -56,7 +56,7 @@
                     <div class="workshopAccessContainer">
                         <p>
                             <span class="workshopAccess">
-                                <?php echo sprintf(helper::translate($module::$coursesAccess[$courseValue['access']]), helper::dateUTF8('%d %B %Y', $courseValue['openingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['openingDate']), helper::dateUTF8('%d %B %Y', $courseValue['closingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['closingDate'])) ?>
+                                <?php echo sprintf(helper::translate(workshop::$coursesAccess[$courseValue['access']]), helper::dateUTF8('%d %B %Y', $courseValue['openingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['openingDate']), helper::dateUTF8('%d %B %Y', $courseValue['closingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['closingDate'])) ?>
                             </span>
                         </p>
                     </div>
@@ -66,7 +66,7 @@
                 <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'enrolment']) === true): ?>
                     <p>
                         <span class="workshopEnrolment">
-                            <?php echo $module::$coursesEnrolment[$courseValue['enrolment']]; ?>
+                            <?php echo workshop::$coursesEnrolment[$courseValue['enrolment']]; ?>
                         </span>
                     </p>
                     <?php if ($this->getData(['course', $courseId, 'limitEnrolment']) === true): ?>
diff --git a/module/workshop/workshop.php b/module/workshop/workshop.php
index 9376be9..46e461d 100644
--- a/module/workshop/workshop.php
+++ b/module/workshop/workshop.php
@@ -15,7 +15,7 @@
 
 class workshop extends common
 {
-	const VERSION = '1.01';
+	const VERSION = '1.2';
 	const REALNAME = 'Liste des espaces';
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)