From d4321076fc8a87c61e0794c894cd464b4622fa68 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Wed, 14 Oct 2020 19:17:13 +0200
Subject: [PATCH] EDITOR devient MODERATOR

---
 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                 | 20 ++++++++++----------
 module/blog/view/article/article.php |  2 +-
 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 +-
 12 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/core/core.php b/core/core.php
index 97f4c478..81709e99 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_EDITOR = 2;
+	const GROUP_MODERATOR = 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_EDITOR => 'Éditeur',
+		self::GROUP_MODERATOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupEdits = [
 		self::GROUP_BANNED => 'Banni',
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_EDITOR => 'Éditeur',
+		self::GROUP_MODERATOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupNews = [
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_EDITOR => 'Éditeur',
+		self::GROUP_MODERATOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $groupPublics = [
 		self::GROUP_VISITOR => 'Visiteur',
 		self::GROUP_MEMBER => 'Membre',
-		self::GROUP_EDITOR => 'Éditeur',
+		self::GROUP_MODERATOR => 'Éditeur',
 		self::GROUP_ADMIN => 'Administrateur'
 	];
 	public static $timezone;
@@ -2695,7 +2695,7 @@ class layout extends common {
 		if($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')) {
 			// Items de gauche
 			$leftItems = '';
-			if($this->getUser('group') >= self::GROUP_EDITOR) {
+			if($this->getUser('group') >= self::GROUP_MODERATOR) {
 				$leftItems .= '<li><select id="barSelectPage">';
 				$leftItems .= '<option value="">Choisissez une page</option>';
 				$leftItems .= '<optgroup label="Pages orphelines">';
@@ -2759,7 +2759,7 @@ class layout extends common {
 			}
 			// Items de droite
 			$rightItems = '';
-			if($this->getUser('group') >= self::GROUP_EDITOR) {
+			if($this->getUser('group') >= self::GROUP_MODERATOR) {
 				$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) {
@@ -2818,7 +2818,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_EDITOR
+			AND $this->getUser('group') >= self::GROUP_MODERATOR
 		) {
 			$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 1a162123..013c1a08 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_EDITOR,
-		'delete' => self::GROUP_EDITOR,
-		'edit' => self::GROUP_EDITOR,
-		'duplicate' => self::GROUP_EDITOR
+		'add' => self::GROUP_MODERATOR,
+		'delete' => self::GROUP_MODERATOR,
+		'edit' => self::GROUP_MODERATOR,
+		'duplicate' => self::GROUP_MODERATOR
 	];
 	public static $pagesNoParentId = [
 		'' => 'Aucune'
diff --git a/core/module/user/user.php b/core/module/user/user.php
index af7e0fd4..a385bdeb 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -124,7 +124,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_EDITOR)
+			AND ($this->getUrl('group') < self::GROUP_MODERATOR)
 		) {
 			// Valeurs en sortie
 			$this->addOutput([
@@ -183,7 +183,7 @@ class user extends common {
 					AND $this->getUrl('group') <= self::GROUP_VISITOR
 				)
 				// Impossible d'éditer un autre utilisateur
-				OR ($this->getUrl('group') < self::GROUP_EDITOR)
+				OR ($this->getUrl('group') < self::GROUP_MODERATOR)
 			)
 		) {
 			// Valeurs en sortie
diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php
index 831a52bf..ad80e4d1 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_EDITOR; ?>" class="userAddGroupDescription displayNone">
+				<ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" 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 28dfe0e5..1e890fe7 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_EDITOR; ?>" class="userEditGroupDescription displayNone">
+					<ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" 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 5370b88f..e0dacf3a 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -19,14 +19,14 @@ class blog extends common {
 	const EDIT_ALL = 'all';
 
 	public static $actions = [
-		'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,
+		'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,
 		'index' => self::GROUP_VISITOR
 	];
 
@@ -310,7 +310,7 @@ class blog extends common {
 					(
 					 $this->getData(['module',  $this->getUrl(0), $value,'editConsent']) === self::EDIT_OWNER
 					 AND $this->getData(['module',  $this->getUrl(0), $value,'userId']) === $this->getUser('id')
-					 AND $this->getUser('group') >= self::GROUP_EDITOR
+					 AND $this->getUser('group') >= self::GROUP_MODERATOR
 					)
 
 				OR (
@@ -481,7 +481,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_EDITOR) {
+				if ( $this->getData(['user', $userId, 'group']) < self::GROUP_MODERATOR) {
 					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 b8592fbc..f6f1e4f3 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -15,7 +15,7 @@
 						(
 							$this->getData(['module',  $this->getUrl(0), $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER
 							AND $this->getData(['module',  $this->getUrl(0), $this->getUrl(1),'userId']) === $this->getUser('id')
-							AND $this->getUser('group') >= self::GROUP_EDITOR
+							AND $this->getUser('group') >= self::GROUP_MODERATOR
 						)
 					)  OR (
 						// Groupe
diff --git a/module/form/form.php b/module/form/form.php
index ff9a1635..6c11b2df 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_EDITOR,
-		'data' => self::GROUP_EDITOR,
-		'delete' => self::GROUP_EDITOR,
-		'deleteall' => self::GROUP_EDITOR,
+		'config' => self::GROUP_MODERATOR,
+		'data' => self::GROUP_MODERATOR,
+		'delete' => self::GROUP_MODERATOR,
+		'deleteall' => self::GROUP_MODERATOR,
 		'index' => self::GROUP_VISITOR,
-		'export2csv' => self::GROUP_EDITOR,
-		'output2csv' => self::GROUP_EDITOR
+		'export2csv' => self::GROUP_MODERATOR,
+		'output2csv' => self::GROUP_MODERATOR
 	];
 
 	public static $data = [];
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index c89655ef..77d0f2c3 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_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,
+		'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,
 		'index' 		=> self::GROUP_VISITOR
 	];
 
diff --git a/module/news/news.php b/module/news/news.php
index adc1a2d3..4499028c 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_EDITOR,
-		'config' => self::GROUP_EDITOR,
-		'delete' => self::GROUP_EDITOR,
-		'edit' => self::GROUP_EDITOR,
+		'add' => self::GROUP_MODERATOR,
+		'config' => self::GROUP_MODERATOR,
+		'delete' => self::GROUP_MODERATOR,
+		'edit' => self::GROUP_MODERATOR,
 		'index' => self::GROUP_VISITOR
 	];
 
diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php
index f6aa0852..5c92521c 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_EDITOR,
+		'config' => self::GROUP_MODERATOR,
 		'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_EDITOR
+			AND $this->getUser('group') >= self::GROUP_MODERATOR
 			AND $this->getUrl(1) !== 'force'
 		) {
 			// Valeurs en sortie
diff --git a/module/search/search.php b/module/search/search.php
index 556036f0..b2a41f07 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_EDITOR
+		'config' => self::GROUP_MODERATOR
 	];
 
 	// Variables pour l'affichage des résultats