[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.7,1.71.2.8

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php 
Log Message:
GNU Bug #761.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.7
retrieving revision 1.71.2.8
diff -C2 -r1.71.2.7 -r1.71.2.8
*** class.bocalendar.inc.php    23 Jun 2002 20:28:43 -0000      1.71.2.7
--- class.bocalendar.inc.php    29 Jun 2002 00:42:01 -0000      1.71.2.8
***************
*** 1069,1073 ****
                                                        $temp_event_start = 
sprintf("%d%02d",$event['start']['hour'],$event['start']['min']);
                                                        $temp_event_end = 
sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);                   
              
!                                                       if((($temp_start_time 
<= $temp_event_start) && ($temp_end_time >= $temp_event_start) && 
($temp_end_time <= $temp_event_end)) ||
                                                                
(($temp_start_time >= $temp_event_start) && ($temp_start_time < 
$temp_event_end) && ($temp_end_time >= $temp_event_end)) ||
                                                                
(($temp_start_time <= $temp_event_start) && ($temp_end_time >= 
$temp_event_end)) ||
--- 1069,1074 ----
                                                        $temp_event_start = 
sprintf("%d%02d",$event['start']['hour'],$event['start']['min']);
                                                        $temp_event_end = 
sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);                   
              
! //                                                    if((($temp_start_time 
<= $temp_event_start) && ($temp_end_time >= $temp_event_start) && 
($temp_end_time <= $temp_event_end)) ||
!                                                       if((($temp_start_time 
<= $temp_event_start) && ($temp_end_time > $temp_event_start) && 
($temp_end_time <= $temp_event_end)) ||
                                                                
(($temp_start_time >= $temp_event_start) && ($temp_start_time < 
$temp_event_end) && ($temp_end_time >= $temp_event_end)) ||
                                                                
(($temp_start_time <= $temp_event_start) && ($temp_end_time >= 
$temp_event_end)) ||