From 4776a94b143ce831c507cf852835d6af1bfd8601 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 22 Jul 2006 01:06:59 +0000
Subject: [PATCH] r914: Renaming $_PERMISSION to $bugsys->permissions

---
 admin/permission.php     |  4 ++--
 admin/usergroup.php      |  6 +++---
 includes/functions.php   | 14 +++++++-------
 includes/permissions.php |  7 +------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/admin/permission.php b/admin/permission.php
index 4f64498..36dd5c0 100755
--- a/admin/permission.php
+++ b/admin/permission.php
@@ -128,7 +128,7 @@ if ($_REQUEST['do'] == 'edit')
 		$admin->row_span($group, 'thead', 'center');
 		foreach ($settings AS $setting => $name)
 		{
-			$admin->row_yesno($name, "perm[$setting]", ($mask & $_PERMISSION["$setting"]));
+			$admin->row_yesno($name, "perm[$setting]", ($mask & $bugsys->permissions["$setting"]));
 		}
 	}
 
@@ -149,7 +149,7 @@ if ($_POST['do'] == 'update')
 	));
 	foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
 	{
-		$permissionvalue += $_PERMISSION["$permtitle"] * $binaryswitch;
+		$permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
 	}
 	
 	$db->query("
diff --git a/admin/usergroup.php b/admin/usergroup.php
index b80f29d..ad4656d 100755
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -155,7 +155,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
 		$admin->row_span($group, 'thead', 'center');
 		foreach ($settings AS $setting => $name)
 		{
-			$admin->row_yesno($name, "perm[$setting]", ($usergroup->objdata['permissions'] & $_PERMISSION["$setting"]));
+			$admin->row_yesno($name, "perm[$setting]", ($usergroup->objdata['permissions'] & $bugsys->permissions["$setting"]));
 		}
 	}
 	
@@ -203,7 +203,7 @@ if ($_POST['do'] == 'insert')
 	$bugsys->input_clean('perm', TYPE_UINT);
 	foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
 	{
-		$permissionvalue += $_PERMISSION["$permtitle"] * $binaryswitch;
+		$permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
 	}
 	
 	$usergroup = new UsergroupAPI($bugsys);
@@ -244,7 +244,7 @@ if ($_POST['do'] == 'update')
 	$bugsys->input_clean('perm', TYPE_UINT);
 	foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
 	{
-		$permissionvalue += $_PERMISSION["$permtitle"] * $binaryswitch;
+		$permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
 	}
 	
 	$usergroup = new UsergroupAPI($bugsys);
diff --git a/includes/functions.php b/includes/functions.php
index 7b948b2..2593aa5 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -73,14 +73,14 @@ function construct_user_display($userinfo, $html = true)
 // short-hand for bitwise &
 function can_perform($bitmask, $productid = 0, $userinfo = null)
 {
-	global $bugsys, $_PERMISSION;
+	global $bugsys;
 	
 	if ($userinfo == null)
 	{
 		$userinfo =& $bugsys->userinfo;
 	}
 	
-	if (!isset($_PERMISSION["$bitmask"]))
+	if (!isset($bugsys->permissions["$bitmask"]))
 	{
 		trigger_error('Invalid bitmask "' . $bitmask . '" specified for can_perform() [includes/functions.php]', E_USER_WARNING);
 	}
@@ -91,11 +91,11 @@ function can_perform($bitmask, $productid = 0, $userinfo = null)
 		
 		if (!in_array($bitmask, $inspecific))
 		{
-			return ($bugsys->datastore['permission']["$userinfo[usergroupid]"]["$productid"] & $_PERMISSION["$bitmask"]);
+			return ($bugsys->datastore['permission']["$userinfo[usergroupid]"]["$productid"] & $bugsys->permissions["$bitmask"]);
 		}
 	}
 	
-	return ($userinfo['permissions'] & $_PERMISSION["$bitmask"]);
+	return ($userinfo['permissions'] & $bugsys->permissions["$bitmask"]);
 }
 
 // ################# Start construct_datastore_select ################
@@ -365,7 +365,7 @@ function process_custom_fields($bugid, $inputdata = array())
 // ####################### Start fetch_on_bits #######################
 function fetch_on_bits($mask, $userinfo = null)
 {
-	global $bugsys, $_PERMISSION;
+	global $bugsys;
 	
 	if ($userinfo == null)
 	{
@@ -376,7 +376,7 @@ function fetch_on_bits($mask, $userinfo = null)
 	
 	$usergroupid = $userinfo['usergroupid'];
 	
-	if ($bugsys->datastore['usergroup']["$usergroupid"]['permissions'] & $_PERMISSION["$mask"])
+	if ($bugsys->datastore['usergroup']["$usergroupid"]['permissions'] & $bugsys->permissions["$mask"])
 	{
 		foreach ($bugsys->datastore['product'] AS $id => $product)
 		{
@@ -391,7 +391,7 @@ function fetch_on_bits($mask, $userinfo = null)
 	{
 		foreach ($bugsys->datastore['permission']["$usergroupid"] AS $productid => $bit)
 		{
-			if ($bit & $_PERMISSION["$mask"])
+			if ($bit & $bugsys->permissions["$mask"])
 			{
 				$onbits["$productid"] = $productid;
 			}
diff --git a/includes/permissions.php b/includes/permissions.php
index 9eb18aa..5783485 100644
--- a/includes/permissions.php
+++ b/includes/permissions.php
@@ -19,7 +19,7 @@
 || ###################################################################
 \*=====================================================================*/
 
-$_PERMISSION = array(
+$bugsys->permissions = array(
 	'canviewbugs'		=> 1, // can view bugs
 	'cansearch'			=> 2, // can use the search
 	'cansubscribe'		=> 4, // can email subscribe
@@ -46,11 +46,6 @@ $_PERMISSION = array(
 	'caneditotherreply'	=> 8388608 // can edit other peoples' comments
 );
 
-foreach ($_PERMISSION AS $name => $maskvalue)
-{
-	define(strtoupper($name), $maskvalue);
-}
-
 $bugsys->emailoptions = array(
 	'relations' => array(
 		// a user's relation to the bug
-- 
2.22.5