Initial bleed time and display end checkin.

5 files changed, 12 insertions, 6 deletions

diff --git a/README b/README
index 576a4ae..ff43420 100644
--- a/README
+++ b/README
@@ -78,7 +78,7 @@ COPYING for more information about our license.
 
 Older Browser Support:
 ----------------------
-Starting with 0.9.5, PHP iCalendar is moving away from supporting 4.x browsers.
+Starting with 0.9.4, PHP iCalendar is moving away from supporting 4.x browsers.
 If you still need support for these browers, 0.9.3 is still available for
 download. To get the latest ical support, simply download the latest version
 of PHP iCalendar and replace the file called 'ical_parser.php' in the 
@@ -87,8 +87,9 @@ functions folder.
 Changes:
 --------
 0.9.5
-	-Fixed many bugs.
+	-Fixed all reported bugs.
 	-Added a method to publish without Webdav in iCal. calendars/publish.php
+	-Added ability to set 'bleed time' for events that run past midnight.
 
 0.9.4
 	-Vastly improved BYDAY, BYMONTHDAY, BYYEARDAY support.
diff --git a/config.inc.php b/config.inc.php
index c98c840..a630bd5 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -11,8 +11,8 @@ $minical_view 			= 'current';		// Where do the mini-calendars go when clicked? =
 $default_cal 			= $ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one.
 $language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
 $week_start_day 		= 'Sunday';			// Day of the week your week starts on
-$day_start 				= '0800';			// Start time for day grid
-$day_end				= '2400';			// End time for day grid
+$day_start 				= '0700';			// Start time for day grid
+$day_end				= '2300';			// End time for day grid
 $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
 $num_years 				= '3';				// Number of years to display in 'Jump to'
 $month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
@@ -24,6 +24,7 @@ $default_path			= 'http://www.example.com/phpicalendar'; 	// The HTTP URL to the
 $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X)
 $calendar_path 			= '';				// Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder.
 $second_offset			= '0';				// The time in seconds between your time and your server's time.
+$bleed_time				= '0000';			// This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359'
 
 // Advanced settings for custom installs, cookies, etc.
 // In most cases these will not need to be set.
@@ -31,7 +32,7 @@ $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. htt
 $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars
 
 // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
-$save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
+$save_parsed_cals 		= 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
 $use_sessions 			= 'no';				// This has not yet been implemented.
 $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
 $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
diff --git a/day.php b/day.php
index 85d7dd8..8d4352d 100644
--- a/day.php
+++ b/day.php
@@ -229,6 +229,7 @@ include (BASE.'includes/header.inc.php');
 												  $event_length[$i]['state'] = 'started';
 												  $event_start 	= strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']);
 												  $event_end	= strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']);
+												  if (isset($this_time_arr[($event_length[$i]['key'])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['display_end']);
 												  $event_start 	= date ($timeFormat, $event_start);
 												  $event_end	= date ($timeFormat, $event_end);
 												  $event_calno  = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
diff --git a/month.php b/month.php
index 2d75f48..439418d 100644
--- a/month.php
+++ b/month.php
@@ -126,6 +126,7 @@ include (BASE.'includes/header.inc.php');
 											echo '<div align="left" class="V9">&nbsp;';
 											$event_start = @$val["event_start"];
 											$event_end   = @$val["event_end"];
+											if (isset($val['display_end'])) $event_end = $val['display_end'];
 											$event_start = date($timeFormat, @strtotime ("$event_start"));
 											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
 											$event_end   = date($timeFormat, @strtotime ("$event_end"));
@@ -196,6 +197,7 @@ include (BASE.'includes/header.inc.php');
 									if (isset($new_val2["event_start"])) {
 										$event_start 	= $new_val2["event_start"];
 										$event_end 		= $new_val2["event_end"];
+										if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
 										$event_start 	= date ($timeFormat, strtotime ("$event_start"));
 										$event_end 		= date ($timeFormat, strtotime ("$event_end"));
 										$event_start2	= $event_start;
diff --git a/week.php b/week.php
index 0d3e0c7..488d707 100644
--- a/week.php
+++ b/week.php
@@ -304,7 +304,8 @@ include (BASE.'includes/header.inc.php');
 																	echo "<tr>\n";
 																	echo '<td class="eventbg_'.$event_calno.'">';
 																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
-																	$event_end 		= date ($timeFormat, $event_end);
+																	 if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
+																	$event_end 	= date ($timeFormat, $event_end);
 																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
 																	if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
 																	openevent("$calendar_name2",