[Phpgroupware-cvs] [19019] Start of a fix for admin acls :(

[Caeies]

Revision: 19019
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19019
Author:   Caeies
Date:     2008-12-10 17:52:03 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Start of a fix for admin acls :(

Modified Paths:
--------------
    core/trunk/admin/inc/class.boaclmanager.inc.php
    core/trunk/admin/inc/class.uiaclmanager.inc.php

Modified: core/trunk/admin/inc/class.boaclmanager.inc.php
===================================================================
--- core/trunk/admin/inc/class.boaclmanager.inc.php     2008-12-10 17:49:20 UTC 
(rev 19018)
+++ core/trunk/admin/inc/class.boaclmanager.inc.php     2008-12-10 17:52:03 UTC 
(rev 19019)
@@ -56,16 +56,16 @@
                        $data = array();
                        for ( $i = count($admins) - 1; $i >= 0; --$i)
                        {
-                               $acc_name = 
$GLOBALS['phpgw']->accounts->get_account_data($admins[$i]);
+                               $acc_name = 
$GLOBALS['phpgw']->accounts->get($admins[$i]);
 
                                if ( isset($admins[$i]) )
                                {
                                        $data[] = array
                                        (
                                                'account_id'    => $admins[$i],
-                                               'lid'                   => 
$acc_name[$admins[$i]]['lid'],
-                                               'firstname'             => 
$acc_name[$admins[$i]]['firstname'],
-                                               'lastname'              => 
$acc_name[$admins[$i]]['lastname']
+                                               'lid'                   => 
$acc_name->lid,
+                                               'firstname'             => 
$acc_name->firstname,
+                                               'lastname'              => 
$acc_name->lastname
                                        );
                                }
                        }

Modified: core/trunk/admin/inc/class.uiaclmanager.inc.php
===================================================================
--- core/trunk/admin/inc/class.uiaclmanager.inc.php     2008-12-10 17:49:20 UTC 
(rev 19018)
+++ core/trunk/admin/inc/class.uiaclmanager.inc.php     2008-12-10 17:52:03 UTC 
(rev 19019)
@@ -352,9 +352,9 @@
 
                                                $group_list[] = array
                                                (
-                                                       'account_id'    => 
$group['account_id'],
+                                                       'account_id'    => 
$group->id,
                                                        'select_value'  => 
$select_value,
-                                                       'fullname'      => 
lang('%1 group', $group['account_firstname'])
+                                                       'fullname'      => 
lang('%1 group', $group->firstname)
                                                );
                                        }
                                }