projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed value for SA_SUPPBULKREP access area.
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index bb265047d0934bf6637318106c40a6986f194762..99d314770b6f5952cd723d940ee2c19b24c02d9b 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-127,7
+127,6
@@
class current_user
function can_access($page_level)
{
global $security_groups, $security_areas;
function can_access($page_level)
{
global $security_groups, $security_areas;
-
if (isset($security_groups)) {
return $this->company == 0 &&
in_array(20, $security_groups[$this->access]);
if (isset($security_groups)) {
return $this->company == 0 &&
in_array(20, $security_groups[$this->access]);
@@
-135,7
+134,10
@@
class current_user
if ($page_level === 'SA_OPEN')
return true;
if ($page_level === 'SA_OPEN')
return true;
- $code = @$security_areas[$page_level][0];
+ if ($page_level === 'SA_DENIED' || $page_level === '')
+ return false;
+
+ $code = $security_areas[$page_level][0];
// only first registered company has site admin privileges
return $code && in_array($code, $this->role_set)
// only first registered company has site admin privileges
return $code && in_array($code, $this->role_set)
@@
-147,11
+149,11
@@
class current_user
return $this->can_access($page_level);
}
return $this->can_access($page_level);
}
- function get_db_connection()
+ function get_db_connection(
$id=-1
)
{
global $db_connections;
{
global $db_connections;
- $connection = $db_connections[$
this->company
];
+ $connection = $db_connections[$
id == -1 ? $this->company : $id
];
//print_r($connection);
//print_r($connection);