Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10324/functions/parse
Modified Files:
end_vevent.php overlapping_events.php
Log Message:
Better fix for Bug 2968512
Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** end_vevent.php 8 Jul 2009 18:28:13 -0000 1.27
--- end_vevent.php 16 Apr 2010 19:10:17 -0000 1.28
***************
*** 327,331 ****
'event_start' => $start_time, # hhmm
'event_end' => $end_time, # hhmm
! 'display_end' => $display_end_tmp, # hhmm display_start is $time_key
'start_unixtime' => $start_unixtime_tmp, # start unixtime for this recurrence
'end_unixtime' => $end_unixtime_tmp, # end unixtime for this recurrence
--- 327,332 ----
'event_start' => $start_time, # hhmm
'event_end' => $end_time, # hhmm
! 'display_start' => $time_key, # hhmm
! 'display_end' => $display_end_tmp, # hhmm
'start_unixtime' => $start_unixtime_tmp, # start unixtime for this recurrence
'end_unixtime' => $end_unixtime_tmp, # end unixtime for this recurrence
Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/overlapping_events.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** overlapping_events.php 15 Apr 2010 20:36:15 -0000 1.5
--- overlapping_events.php 16 Apr 2010 19:10:17 -0000 1.6
***************
*** 139,147 ****
// Copy out the array - we replace this at the end.
$ol_day_array = @$overlap_array[$event_date];
! $draw_end = $event['event_end'];
! if (isset($event['display_end'])) $draw_end = $event['display_end'];
! $drawTimes = drawEventTimes($event['event_start'], $draw_end, ($event['event_length'] >= (60*60*24)));
! if ($event_time == "0000") $drawTimes['draw_start'] = "0000";
! if ($draw_end == "2400") $drawTimes['draw_end'] = "2400";
// Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times.
--- 139,143 ----
// Copy out the array - we replace this at the end.
$ol_day_array = @$overlap_array[$event_date];
! $drawTimes = drawEventTimes($event['display_start'], $event['display_end'], ($event['event_length'] >= (60*60*24)));
// Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times.
***************
*** 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']) {
--- 179,183 ----
// 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['display_start'], $loop_event['display_end'], ($loop_event['event_length'] >= (60*60*24)));
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) {
if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) {
|
