From d55cca75b25e150dac6e41575144c95544227c1d Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre@mail.local>
Date: Thu, 5 Jul 2018 08:30:46 +0200
Subject: [PATCH] Centralized membership levels in GroupMember class

---
 RestControllers/GroupsController.php   | 12 ++++++------
 classes/components/GroupsComponent.php | 12 ++++++------
 classes/models/GroupInfo.php           |  8 --------
 classes/models/GroupMember.php         |  5 +++--
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/RestControllers/GroupsController.php b/RestControllers/GroupsController.php
index dbb6568..6784e17 100644
--- a/RestControllers/GroupsController.php
+++ b/RestControllers/GroupsController.php
@@ -20,12 +20,12 @@ class GroupsController {
 	 * API groups membership levels
 	 */
 	const GROUPS_MEMBERSHIP_LEVELS = array(
-		GroupInfo::ADMINISTRATOR => "administrator",
-		GroupInfo::MODERATOR => "moderator",
-		GroupInfo::MEMBER => "member",
-		GroupInfo::INVITED => "invited",
-		GroupInfo::PENDING => "pending",
-		GroupInfo::VISITOR => "visitor"
+		GroupMember::ADMINISTRATOR => "administrator",
+		GroupMember::MODERATOR => "moderator",
+		GroupMember::MEMBER => "member",
+		GroupMember::INVITED => "invited",
+		GroupMember::PENDING => "pending",
+		GroupMember::VISITOR => "visitor"
 	);
 
 	/**
diff --git a/classes/components/GroupsComponent.php b/classes/components/GroupsComponent.php
index d41209d..ef3592b 100644
--- a/classes/components/GroupsComponent.php
+++ b/classes/components/GroupsComponent.php
@@ -290,14 +290,14 @@ class GroupsComponent {
             $membership_level = $this->getMembershipLevel($userID, $groupID);
         
         else
-            $membership_level = GroupInfo::VISITOR; //Signed out users are all visitors
+            $membership_level = GroupMember::VISITOR; //Signed out users are all visitors
 
         //Check if the user is a confirmed member of group
-        if($membership_level == GroupInfo::ADMINISTRATOR)
+        if($membership_level == GroupMember::ADMINISTRATOR)
             return GroupInfo::ADMIN_ACCESS;
-        if($membership_level == GroupInfo::MODERATOR)
+        if($membership_level == GroupMember::MODERATOR)
             return GroupInfo::MODERATOR_ACCESS;
-        if($membership_level == GroupInfo::MEMBER)
+        if($membership_level == GroupMember::MEMBER)
             return GroupInfo::MEMBER_ACCESS;
         
         //Get the visibility level of the group
@@ -308,8 +308,8 @@ class GroupsComponent {
             return GroupInfo::VIEW_ACCESS;
 
         //Else, all pending and invited membership get limited access
-        if($membership_level == GroupInfo::PENDING ||
-            $membership_level == GroupInfo::INVITED)
+        if($membership_level == GroupMember::PENDING ||
+            $membership_level == GroupMember::INVITED)
             return GroupInfo::LIMITED_ACCESS;
 
         //Private groups gives limited access
diff --git a/classes/models/GroupInfo.php b/classes/models/GroupInfo.php
index 01f155e..2cfb379 100644
--- a/classes/models/GroupInfo.php
+++ b/classes/models/GroupInfo.php
@@ -27,14 +27,6 @@ class GroupInfo extends BaseUniqueObject {
 	const MEMBER_ACCESS = 3; //Member access (same as view access but as member)
 	const MODERATOR_ACCESS = 4; //Can create posts, even if posts creation is restricted
 	const ADMIN_ACCESS = 5; //Can do everything
-	
-	//Membership levels
-	const ADMINISTRATOR = 0;
-	const MODERATOR = 1;
-	const MEMBER = 2;
-	const INVITED = 3;
-	const PENDING = 4;
-	const VISITOR = 5;
 
 	//Private fields
     private $name;
diff --git a/classes/models/GroupMember.php b/classes/models/GroupMember.php
index 3660c30..0bcb8e8 100644
--- a/classes/models/GroupMember.php
+++ b/classes/models/GroupMember.php
@@ -13,8 +13,9 @@ class GroupMember extends BaseUniqueObjectFromUser {
     const ADMINISTRATOR = 0;
     const MODERATOR = 1;
 	const MEMBER = 2;
-	const PENDING = 3; //When the group membership has not been approved yet
-	const VISITOR = 4; //Simple visitor
+	const INVITED = 3;
+	const PENDING = 4; //When the group membership has not been approved yet
+	const VISITOR = 5; //Simple visitor
 
     //Private fields
     private $group_id = 1;