From: <cl...@us...> - 2003-11-16 06:09:53
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv20435 Modified Files: README config.inc.php day.php month.php week.php Log Message: Initial bleed time and display end checkin. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** README 13 Nov 2003 17:33:22 -0000 1.51 --- README 16 Nov 2003 06:09:09 -0000 1.52 *************** *** 79,83 **** Older Browser Support: ---------------------- ! Starting with 0.9.5, 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 --- 79,83 ---- Older Browser Support: ---------------------- ! 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 *************** *** 88,93 **** -------- 0.9.5 ! -Fixed many bugs. -Added a method to publish without Webdav in iCal. calendars/publish.php 0.9.4 --- 88,94 ---- -------- 0.9.5 ! -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 Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** config.inc.php 15 Nov 2003 19:22:07 -0000 1.117 --- config.inc.php 16 Nov 2003 06:09:09 -0000 1.118 *************** *** 12,17 **** $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 $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $num_years = '3'; // Number of years to display in 'Jump to' --- 12,17 ---- $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 = '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' *************** *** 25,28 **** --- 25,29 ---- $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. *************** *** 32,36 **** // 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. $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. --- 33,37 ---- // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. ! $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. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** day.php 20 Sep 2003 21:46:17 -0000 1.99 --- day.php 16 Nov 2003 06:09:09 -0000 1.100 *************** *** 230,233 **** --- 230,234 ---- $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); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** month.php 20 Sep 2003 21:46:17 -0000 1.99 --- month.php 16 Nov 2003 06:09:09 -0000 1.100 *************** *** 127,130 **** --- 127,131 ---- $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")); *************** *** 197,200 **** --- 198,202 ---- $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")); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** week.php 20 Sep 2003 21:46:17 -0000 1.100 --- week.php 16 Nov 2003 06:09:09 -0000 1.101 *************** *** 305,309 **** echo '<td class="eventbg_'.$event_calno.'">'; $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; ! $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; --- 305,310 ---- echo '<td class="eventbg_'.$event_calno.'">'; $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; ! 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; |