[Phpgroupware-cvs] [21329] Fixing the account stuff for preferences

[Caeies]

Revision: 21329
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=21329
Author:   Caeies
Date:     2010-09-22 13:48:09 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Fixing the account stuff for preferences

Modified Paths:
--------------
    modules/preferences/trunk/inc/class.uiaclprefs.inc.php
    modules/preferences/trunk/inc/class.uiadmin_acl.inc.php

Modified: modules/preferences/trunk/inc/class.uiaclprefs.inc.php
===================================================================
--- modules/preferences/trunk/inc/class.uiaclprefs.inc.php      2010-09-08 
16:30:26 UTC (rev 21328)
+++ modules/preferences/trunk/inc/class.uiaclprefs.inc.php      2010-09-22 
13:48:09 UTC (rev 21329)
@@ -294,9 +294,10 @@
                                
$this->template->parse('row','row_colspan',True);
 
                                reset($groups);
+                               $k_group = array_keys($groups);
                                for($k=$start; $k < count($groups); ++$k)
                                {
-                                       $group = $groups[$k];
+                                       $group = $groups[$k_group[$k]];
                                        $go = True;
 
                                        if($query)
@@ -310,9 +311,9 @@
                                        if($go)
                                        {
                                                $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($tr_color);
-                                               
$this->display_row($tr_color,'g_',$group['account_id'],$group['account_lid'],$is_group);
+                                               
$this->display_row($tr_color,'g_',$group->id,$group->lid,$is_group);
                                                ++$s_groups;
-                                               $processed[] = 
$group['account_id'];
+                                               $processed[] = $group->id;
                                                ++$total;
                                                if($total == $maxm)
                                                {

Modified: modules/preferences/trunk/inc/class.uiadmin_acl.inc.php
===================================================================
--- modules/preferences/trunk/inc/class.uiadmin_acl.inc.php     2010-09-08 
16:30:26 UTC (rev 21328)
+++ modules/preferences/trunk/inc/class.uiadmin_acl.inc.php     2010-09-22 
13:48:09 UTC (rev 21329)
@@ -275,7 +275,7 @@
 
                        $appname                        = lang('preferences');
                        $function_msg           = lang('set grants');
-                       $owner_name             = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw']->accounts->id);          
      // get owner name for title
+                       $owner_name             = 
$GLOBALS['phpgw']->accounts->id2name($GLOBALS['phpgw_info']['user']['account_id']);
           // get owner name for title //XXX Caeies : not sure if this is the 
right way to do it.
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('admin') . ' - ' . $this->acl_app . ': ' . $function_msg . ': ' . 
$owner_name;
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_permission' => $data));