From 92c8c0a6535a185f498063ede1e0cdcf5df6c3e8 Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Wed, 5 Jul 2023 18:04:42 +0200
Subject: [PATCH] Groupe MODERATOR devient EDITOR

---
 core/class/layout.class.php                   | 14 ++++++-------
 core/class/router.class.php                   |  2 +-
 core/core.php                                 | 10 +++++-----
 core/module/install/ressource/defaultdata.php |  4 ++--
 core/module/page/page.php                     | 12 +++++------
 core/module/user/user.php                     |  8 ++++----
 core/module/user/view/add/add.php             | 10 +++++-----
 core/module/user/view/edit/edit.php           | 10 +++++-----
 .../user/view/profilEdit/profilEdit.php       |  2 +-
 module/blog/blog.php                          | 20 +++++++++----------
 module/blog/view/article/article.php          |  2 +-
 module/blog/view/index/index.php              |  2 +-
 module/form/form.php                          | 12 +++++------
 module/gallery/gallery.php                    | 18 ++++++++---------
 module/news/news.php                          | 10 +++++-----
 module/redirection/redirection.php            |  4 ++--
 module/search/search.php                      |  2 +-
 17 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index 77256468..a2f63b9a 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -575,7 +575,7 @@ class layout extends common
                     and $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
                 ) or ($this->getData(['page', $parentPageId, 'disable']) === true
                     and $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-                    and $this->getUser('group') < self::GROUP_MODERATOR
+                    and $this->getUser('group') < self::GROUP_EDITOR
                 )
             ) {
                 $pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0);
@@ -641,7 +641,7 @@ class layout extends common
                         and $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
                     ) or ($this->getData(['page', $childKey, 'disable']) === true
                         and $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-                        and $this->getUser('group') < self::GROUP_MODERATOR
+                        and $this->getUser('group') < self::GROUP_EDITOR
                     )
                 ) {
                     $pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0);
@@ -876,7 +876,7 @@ class layout extends common
             // Items de gauche
             $leftItems = '';
             // Sélecteur de langues
-            if ($this->getUser('group') >= self::GROUP_MODERATOR) {
+            if ($this->getUser('group') >= self::GROUP_EDITOR) {
                 $c = 0;
                 $leftItem = '';
                 foreach (self::$languages as $key => $value) {
@@ -893,7 +893,7 @@ class layout extends common
                 }
             }
             // Liste des pages
-            if ($this->getUser('group') >= self::GROUP_MODERATOR) {
+            if ($this->getUser('group') >= self::GROUP_EDITOR) {
                 $leftItems .= '<li><select id="barSelectPage">';
                 $leftItems .= '<option value="">' . helper::translate('Pages du site') . '</option>';
                 $leftItems .= '<optgroup label="' . helper::translate('Pages orphelines') . '">';
@@ -1006,7 +1006,7 @@ class layout extends common
             // Items de droite
             $rightItems = '';
             if (
-                $this->getUser('group') >= self::GROUP_MODERATOR
+                $this->getUser('group') >= self::GROUP_EDITOR
                 && $this->getUser(
                     'permission',
                     'filemanager'
@@ -1066,7 +1066,7 @@ class layout extends common
                 }
             }
             if (
-                $this->getUser('group') >= self::GROUP_MODERATOR
+                $this->getUser('group') >= self::GROUP_EDITOR
                 && $this->getUser('permission', 'user', 'edit')
 
             ) {
@@ -1153,7 +1153,7 @@ class layout extends common
         $vars .= 'var baseUrlQs = ' . json_encode(helper::baseUrl()) . ';';
         if (
             $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-            and $this->getUser('group') >= self::GROUP_MODERATOR
+            and $this->getUser('group') >= self::GROUP_EDITOR
         ) {
             $vars .= 'var privateKey = ' . json_encode(md5_file(self::DATA_DIR . 'core.json')) . ';';
         }
diff --git a/core/class/router.class.php b/core/class/router.class.php
index be8c6560..aa920224 100644
--- a/core/class/router.class.php
+++ b/core/class/router.class.php
@@ -541,7 +541,7 @@ class core extends common
 					and $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
 				) or ($this->getData(['page', $this->getUrl(0), 'disable']) === true
 					and $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-					and $this->getUser('group') < self::GROUP_MODERATOR
+					and $this->getUser('group') < self::GROUP_EDITOR
 				)
 			) {
 				$access = false;
diff --git a/core/core.php b/core/core.php
index d5143a9c..82097232 100644
--- a/core/core.php
+++ b/core/core.php
@@ -27,7 +27,7 @@ class common
 	const GROUP_BANNED = -1;
 	const GROUP_VISITOR = 0;
 	const GROUP_MEMBER = 1;
-	const GROUP_MODERATOR = 2;
+	const GROUP_EDITOR = 2;
 	const GROUP_ADMIN = 3;
 	const SIGNATURE_ID = 1;
 	const SIGNATURE_PSEUDO = 2;
@@ -136,24 +136,24 @@ class common
 		self::GROUP_BANNED => 'Banni',
 		self::GROUP_VISITOR => 'Visiteur',
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_MODERATOR => 'Éditeur',
+		self::GROUP_EDITOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupEdits = [
 		self::GROUP_BANNED => 'Banni',
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_MODERATOR => 'Éditeur',
+		self::GROUP_EDITOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupNews = [
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_MODERATOR => 'Éditeur',
+		self::GROUP_EDITOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupPublics = [
 		self::GROUP_VISITOR => 'Visiteur',
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_MODERATOR => 'Éditeur',
+		self::GROUP_EDITOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 8542e4e8..a7007d75 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -390,7 +390,7 @@ class init extends common
 					]
 				],
 				'2' => [
-					'name' => 'Membre',
+					'name' => 'Membre avec droit de partage',
 					'readonly' => false,
 					'comment' => 'Accède aux pages réservées et à un dossier partagé',
 					'filemanager' => true,
@@ -475,7 +475,7 @@ class init extends common
 			],
 			'2' => [
 				'1' => [
-					'name' => 'Modérateur',
+					'name' => 'Editeur simple',
 					'readonly' => false,
 					'comment' => 'Edition des pages',
 					'filemanager' => true,
diff --git a/core/module/page/page.php b/core/module/page/page.php
index d846f5cd..150f4830 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -18,12 +18,12 @@ class page extends common
 {
 
 	public static $actions = [
-		'add' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
-		'duplicate' => self::GROUP_MODERATOR,
-		'jsEditor' => self::GROUP_MODERATOR,
-		'cssEditor' => self::GROUP_MODERATOR
+		'add' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
+		'duplicate' => self::GROUP_EDITOR,
+		'jsEditor' => self::GROUP_EDITOR,
+		'cssEditor' => self::GROUP_EDITOR
 	];
 	public static $pagesNoParentId = [
 		'' => 'Aucune'
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 92872718..095a437a 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -66,7 +66,7 @@ class user extends common
 
 	public static $groupProfils = [
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_MODERATOR => 'Editeur'
+		self::GROUP_EDITOR => 'Editeur'
 	];
 
 	/**
@@ -191,7 +191,7 @@ class user extends common
 			// L'utilisateur n'existe pas
 			$this->getData(['user', $this->getUrl(2)]) === null
 			// Groupe insuffisant
-			and ($this->getUrl('group') < self::GROUP_MODERATOR)
+			and ($this->getUrl('group') < self::GROUP_EDITOR)
 		) {
 			// Valeurs en sortie
 			$this->addOutput([
@@ -251,7 +251,7 @@ class user extends common
 						and $this->getUrl('group') <= self::GROUP_VISITOR
 					)
 					// Impossible d'éditer un autre utilisateur
-					or ($this->getUrl('group') < self::GROUP_MODERATOR)
+					or ($this->getUrl('group') < self::GROUP_EDITOR)
 				)
 			) {
 				// Valeurs en sortie
@@ -503,7 +503,7 @@ class user extends common
 				];
 			} elseif (
 				$groupId == self::GROUP_MEMBER ||
-				$groupId == self::GROUP_MODERATOR
+				$groupId == self::GROUP_EDITOR
 			) {
 				// Enumérer les sous groupes MEMBER et MODERATOR
 				foreach ($groupData as $subGroupId => $subGroupData) {
diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php
index a59e793d..6954d703 100644
--- a/core/module/user/view/add/add.php
+++ b/core/module/user/view/add/add.php
@@ -102,8 +102,8 @@
 						]); ?>
 					</div>
 					<div class="userAddGroupProfil displayNone"
-						id="userAddGroupProfil<?php echo self::GROUP_MODERATOR; ?>">
-						<?php echo template::select('userAddProfil' . self::GROUP_MODERATOR, $module::$userProfils[self::GROUP_MODERATOR], [
+						id="userAddGroupProfil<?php echo self::GROUP_EDITOR; ?>">
+						<?php echo template::select('userAddProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
 							'label' => 'Profil',
 						]); ?>
 					</div>
@@ -116,9 +116,9 @@
 					]);
 					?>
 				</div>
-				<div id="userCommentProfil<?php echo self::GROUP_MODERATOR; ?>" class="col12 displayNone userCommentProfil">
-					<?php echo template::textarea('useraddProfilComment2' . self::GROUP_MODERATOR, [
-						"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MODERATOR])
+				<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>" class="col12 displayNone userCommentProfil">
+					<?php echo template::textarea('useraddProfilComment2' . self::GROUP_EDITOR, [
+						"value" => implode("\n",$module::$userProfilsComments[self::GROUP_EDITOR])
 					]);
 					?>
 				</div>
diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php
index 2d9ca643..fb4035e5 100644
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
@@ -123,8 +123,8 @@
 						]); ?>
 					</div>
 					<div class="userEditGroupProfil displayNone"
-						id="userEditGroupProfil<?php echo self::GROUP_MODERATOR; ?>">
-						<?php echo template::select('userEditProfil' . self::GROUP_MODERATOR, $module::$userProfils[self::GROUP_MODERATOR], [
+						id="userEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
+						<?php echo template::select('userEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
 							'label' => 'Profil',
 							'selected' => $this->getData(['user', $this->getUrl(2), 'profil'])
 						]); ?>
@@ -138,9 +138,9 @@
 					]);
 					?>
 				</div>
-				<div id="userCommentProfil<?php echo self::GROUP_MODERATOR; ?>" class="col12 displayNone userCommentProfil">
-					<?php echo template::textarea('useraddProfilComment2' . self::GROUP_MODERATOR, [
-						"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MODERATOR])
+				<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>" class="col12 displayNone userCommentProfil">
+					<?php echo template::textarea('useraddProfilComment2' . self::GROUP_EDITOR, [
+						"value" => implode("\n",$module::$userProfilsComments[self::GROUP_EDITOR])
 					]);
 					?>
 				</div>
diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php
index cbd43898..521859a2 100644
--- a/core/module/user/view/profilEdit/profilEdit.php
+++ b/core/module/user/view/profilEdit/profilEdit.php
@@ -51,7 +51,7 @@
         </div>
     </div>
 </div>
-<?php if ($this->getUrl(2) >= self::GROUP_MODERATOR): ?>
+<?php if ($this->getUrl(2) >= self::GROUP_EDITOR): ?>
     <div class="row">
         <div class="col12">
             <div class="block">
diff --git a/module/blog/blog.php b/module/blog/blog.php
index 43a0b36f..c957412f 100755
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -27,15 +27,15 @@ class blog extends common
 	const EDIT_ALL = 'all';
 
 	public static $actions = [
-		'add' => self::GROUP_MODERATOR,
-		'comment' => self::GROUP_MODERATOR,
-		'commentApprove' => self::GROUP_MODERATOR,
-		'commentDelete' => self::GROUP_MODERATOR,
-		'commentDeleteAll' => self::GROUP_MODERATOR,
-		'config' => self::GROUP_MODERATOR,
-		'option' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
+		'add' => self::GROUP_EDITOR,
+		'comment' => self::GROUP_EDITOR,
+		'commentApprove' => self::GROUP_EDITOR,
+		'commentDelete' => self::GROUP_EDITOR,
+		'commentDeleteAll' => self::GROUP_EDITOR,
+		'config' => self::GROUP_EDITOR,
+		'option' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR,
 		'rss' => self::GROUP_VISITOR
 	];
@@ -697,7 +697,7 @@ class blog extends common
 			ksort(self::$users);
 			foreach (self::$users as $userId => &$userFirstname) {
 				// Les membres ne sont pas éditeurs, les exclure de la liste
-				if ($this->getData(['user', $userId, 'group']) < self::GROUP_MODERATOR) {
+				if ($this->getData(['user', $userId, 'group']) < self::GROUP_EDITOR) {
 					unset(self::$users[$userId]);
 				}
 				$userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']) . ' (' . self::$groupEdits[$this->getData(['user', $userId, 'group'])] . ')';
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index fb3f83be..48dd1df6 100755
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -29,7 +29,7 @@
 				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)
+						or $this->getData(['module',  $this->getUrl(0), 'posts',  $this->getUrl(1), 'editConsent']) === self::GROUP_EDITOR)
 					and $this->getUser('group') >=  $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'editConsent'])
 				)
 				or (
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index afedc745..0f608e10 100755
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -62,7 +62,7 @@
 									or (
 											// Groupe
 										($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'editConsent']) === self::GROUP_ADMIN
-											or $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'editConsent']) === self::GROUP_MODERATOR)
+											or $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'editConsent']) === self::GROUP_EDITOR)
 										and $this->getUser('group') >= $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'editConsent'])
 									)
 									or (
diff --git a/module/form/form.php b/module/form/form.php
index 6c851e55..66acf8dd 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -22,13 +22,13 @@ class form extends common
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
 	public static $actions = [
-		'config' => self::GROUP_MODERATOR,
-		'option' => self::GROUP_MODERATOR,
-		'data' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'deleteall' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_EDITOR,
+		'option' => self::GROUP_EDITOR,
+		'data' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'deleteall' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR,
-		'export2csv' => self::GROUP_MODERATOR,
+		'export2csv' => self::GROUP_EDITOR,
 	];
 
 	public static $data = [];
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index ebac4dd7..8d87d5b9 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -44,15 +44,15 @@ class gallery extends common
 	public static $config = [];
 
 	public static $actions = [
-		'config' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'dirs' => self::GROUP_MODERATOR,
-		'sortGalleries' => self::GROUP_MODERATOR,
-		'sortPictures' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
-		'add' => self::GROUP_MODERATOR,
-		'theme' => self::GROUP_MODERATOR,
-		'option' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'dirs' => self::GROUP_EDITOR,
+		'sortGalleries' => self::GROUP_EDITOR,
+		'sortPictures' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
+		'add' => self::GROUP_EDITOR,
+		'theme' => self::GROUP_EDITOR,
+		'option' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR
 	];
 
diff --git a/module/news/news.php b/module/news/news.php
index b131cf74..bf2ef0ec 100644
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -21,13 +21,13 @@ class news extends common
 	const DATADIRECTORY = self::DATA_DIR . 'news/';
 
 	public static $actions = [
-		'add' => self::GROUP_MODERATOR,
-		'config' => self::GROUP_MODERATOR,
+		'add' => self::GROUP_EDITOR,
+		'config' => self::GROUP_EDITOR,
 		// Edition des news
-		'option' => self::GROUP_MODERATOR,
+		'option' => self::GROUP_EDITOR,
 		// paramétrage des news
-		'delete' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR,
 		'rss' => self::GROUP_VISITOR
 	];
diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php
index c974fdc3..1f3fdf05 100644
--- a/module/redirection/redirection.php
+++ b/module/redirection/redirection.php
@@ -21,7 +21,7 @@ class redirection extends common
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
 	public static $actions = [
-		'config' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR
 	];
 
@@ -60,7 +60,7 @@ class redirection extends common
 		if (
 			$this->getUser('permission', __CLASS__, __FUNCTION__) !== true
 			&& $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-			&& $this->getUser('group') >= self::GROUP_MODERATOR
+			&& $this->getUser('group') >= self::GROUP_EDITOR
 			&& $this->getUrl(1) !== 'force'
 		) {
 			// Valeurs en sortie
diff --git a/module/search/search.php b/module/search/search.php
index d19a11ca..12a38747 100644
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -26,7 +26,7 @@ class search extends common
 
 	public static $actions = [
 		'index' => self::GROUP_VISITOR,
-		'config' => self::GROUP_MODERATOR
+		'config' => self::GROUP_EDITOR
 	];
 
 	// Variables pour l'affichage des résultats