[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.65,1.66 class.bocalendar.inc.php,1.68,1.69

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv4443/calendar/inc

Modified Files:
        class.uicalendar.inc.php class.bocalendar.inc.php 
Log Message:
This will now allow members of a group to edit/delete events, if the owner has 
granted persmissions to do so.

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** class.uicalendar.inc.php    6 Jan 2002 05:58:49 -0000       1.65
--- class.uicalendar.inc.php    9 Jan 2002 18:12:23 -0000       1.66
***************
*** 591,597 ****
                        );
  
!                       if($this->bo->owner == $event['owner'])
                        {
!                               if ($this->bo->check_perms(PHPGW_ACL_EDIT))
                                {
                                        if($event['recur_type'] != 
MCAL_RECUR_NONE)
--- 591,597 ----
                        );
  
!                       if($this->bo->owner == $event['owner'] || 
$this->bo->member_of_group($this->bo->owner))
                        {
!                               if 
($this->bo->check_perms(PHPGW_ACL_EDIT,$event['owner']))
                                {
                                        if($event['recur_type'] != 
MCAL_RECUR_NONE)
***************
*** 638,642 ****
                                }
  
!                               if ($this->bo->check_perms(PHPGW_ACL_DELETE))
                                {
                                        if($event['recur_type'] != 
MCAL_RECUR_NONE)
--- 638,642 ----
                                }
  
!                               if 
($this->bo->check_perms(PHPGW_ACL_DELETE,$event['owner']))
                                {
                                        if($event['recur_type'] != 
MCAL_RECUR_NONE)

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** class.bocalendar.inc.php    3 Jan 2002 12:34:45 -0000       1.68
--- class.bocalendar.inc.php    9 Jan 2002 18:12:23 -0000       1.69
***************
*** 341,350 ****
                }
  
!               function member_of_group()
                {
!                       $group_owners = 
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
                        while($group_owners && list($index,$group_info) = 
each($group_owners))
                        {
!                               if($this->owner = $group_info['account_id'])
                                {
                                        return True;
--- 341,351 ----
                }
  
!               function member_of_group($owner=0)
                {
!                       $owner = 
($owner==0?$GLOBALS['phpgw_info']['user']['account_id']:$owner);
!                       $group_owners = 
$GLOBALS['phpgw']->accounts->membership();
                        while($group_owners && list($index,$group_info) = 
each($group_owners))
                        {
!                               if($this->owner == $group_info['account_id'])
                                {
                                        return True;