From: <par...@us...> - 2010-12-03 20:35:26
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14641/functions/parse Modified Files: Tag: version-2-4 end_vevent.php Log Message: Fix "Mozilla-style" all-day events. http://phpicalendar.net/forums/viewtopic.php?f=55&t=4294 Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.28.4.1 retrieving revision 1.28.4.2 diff -C2 -d -r1.28.4.1 -r1.28.4.2 *** end_vevent.php 3 Dec 2010 20:32:56 -0000 1.28.4.1 --- end_vevent.php 3 Dec 2010 20:35:18 -0000 1.28.4.2 *************** *** 43,51 **** $end_time = date ('Hi', $end_unixtime); } # at this point $end_unixtime should be set # adjust event start and end times if (isset($start_time) && isset($end_time)) { ! // Mozilla style all-day events or just really long events ! if (($end_unixtime - $start_unixtime) > 24*60*60) { $allday_start = $start_date; $allday_end = ($start_date + 1); --- 43,53 ---- $end_time = date ('Hi', $end_unixtime); } + + $length = $end_unixtime - $start_unixtime; # at this point $end_unixtime should be set # adjust event start and end times if (isset($start_time) && isset($end_time)) { ! // Mozilla style all-day events (multiples of 24-hour length) ! if ($length && (($length % 24*60*60) == 0)) { $allday_start = $start_date; $allday_end = ($start_date + 1); *************** *** 59,63 **** } - $length = $end_unixtime - $start_unixtime; if ($length < 0){ $length = 0; --- 61,64 ---- *************** *** 65,69 **** } # 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); --- 66,70 ---- } # get hour and minute adjusted to allowed grid times ! $drawKey = drawEventTimes($start_time, $end_time, ($length >= (24*60*60))); preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3); preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_end'], $time4); |