[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php, 1.71.2.33.2.30 class.bocalendar.inc.php, 1.101

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.bocalendar.inc.php lines: +2 -2
     Branch: MAIN
            class.bocalendar.inc.php lines: +2 -2

Log Message:
applying patch #3544

====================================================
Index: calendar/inc/class.bocalendar.inc.php
diff -u calendar/inc/class.bocalendar.inc.php:1.71.2.33.2.29 
calendar/inc/class.bocalendar.inc.php:1.71.2.33.2.30
--- calendar/inc/class.bocalendar.inc.php:1.71.2.33.2.29        Tue Dec  6 
08:45:45 2005
+++ calendar/inc/class.bocalendar.inc.php       Fri Dec  9 09:30:07 2005
@@ -1468,7 +1468,7 @@
                        {
                                $owner = $this->owner;
                        }
-                       if ($owner == 
$GLOBALS['phpgw_info']['user']['account_id'] || ($event['public']==1) || 
($this->check_perms(PHPGW_ACL_PRIVATE,$event) && $event['public']==0) || 
$event['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
+                       if ( $event['public'] == 1 || ( 
$this->check_perms(PHPGW_ACL_PRIVATE,$event) && $event['public'] == 0 ) || 
$event['owner'] == $GLOBALS['phpgw_info']['user']['account_id'] )
                        {
                                return False;
                        }

====================================================
Index: calendar/inc/class.bocalendar.inc.php
diff -u calendar/inc/class.bocalendar.inc.php:1.100 
calendar/inc/class.bocalendar.inc.php:1.101
--- calendar/inc/class.bocalendar.inc.php:1.100 Thu Dec  8 12:15:42 2005
+++ calendar/inc/class.bocalendar.inc.php       Fri Dec  9 09:30:30 2005
@@ -1470,7 +1470,7 @@
                        {
                                $owner = $this->owner;
                        }
-                       if ($owner == 
$GLOBALS['phpgw_info']['user']['account_id'] || ($event['public']==1) || 
($this->check_perms(PHPGW_ACL_PRIVATE,$event) && $event['public']==0) || 
$event['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
+                       if ( $event['public'] == 1 || 
($this->check_perms(PHPGW_ACL_PRIVATE, $event) && $event['public'] == 0) || 
$event['owner'] == $GLOBALS['phpgw_info']['user']['person_id'] )
                        {
                                return False;
                        }