X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=99d314770b6f5952cd723d940ee2c19b24c02d9b;hb=6989100b74130784a524b1f941b3ae73f30f663a;hp=a4ee5e85da39e7cd211d64fc21612f7c177ac662;hpb=937d1698664f1021c0767d59950d14628d037aca;p=fa-stable.git diff --git a/includes/current_user.inc b/includes/current_user.inc index a4ee5e85..99d31477 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -25,7 +25,7 @@ class current_user var $timeout; var $last_act; var $role_set = false; - + var $old_db; var $logged; var $ui_mode = 0; @@ -127,7 +127,6 @@ class current_user 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]); @@ -135,7 +134,10 @@ class current_user 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) @@ -147,11 +149,11 @@ class current_user return $this->can_access($page_level); } - function get_db_connection() + function get_db_connection($id=-1) { global $db_connections; - $connection = $db_connections[$this->company]; + $connection = $db_connections[$id == -1 ? $this->company : $id]; //print_r($connection);