extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid calling accounts->members(hips) without an account_id

Browse Source
This commit is contained in:
Ralf Becker 2012-08-08 10:41:04 +00:00
parent c30999f1b4
commit 75b458b2f8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
phpgwapi/inc/class.acl.inc.php
View File

@ -52,9 +52,9 @@ class acl
* Some functions are specific to this account, and others are generic. * Some functions are specific to this account, and others are generic.
* *
* @example acl->acl(5); // 5 is the user id * @example acl->acl(5); // 5 is the user id
* @param int $account_id int-the user id * @param int $account_id=null user id or default null to use current user from $GLOBALS['egw_info']['user']['account_id']
*/ */
function acl($account_id = '') function __construct($account_id = null)
{ {
if (is_object($GLOBALS['egw_setup']->db)) if (is_object($GLOBALS['egw_setup']->db))
{ {
@ -70,6 +70,17 @@ class acl
} }
} }
/**
* PHP4 constructor
*
* @deprecated use __construct
* @param int $account_id=null
*/
function acl($account_id = null)
{
$this->__construct($account_id);
}
function DONTlist_methods($_type='xmlrpc') function DONTlist_methods($_type='xmlrpc')
{ {
/* /*
@ -131,9 +142,9 @@ class acl
// Here is yet another work around(tm) (jengo) // Here is yet another work around(tm) (jengo)
if (!$this->account_id) if (!$this->account_id)
{ {
$this->acl(); $this->__construct();
} }
if ($no_groups === true || !$this->account_id) if ($no_groups === true || !(int)$this->account_id)
{ {
$acl_acc_list = $this->account_id; $acl_acc_list = $this->account_id;
} }
@ -481,7 +492,7 @@ class acl
if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp']; if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
$accounts = array($account_id); $accounts = array($account_id);
if ($use_memberships) if ($use_memberships && (int)$account_id > 0)
{ {
$accounts = $GLOBALS['egw']->accounts->memberships($account_id, true); $accounts = $GLOBALS['egw']->accounts->memberships($account_id, true);
$accounts[] = $account_id; $accounts[] = $account_id;
@ -640,7 +651,7 @@ class acl
$account_id = get_account_id($accountid,$this->account_id); $account_id = get_account_id($accountid,$this->account_id);
$cache_accountid[$accountid] = $account_id; $cache_accountid[$accountid] = $account_id;
} }
$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true); if ((int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
$memberships[] = $account_id; $memberships[] = $account_id;
$apps = false; $apps = false;
@ -680,7 +691,7 @@ class acl
$grants =& $cache[$app][$user]; $grants =& $cache[$app][$user];
if (!isset($grants)) if (!isset($grants))
{ {
$memberships = $GLOBALS['egw']->accounts->memberships($user, true); if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
$memberships[] = $user; $memberships[] = $user;
$grants = $accounts = Array(); $grants = $accounts = Array();