diff options
| author | davef <davefd2@users.sourceforge.net> | 2005-05-16 18:14:41 +0000 |
|---|---|---|
| committer | davef <davefd2@users.sourceforge.net> | 2005-05-16 18:14:41 +0000 |
| commit | c4cd9ef3029afc434d5ae41693d059ccfe459799 (patch) | |
| tree | 9d9c86ad3f46129d640189fb99502fffce545229 | |
| parent | 041f38124d055c6572a290a99c454d5146fe1758 (diff) | |
| download | phpicalendar-c4cd9ef3029afc434d5ae41693d059ccfe459799.tar.gz phpicalendar-c4cd9ef3029afc434d5ae41693d059ccfe459799.tar.bz2 phpicalendar-c4cd9ef3029afc434d5ae41693d059ccfe459799.zip | |
"turned off" bleed_time by default, to fix a rendering problem where the default expectations weren't to have things get cut off.
| -rw-r--r-- | config.inc.php | 2 | ||||
| -rw-r--r-- | functions/ical_parser.php | 4 | ||||
| -rw-r--r-- | functions/init.inc.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config.inc.php b/config.inc.php index 3efa9d1..776df5a 100644 --- a/config.inc.php +++ b/config.inc.php @@ -22,7 +22,7 @@ $week_events_lines = '1'; // Number of lines to wrap each event title in th $timezone = ''; // Set timezone. Read TIMEZONES file for more information $calendar_path = ''; // Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder. $second_offset = ''; // The time in seconds between your time and your server's time. -$bleed_time = ''; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. Is automatically set to $day_start if left blank. +$bleed_time = '-1'; // This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time. $cookie_uri = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues. $download_uri = ''; // The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues. $default_path = ''; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 5b1ddc0..0b5c77f 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -309,7 +309,7 @@ foreach ($cal_filelist as $filename) { // Handling regular events if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) { - if (($end_time > $bleed_time) && ($bleed_check == '-1')) { + if (($end_time >= $bleed_time) && ($bleed_check == '-1')) { $start_tmp = strtotime(date('Ymd',$start_unixtime)); $end_date_tmp = date('Ymd',$end_unixtime); while ($start_tmp < $end_unixtime) { @@ -684,7 +684,7 @@ foreach ($cal_filelist as $filename) { $start_unixtime_tmp = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year); $end_unixtime_tmp = $start_unixtime_tmp + $length; - if (($end_time > $bleed_time) && ($bleed_check == '-1')) { + if (($end_time >= $bleed_time) && ($bleed_check == '-1')) { $start_tmp = strtotime(date('Ymd',$start_unixtime_tmp)); $end_date_tmp = date('Ymd',$end_unixtime_tmp); while ($start_tmp < $end_unixtime_tmp) { diff --git a/functions/init.inc.php b/functions/init.inc.php index 5b3aa08..7c01cf2 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -32,7 +32,7 @@ if ($cookie_uri == '') { $cookie_uri = $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')); } -if ($bleed_time == '') $bleed_time = $day_start; +if ($bleed_time == '') $bleed_time = -1; // Grab the action (login or logout). if (isset($_GET['action'])) $action = $_GET['action']; |