From b66bee911cc7a2ba15cfd2f6428c824544842b5e Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 29 Apr 2015 21:45:05 +0000
Subject: [PATCH] Additional work with temporary permissions.

---
 resources/classes/permissions.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/resources/classes/permissions.php b/resources/classes/permissions.php
index dd0841f863..fa5ccb5055 100644
--- a/resources/classes/permissions.php
+++ b/resources/classes/permissions.php
@@ -35,13 +35,14 @@
 				 * Add a permission
 				 * @var string $permission
 				 */
-				public function add($permission) {
+				public function add($permission, $type = '') {
 					if (!$this->exists($permission)) {
 						//set the ordinal number
 							$i = count($_SESSION["permissions"])+1;
 
 						//set the permission
 							$_SESSION["permissions"][$i]["permission_name"] = $permission;
+							$_SESSION["permissions"][$i]["permission_type"] = "temp";
 					}
 				}
 
@@ -49,11 +50,20 @@
 				 * Remove the permission
 				 * @var string $permission
 				 */
-				public function delete($permission) {
+				public function delete($permission, $type = '') {
 					if ($this->exists($permission)) {
 						foreach($_SESSION["permissions"] as $key => $row) {
 							if ($row['permission_name'] == $permission) {
-								unset($_SESSION["permissions"][$key]);
+								if ($row['permission_name'] == $permission) {
+									if ($type == 'temp') {
+										if ($row['permission_type'] == "temp") {
+											unset($_SESSION["permissions"][$key]);
+										}
+									}
+									else {
+										unset($_SESSION["permissions"][$key]);
+									}
+								}
 								break;
 							}
 						}