Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21961/functions/parse
Modified Files:
overlapping_events.php
Log Message:
Fix overlapping events, Bug #2968512
Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/overlapping_events.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** overlapping_events.php 8 Jul 2009 18:28:13 -0000 1.4
--- overlapping_events.php 15 Apr 2010 20:36:15 -0000 1.5
***************
*** 111,115 ****
// Builds $overlap_array structure, and updates event_overlap in $master_array for the given events.
// For a given date,
! // - check to see if the event's already in a block, and if so, add it.
// - make sure the new block doesn't overlap another block, and if so, merge the blocks.
// - check that there aren't any events we already passed that we should handle.
--- 111,115 ----
// Builds $overlap_array structure, and updates event_overlap in $master_array for the given events.
// For a given date,
! // - check to see if the event's already in a block, and if so, add it.
// - make sure the new block doesn't overlap another block, and if so, merge the blocks.
// - check that there aren't any events we already passed that we should handle.
***************
*** 183,187 ****
// Make sure we haven't already dealt with the event, and we're not checking against ourself.
if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) {
! $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['display_end']);
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) {
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) {
--- 183,189 ----
// Make sure we haven't already dealt with the event, and we're not checking against ourself.
if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) {
! $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['display_end'], ($loop_event['event_length'] >= (60*60*24)));
! if ($event_time == "0000") $loopDrawTimes['draw_start'] = "0000";
! if ($draw_end == "2400") $loopDrawTimes['draw_end'] = "2400";
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) {
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) {
|
