[Phpgroupware-cvs] CVS: calendar/templates/verdilak header.inc.php,1.15,1.16

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/templates/verdilak
In directory subversions:/tmp/cvs-serv13509/templates/verdilak

Modified Files:
        header.inc.php 
Log Message:
This should fix the problem of changing from user to group to user using the 
header dropdown.

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/verdilak/header.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** header.inc.php      6 Jan 2002 05:58:49 -0000       1.15
--- header.inc.php      10 Jan 2002 02:01:07 -0000      1.16
***************
*** 172,176 ****
                        $drop_down[$lname.' '.$fname] = Array(
                                'grantor'       => $grantor,
!                               'value'         => $grantor,
                                'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
                        );
--- 172,177 ----
                        $drop_down[$lname.' '.$fname] = Array(
                                'grantor'       => $grantor,
!                               'value'         => 
($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'')
!                                       . $grantor,
                                'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
                        );
***************
*** 179,182 ****
--- 180,191 ----
                while($memberships != False && list($key,$group_info) = 
each($memberships))
                {
+                       
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
+                       $drop_down[$lname.' '.$fname] = Array(
+                               'grantor'       => $group_info['account_id'],
+                               'value'         => 
($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'')
+                                       .$group_info['account_id'],
+                               'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+                       );
+ 
                        $account_perms = 
$GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar');
                        while($account_perms && list($key,$group_id) = 
each($account_perms))
***************
*** 185,189 ****
                                $drop_down[$lname.' '.$fname] = Array(
                                        'grantor'       => $group_id,
!                                       'value'         => 'g_'.$group_id,
                                        'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
                                );
--- 194,199 ----
                                $drop_down[$lname.' '.$fname] = Array(
                                        'grantor'       => $group_id,
!                                       'value'         => 
($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'')
!                                               .$group_id,
                                        'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
                                );