[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.26, 1.27 overlapping_events.php, 1.3, 1.4

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17508/functions/parse

Modified Files:
	end_vevent.php overlapping_events.php 
Log Message:
Fix overlapping events which span a day, fix erroneously adding 15 minutes to events which span a day or more and end on the same time they start, add day-spanning icons in day and week views

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** end_vevent.php	8 Apr 2009 04:42:59 -0000	1.26
--- end_vevent.php	8 Jul 2009 18:28:13 -0000	1.27
***************
*** 67,71 ****
  }
  # get hour and minute adjusted to allowed grid times
! $drawKey = drawEventTimes($start_time, $end_time);
  preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
  preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4);
--- 67,71 ----
  }
  # get hour and minute adjusted to allowed grid times
! $drawKey = drawEventTimes($start_time, $end_time, ($length >= (60*60*24)));
  preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3);
  preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4);
***************
*** 350,354 ****
  				'recur' => $recur
  				);
! 		}	
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}
--- 350,354 ----
  				'recur' => $recur
  				);
! 		}
  		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
  	}

Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/overlapping_events.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overlapping_events.php	27 Dec 2008 10:58:51 -0000	1.3
--- overlapping_events.php	8 Jul 2009 18:28:13 -0000	1.4
***************
*** 141,145 ****
  	$draw_end = $event['event_end'];
  	if (isset($event['display_end'])) $draw_end = $event['display_end'];
! 	$drawTimes = drawEventTimes($event['event_start'], $draw_end);
  
  	// Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times.
--- 141,147 ----
  	$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.