From da4e8fc46cc83013bb51c81dc1c650c7f36872b5 Mon Sep 17 00:00:00 2001
From: Prof Langues <Prof_LVE@EDU.UA>
Date: Mon, 28 Sep 2020 16:45:22 +0200
Subject: [PATCH] GROUP_MODERATOR devient GROUP_EDITOR

---
 core/core.php                       | 16 ++++++++--------
 core/module/page/page.php           |  8 ++++----
 core/module/user/user.php           |  4 ++--
 core/module/user/view/add/add.php   |  2 +-
 core/module/user/view/edit/edit.php |  2 +-
 module/blog/blog.php                | 18 +++++++++---------
 module/form/form.php                | 12 ++++++------
 module/gallery/gallery.php          | 14 +++++++-------
 module/news/news.php                |  8 ++++----
 module/redirection/redirection.php  |  4 ++--
 module/search/search.php            |  2 +-
 11 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/core/core.php b/core/core.php
index 5d37a536..34f2098f 100644
--- a/core/core.php
+++ b/core/core.php
@@ -23,7 +23,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;
@@ -127,24 +127,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'
 	];
 	public static $timezone;
@@ -2678,7 +2678,7 @@ class layout extends common {
 		if($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')) {
 			// Items de gauche
 			$leftItems = '';
-			if($this->getUser('group') >= self::GROUP_MODERATOR) {
+			if($this->getUser('group') >= self::GROUP_EDITOR) {
 				$leftItems .= '<li><select id="barSelectPage">';
 				$leftItems .= '<option value="">Choisissez une page</option>';
 				$leftItems .= '<optgroup label="Pages orphelines">';
@@ -2742,7 +2742,7 @@ class layout extends common {
 			}
 			// Items de droite
 			$rightItems = '';
-			if($this->getUser('group') >= self::GROUP_MODERATOR) {
+			if($this->getUser('group') >= self::GROUP_EDITOR) {
 				$rightItems .= '<li><a href="' . helper::baseUrl(false) . 'core/vendor/filemanager/dialog.php?type=0&akey=' . md5_file(self::DATA_DIR.'core.json') .'" data-tippy-content="Gérer les fichiers" data-lity>' . template::ico('folder') . '</a></li>';
 			}
 			if($this->getUser('group') >= self::GROUP_ADMIN) {
@@ -2801,7 +2801,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/module/page/page.php b/core/module/page/page.php
index 733d9d54..bb9cdc72 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -17,10 +17,10 @@
 class page extends common {
 
 	public static $actions = [
-		'add' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
-		'duplicate' => self::GROUP_MODERATOR
+		'add' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
+		'duplicate' => self::GROUP_EDITOR
 	];
 	public static $pagesNoParentId = [
 		'' => 'Aucune'
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 1eed3585..549f4025 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -113,7 +113,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([
@@ -172,7 +172,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
diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php
index ad80e4d1..831a52bf 100644
--- a/core/module/user/view/add/add.php
+++ b/core/module/user/view/add/add.php
@@ -50,7 +50,7 @@
 				<ul id="userAddGroupDescription<?php echo self::GROUP_MEMBER; ?>" class="userAddGroupDescription displayNone">
 					<li>Accès aux pages privées membres</li>
 				</ul>
-				<ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone">
+				<ul id="userAddGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userAddGroupDescription displayNone">
 					<li>Accès aux pages privées membres et éditeurs</li>
 					<li>Ajout / Édition / Suppression de pages</li>
 					<li>Ajout / Édition / Suppression de fichiers</li>
diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php
index 1e890fe7..28dfe0e5 100644
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
@@ -68,7 +68,7 @@
 					<ul id="userEditGroupDescription<?php echo self::GROUP_MEMBER; ?>" class="userEditGroupDescription displayNone">
 						<li>Accès aux pages privées membres</li>
 					</ul>
-					<ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone">
+					<ul id="userEditGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userEditGroupDescription displayNone">
 						<li>Accès aux pages privées membres et éditeurs</li>
 						<li>Ajout / Édition / Suppression de pages</li>
 						<li>Ajout / Édition / Suppression de fichiers</li>
diff --git a/module/blog/blog.php b/module/blog/blog.php
index 75912c33..c2d3b1cb 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -21,14 +21,14 @@ class blog extends common {
 	const EDIT_ADMIN        = '03'; // Groupe des admin
 
 	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,
-		'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,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR
 	];
 
@@ -469,7 +469,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/form/form.php b/module/form/form.php
index 6a0f2714..cc51da54 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -17,13 +17,13 @@
 class form extends common {
 
 	public static $actions = [
-		'config' => self::GROUP_MODERATOR,
-		'data' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'deleteall' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_EDITOR,
+		'data' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'deleteall' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR,
-		'export2csv' => self::GROUP_MODERATOR,
-		'output2csv' => self::GROUP_MODERATOR
+		'export2csv' => self::GROUP_EDITOR,
+		'output2csv' => self::GROUP_EDITOR
 	];
 
 	public static $data = [];
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index 77d0f2c3..c89655ef 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -36,13 +36,13 @@ class gallery extends common {
 	public static $thumbs = [];
 
 	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,
-		'theme' 		=> 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,
+		'theme' 		=> self::GROUP_EDITOR,
 		'index' 		=> self::GROUP_VISITOR
 	];
 
diff --git a/module/news/news.php b/module/news/news.php
index ac221426..6aaa58dc 100644
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -15,10 +15,10 @@
 class news extends common {
 
 	public static $actions = [
-		'add' => self::GROUP_MODERATOR,
-		'config' => self::GROUP_MODERATOR,
-		'delete' => self::GROUP_MODERATOR,
-		'edit' => self::GROUP_MODERATOR,
+		'add' => self::GROUP_EDITOR,
+		'config' => self::GROUP_EDITOR,
+		'delete' => self::GROUP_EDITOR,
+		'edit' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR
 	];
 
diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php
index 5c92521c..f6aa0852 100644
--- a/module/redirection/redirection.php
+++ b/module/redirection/redirection.php
@@ -15,7 +15,7 @@
 class redirection extends common {
 
 	public static $actions = [
-		'config' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_EDITOR,
 		'index' => self::GROUP_VISITOR
 	];
 
@@ -49,7 +49,7 @@ class redirection extends common {
 		// Message si l'utilisateur peut éditer la page
 		if(
 			$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-			AND $this->getUser('group') >= self::GROUP_MODERATOR
+			AND $this->getUser('group') >= self::GROUP_EDITOR
 			AND $this->getUrl(1) !== 'force'
 		) {
 			// Valeurs en sortie
diff --git a/module/search/search.php b/module/search/search.php
index b2a41f07..556036f0 100644
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -20,7 +20,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