https://src.bluestatic.org
/
bugdar.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f77b886
)
Changing $bugsys->permissions[] to bugdar::$permissions[]
author
Robert Sesek <rsesek@bluestatic.org>
Sat, 23 Aug 2008 17:13:48 +0000
(13:13 -0400)
committer
Robert Sesek <rsesek@bluestatic.org>
Sat, 23 Aug 2008 17:13:48 +0000
(13:13 -0400)
admin/permission.php
patch
|
blob
|
history
admin/usergroup.php
patch
|
blob
|
history
includes/functions.php
patch
|
blob
|
history
includes/functions_datastore.php
patch
|
blob
|
history
includes/permissions.php
patch
|
blob
|
history
diff --git
a/admin/permission.php
b/admin/permission.php
index aab83df0fbe0ca4b113aa622a86c95e43f8feff8..fcd40dd611bd7b1a7f2b86a6fbd5a30c8f72cb3c 100755
(executable)
--- a/
admin/permission.php
+++ b/
admin/permission.php
@@
-132,7
+132,7
@@
if ($_REQUEST['do'] == 'edit')
$admin->row_span($group, 'thead', 'center');
foreach ($settings AS $setting => $name)
{
$admin->row_span($group, 'thead', 'center');
foreach ($settings AS $setting => $name)
{
- $admin->row_yesno($name, "perm[$setting]", ($mask &
$bugsys->
permissions["$setting"]));
+ $admin->row_yesno($name, "perm[$setting]", ($mask &
bugdar::$
permissions["$setting"]));
}
}
}
}
@@
-153,7
+153,7
@@
if ($_POST['do'] == 'update')
));
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
));
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
- $permissionvalue +=
$bugsys->
permissions["$permtitle"] * $binaryswitch;
+ $permissionvalue +=
bugdar::$
permissions["$permtitle"] * $binaryswitch;
}
$db->query("
}
$db->query("
diff --git
a/admin/usergroup.php
b/admin/usergroup.php
index e0b7cfed2a9e07ae9fdfbd0bdaee3cf9aee9a176..868dc17344e9718e2450e4046b4eb2fe1c5fc1bf 100755
(executable)
--- a/
admin/usergroup.php
+++ b/
admin/usergroup.php
@@
-168,7
+168,7
@@
if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
$admin->row_span($group, 'thead', 'center');
foreach ($settings AS $setting => $name)
{
$admin->row_span($group, 'thead', 'center');
foreach ($settings AS $setting => $name)
{
- $admin->row_yesno($name, "perm[$setting]", ($usergroup->record['permissions'] &
$bugsys->
permissions["$setting"]));
+ $admin->row_yesno($name, "perm[$setting]", ($usergroup->record['permissions'] &
bugdar::$
permissions["$setting"]));
}
}
}
}
@@
-216,7
+216,7
@@
if ($_POST['do'] == 'insert')
$input->inputClean('perm', TYPE_UINT);
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
$input->inputClean('perm', TYPE_UINT);
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
- $permissionvalue +=
$bugsys->
permissions["$permtitle"] * $binaryswitch;
+ $permissionvalue +=
bugdar::$
permissions["$permtitle"] * $binaryswitch;
}
$usergroup = new UsergroupAPI();
}
$usergroup = new UsergroupAPI();
@@
-271,7
+271,7
@@
if ($_POST['do'] == 'update')
$input->inputClean('perm', TYPE_UINT);
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
$input->inputClean('perm', TYPE_UINT);
foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
{
- $permissionvalue +=
$bugsys->
permissions["$permtitle"] * $binaryswitch;
+ $permissionvalue +=
bugdar::$
permissions["$permtitle"] * $binaryswitch;
}
$usergroup = new UsergroupAPI();
}
$usergroup = new UsergroupAPI();
diff --git
a/includes/functions.php
b/includes/functions.php
index 39e419a4147ad7a22596ed7b412a818909e43de5..1d9f87069455f3563d231e76c69a784b71ad45e3 100755
(executable)
--- a/
includes/functions.php
+++ b/
includes/functions.php
@@
-121,7
+121,7
@@
function can_perform($bitmask, $productid = 0, $userinfo = null)
$permissions =& bugdar::$datastore['permission'];
$permissions =& bugdar::$datastore['permission'];
- if (!isset(
$bugsys->
permissions["$bitmask"]))
+ if (!isset(
bugdar::$
permissions["$bitmask"]))
{
trigger_error('Invalid bitmask "' . $bitmask . '" specified for can_perform() [includes/functions.php]', E_USER_WARNING);
}
{
trigger_error('Invalid bitmask "' . $bitmask . '" specified for can_perform() [includes/functions.php]', E_USER_WARNING);
}
@@
-133,21
+133,21
@@
function can_perform($bitmask, $productid = 0, $userinfo = null)
if ($productid AND !in_array($bitmask, $inspecific))
{
if ($productid AND !in_array($bitmask, $inspecific))
{
- $verdict = (isset($permissions["$userinfo[usergroupid]"]["$productid"]) ? ($permissions["$userinfo[usergroupid]"]["$productid"] &
$bugsys->permissions["$bitmask"]) : ($userinfo['permissions'] & $bugsys->
permissions["$bitmask"]));
+ $verdict = (isset($permissions["$userinfo[usergroupid]"]["$productid"]) ? ($permissions["$userinfo[usergroupid]"]["$productid"] &
bugdar::$permissions["$bitmask"]) : ($userinfo['permissions'] & bugdar::$
permissions["$bitmask"]));
foreach ($userinfo['groupids'] AS $group)
{
if (isset($permissions["$group"]["$productid"]))
{
foreach ($userinfo['groupids'] AS $group)
{
if (isset($permissions["$group"]["$productid"]))
{
- $verdict |= ($permissions["$group"]["$productid"] &
$bugsys->
permissions["$bitmask"]);
+ $verdict |= ($permissions["$group"]["$productid"] &
bugdar::$
permissions["$bitmask"]);
}
}
BSApp::debug("verdict* on can_perform($bitmask, $productid, $userinfo[userid]) = $verdict");
return $verdict;
}
}
}
BSApp::debug("verdict* on can_perform($bitmask, $productid, $userinfo[userid]) = $verdict");
return $verdict;
}
- BSApp::debug("verdict on can_perform($bitmask, $productid, $userinfo[userid]) = " . ($userinfo['permissions'] &
$bugsys->
permissions["$bitmask"]));
- return ($userinfo['permissions'] &
$bugsys->
permissions["$bitmask"]);
+ BSApp::debug("verdict on can_perform($bitmask, $productid, $userinfo[userid]) = " . ($userinfo['permissions'] &
bugdar::$
permissions["$bitmask"]));
+ return ($userinfo['permissions'] &
bugdar::$
permissions["$bitmask"]);
}
/**
}
/**
@@
-503,7
+503,7
@@
function fetch_on_bits($mask, $userinfo = null)
foreach ($groups AS $groupid)
{
// we only need to do this so long as there's no onbits array because this isn't product specific
foreach ($groups AS $groupid)
{
// we only need to do this so long as there's no onbits array because this isn't product specific
- if (sizeof($onbits) == 0 AND bugdar::$datastore['usergroup']["$groupid"]['permissions'] &
$bugsys->
permissions["$mask"])
+ if (sizeof($onbits) == 0 AND bugdar::$datastore['usergroup']["$groupid"]['permissions'] &
bugdar::$
permissions["$mask"])
{
foreach (bugdar::$datastore['product'] AS $id => $product)
{
{
foreach (bugdar::$datastore['product'] AS $id => $product)
{
@@
-523,7
+523,7
@@
function fetch_on_bits($mask, $userinfo = null)
{
foreach (bugdar::$datastore['permission']["$groupid"] AS $productid => $bit)
{
{
foreach (bugdar::$datastore['permission']["$groupid"] AS $productid => $bit)
{
- if ($bit &
$bugsys->
permissions["$mask"])
+ if ($bit &
bugdar::$
permissions["$mask"])
{
$explicit["$productid"] = $productid;
$onbits["$productid"] = $productid;
{
$explicit["$productid"] = $productid;
$onbits["$productid"] = $productid;
diff --git
a/includes/functions_datastore.php
b/includes/functions_datastore.php
index ca9f379a137486b7a26735e8f765b60690bfcc1c..113c21abe835df561a1ad3ac2f0f4d1b1066a8e1 100755
(executable)
--- a/
includes/functions_datastore.php
+++ b/
includes/functions_datastore.php
@@
-148,7
+148,7
@@
function build_assignedto()
$ids = $exprs = array();
foreach (bugdar::$datastore['usergroup'] AS $id => $group)
{
$ids = $exprs = array();
foreach (bugdar::$datastore['usergroup'] AS $id => $group)
{
- if ($group['permissions'] &
$bugsys->
permissions['canbeassignedto'])
+ if ($group['permissions'] &
bugdar::$
permissions['canbeassignedto'])
{
$ids[] = $id;
$exprs[] = "FIND_IN_SET($id, groupids)";
{
$ids[] = $id;
$exprs[] = "FIND_IN_SET($id, groupids)";
diff --git
a/includes/permissions.php
b/includes/permissions.php
index dae3b09b3581bce92e73e4d879f79a53c598722a..dc8f46d340f7196e4703865133e17833a6e1ac32 100644
(file)
--- a/
includes/permissions.php
+++ b/
includes/permissions.php
@@
-19,7
+19,7
@@
|| ###################################################################
\*=====================================================================*/
|| ###################################################################
\*=====================================================================*/
-
$bugsys->
permissions = array(
+
bugdar::$
permissions = array(
'canviewbugs' => 1, // can view bugs
'cansearch' => 2, // can use the search
'cansubscribe' => 4, // can email subscribe
'canviewbugs' => 1, // can view bugs
'cansearch' => 2, // can use the search
'cansubscribe' => 4, // can email subscribe