diff --git a/resources/inc/class.bo_acl.inc.php b/resources/inc/class.bo_acl.inc.php index b519dafab4..e5fa54f2df 100755 --- a/resources/inc/class.bo_acl.inc.php +++ b/resources/inc/class.bo_acl.inc.php @@ -25,7 +25,6 @@ class bo_acl var $query = ''; var $sort = ''; var $total = 0; - var $accounts; var $cats; var $debug; @@ -39,7 +38,6 @@ class bo_acl $this->permissions = $GLOBALS['egw']->acl->get_all_location_rights($GLOBALS['egw_info']['user']['account_id'],'resources',true); $this->egw_cats =& CreateObject('phpgwapi.categories','','resources'); - $this->accounts = $GLOBALS['egw']->accounts->get_list(); $this->debug = False; //all this is only needed when called from uiacl. @@ -192,7 +190,7 @@ class bo_acl $GLOBALS['egw']->acl->delete_repository('resources','L' . $cat_id,false); - foreach($this->accounts as $num => $account) + foreach($GLOBALS['egw']->accounts->get_list() as $num => $account) { $account_id = $account['account_id']; $rights = false; diff --git a/resources/inc/class.ui_acl.inc.php b/resources/inc/class.ui_acl.inc.php index e1d17d1d9b..5bf7405579 100755 --- a/resources/inc/class.ui_acl.inc.php +++ b/resources/inc/class.ui_acl.inc.php @@ -20,7 +20,6 @@ class ui_acl var $sort = ''; var $order = ''; var $bo; - var $accounts; var $nextmatchs = ''; var $rights; var $public_functions = array( @@ -30,7 +29,6 @@ class ui_acl function ui_acl() { $this->bo =& createobject('resources.bo_acl',True); - $this->accounts = $GLOBALS['egw']->accounts->get_list(); $this->nextmatchs =& createobject('phpgwapi.nextmatchs'); $this->start = $this->bo->start; $this->query = $this->bo->query; @@ -116,8 +114,7 @@ class ui_acl function selectlist($right,$users_only=false) { - reset($this->bo->accounts); - while (list($null,$account) = each($this->bo->accounts)) + foreach ($GLOBALS['egw']->accounts->get_list() as $num => $account) { if(!($users_only && $account['account_lastname'] == 'Group')) {