From 5d7a124a7968e33313694a5f71099bbd5981f962 Mon Sep 17 00:00:00 2001
From: FusionPBX <mark@fusionpbx.com>
Date: Tue, 26 Nov 2024 21:48:08 -0700
Subject: [PATCH] Fix permissions when not using a session

---
 resources/classes/permissions.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/resources/classes/permissions.php b/resources/classes/permissions.php
index 44c6740c03..ce960fbaaf 100644
--- a/resources/classes/permissions.php
+++ b/resources/classes/permissions.php
@@ -80,7 +80,7 @@ if (!class_exists('permissions')) {
 
 				//get the list of groups assigned to the user
 				if (!empty($this->groups)) {
-					$this->permissions = $this->assigned();
+					$this->assigned();
 				}
 			}
 		}
@@ -99,7 +99,7 @@ if (!class_exists('permissions')) {
 		public function add($permission, $type) {
 			//add the permission if it is not in array
 			if (!$this->exists($permission)) {
-				$_SESSION["permissions"][$permission] = $type;
+				$this->permissions[$permission] = $type;
 			}
 		}
 
@@ -108,15 +108,15 @@ if (!class_exists('permissions')) {
 		 * @var string $permission
 		 */
 		public function delete($permission, $type) {
-			if ($this->exists($permission) && !empty($_SESSION["permissions"][$permission])) {
+			if ($this->exists($permission) && !empty($this->permissions[$permission])) {
 				if ($type === "temp") {
-					if ($_SESSION["permissions"][$permission] === "temp") {
-						unset($_SESSION["permissions"][$permission]);
+					if ($this->permissions[$permission] === "temp") {
+						unset($this->permissions[$permission]);
 					}
 				}
 				else {
-					if ($_SESSION["permissions"][$permission] !== "temp") {
-						unset($_SESSION["permissions"][$permission]);
+					if ($this->permissions[$permission] !== "temp") {
+						unset($this->permissions[$permission]);
 					}
 				}
 			}
@@ -145,8 +145,9 @@ if (!class_exists('permissions')) {
 		 * get the assigned permissions
 		 * @var array $groups
 		 */
-		public function assigned() {
+		private function assigned() {
 			//define the array
+			$permissions = [];
 			$parameter_names = [];
 
 			//return empty array if there are no groups
@@ -170,9 +171,15 @@ if (!class_exists('permissions')) {
 			$sql .= "and group_name in (".implode(", ", $parameter_names).") \n";
 			$sql .= "and permission_assigned = 'true' ";
 			$parameters['domain_uuid'] = $this->domain_uuid;
-			$permissions = $this->database->select($sql, $parameters, 'all');
-			unset($sql, $parameters, $result);
-			return $permissions;
+			$group_permissions = $this->database->select($sql, $parameters, 'all');
+
+			//format the permission array
+			foreach ($group_permissions as $row) {
+				$permissions[$row['permission_name']] = 1;
+			}
+
+			//save permissions to this object
+			$this->permissions = $permissions;
 		}
 
 		/**