Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.17, 1.18 overlapping_events.php, 1.2, 1.3 recur_functions.php, 1.14, 1.15
|
From: <ji...@us...> - 2008-12-27 10:58:57
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29598/functions/parse Modified Files: end_vevent.php overlapping_events.php recur_functions.php Log Message: rewrite and condense master array writing in end_vevent.php. Condense draw_week in template.php. bump vers Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** end_vevent.php 26 Dec 2008 22:33:33 -0000 1.17 --- end_vevent.php 27 Dec 2008 10:58:51 -0000 1.18 *************** *** 14,24 **** if (!isset($start_date)) $start_date = "19700101"; - // Handle DURATION - if (!isset($end_unixtime)) { - if(!isset($the_duration)) $the_duration = 0; - $end_unixtime = $start_unixtime + $the_duration; - $end_time = date ('Hi', $end_unixtime); - } - // CLASS support if (isset($class)) { --- 14,17 ---- *************** *** 30,34 **** $description ='**CONFIDENTIAL**'; } ! } // make sure we have some value for $uid --- 23,27 ---- $description ='**CONFIDENTIAL**'; } ! } // make sure we have some value for $uid *************** *** 45,66 **** $uid_list[] = $uid; # 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_time - $start_time) > 2345) { $allday_start = $start_date; $allday_end = ($start_date + 1); } } - # disallow events with negative length - if ($end_unixtime < $start_unixtime){ - $end_date = $start_date; - $end_time = $start_time; - $end_unixtime = $start_unixtime; - } # look for events that span more than one day ! if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) != date('Ymd',$end_unixtime)) { $spans_day = true; ! $bleed_check = (($start_unixtime - $end_unixtime) < (60*60*24)) ? '-1' : '0'; } else { $spans_day = false; --- 38,60 ---- $uid_list[] = $uid; + # Handle DURATION + if (!isset($end_unixtime)) { + if(!isset($the_duration)) $the_duration = 0; + $end_unixtime = $start_unixtime + $the_duration; + $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); } } # look for events that span more than one day ! if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) < date('Ymd',$end_unixtime)) { $spans_day = true; ! $bleed_check = (($start_unixtime - $end_unixtime) <= (60*60*24)) ? '-1' : '0'; } else { $spans_day = false; *************** *** 68,86 **** } ! # get hour and minute adjusted to allowed grid times ! if (isset($start_time) && $start_time != '') { ! preg_match ('/([0-9]{2})([0-9]{2})/', $start_time, $time); ! preg_match ('/([0-9]{2})([0-9]{2})/', $end_time, $time2); ! if (isset($start_unixtime) && isset($end_unixtime)) { ! $length = $end_unixtime - $start_unixtime; ! } else { ! $length = ($time2[1]*60+$time2[2]) - ($time[1]*60+$time[2]); ! } ! ! $drawKey = drawEventTimes($start_time, $end_time); ! preg_match ('/([0-9]{2})([0-9]{2})/', $drawKey['draw_start'], $time3); ! $hour = $time3[1]; ! $minute = $time3[2]; } // RECURRENCE-ID Support --- 62,79 ---- } ! $length = $end_unixtime - $start_unixtime; ! if ($length < 0){ ! $length = 0; ! $end_time = $start_time; } + # 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); + $hour = $time3[1]; + $minute = $time3[2]; + $end_hour = $time4[1]; + $end_minute = $time4[2]; + // RECURRENCE-ID Support *************** *** 90,103 **** } - - # treat nonrepeating events as rrule events with one instance - if (!isset($rrule_array) && $start_unixtime < $mArray_end && $end_unixtime > $mArray_begin){ - $rrule_array['FREQ'] = 'YEARLY'; - $rrule_array['START_DATE'] = $start_date; - $rrule_array['UNTIL'] = $start_date; - # $rrule_array['END'] = 'end'; - } - - if (isset($allday_start) && $allday_start != '') { $hour = '-'; --- 83,86 ---- *************** *** 141,147 **** break; case 'UNTIL': - #$until = str_replace('T', '', $val); - #$until = str_replace('Z', '', $until); - #if (strlen($until) == 8) $until = $until.'235959'; # UNTIL must be in UTC $until = date("YmdHis",strtotime($val)); --- 124,127 ---- *************** *** 198,201 **** --- 178,183 ---- } } + if($current_view == 'search') $freq_type = 'none'; + # $recur is the recurrence info that goes into the master array for this VEVENT $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; *************** *** 224,245 **** $next_range_unixtime = $start_date_unixtime; ! #conditions where we can not iterate over the whole range ! if($count == 1000000){ ! if($interval == 1) { ! $next_range_unixtime = $mArray_begin; ! }else{ ! # can we calculate the right start time? ! # pick the right compare function from date_functions.php ! # $diff is the number of occurrences between start_date and next_range_time ! # $func = $freq_type.'Compare'; ! # $diff = $func(date('Ymd',strtotime($getdate)), $start_date); ! # $next_range_unixtime = strtotime('+'.$diff*$interval.' '.$freq_type, $start_date_unixtime); echo "<pre>$summary\nnext $freq_type $diff $freq_type".date("Ymd",$start_date_unixtime)."\n"; ! } ! } ! // if the beginning of our range is less than the start of the item, we may as well set it equal to it if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; switch ($freq_type){ case 'week': --- 206,220 ---- $next_range_unixtime = $start_date_unixtime; ! # conditions where we don't need to iterate over the whole range ! # if repeating without limit, and steps are by 1, don't go back before the mArray beginning. ! if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin; ! ! # if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; + # stop at the until limit if set if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; + # more adjustments switch ($freq_type){ case 'week': *************** *** 251,254 **** --- 226,231 ---- break; } + + #nonrepeating events can stop at the first instance if(!isset($rrule_array['FREQ']) && isset($end_date)){ $end_range_unixtime = strtotime($end_date); *************** *** 263,267 **** #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tnext_range_unixtime:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); - if($current_view == 'search') $freq_type = 'none'; while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { $year = date("Y", $next_range_unixtime); --- 240,243 ---- *************** *** 299,304 **** sort($recur_data); ! /* ============================ Use $recur_data array to write the master array ============================*/ ! // This used to use 5 different blocks to write the array... can it be reduced further? $recur_data_hour = @substr($start_time,0,2); $recur_data_minute = @substr($start_time,2,2); --- 275,289 ---- sort($recur_data); ! /* ============================ Use $recur_data array to write the master array ============================ ! // This used to use 5 different blocks to write the array... can it be reduced further? ! ! For each recurrence date, an event may still cross day boundaries. So we need to loop from the start_date for that recurrence to the end of that recurrence. ! To generate $recur_data we mostly only paid attention to start times. ! ! Now, a single event must be split into multiple master array values for each day on which it occurs ! ! $hour and $minute are the values from the start_time, rounded to the nearest grid time. ! ! */ $recur_data_hour = @substr($start_time,0,2); $recur_data_minute = @substr($start_time,2,2); *************** *** 308,419 **** } foreach($recur_data as $recur_data_unixtime) { ! $recur_data_year = date('Y', $recur_data_unixtime); ! $recur_data_month = date('m', $recur_data_unixtime); ! $recur_data_day = date('d', $recur_data_unixtime); ! $recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day; ! ! /* at this point the recur data year, month, day, hour, and minute are in the default timezone for the phpicalendar installation, if that is set. We need to compare whether both the event timezone and the the phpicaledar timezone are in the same state wrt std vs daylight time. */ ! if (isset($allday_start) && $allday_start != '') { ! $start_time2 = $recur_data_unixtime; ! $end_time2 = strtotime('+'.$diff_allday_days.' days', $recur_data_unixtime); ! while ($start_time2 < $end_time2) { ! $start_date2 = date('Ymd', $start_time2); ! $master_array[($start_date2)][('-1')][$uid] = array ( ! 'event_text' => $summary, ! 'description' => $description, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'status' => $status, ! 'class' => $class, ! 'recur' => $recur ); ! $start_time2 = strtotime('+1 day', $start_time2); ! } ! } else { ! $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 >= $phpiCal_config->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) { ! $start_date_tmp = date('Ymd',$start_tmp); ! if ($start_date_tmp == $recur_data_year.$recur_data_month.$recur_data_day) { ! $time_tmp = $hour.$minute; ! $start_time_tmp = $start_time; ! } else { ! $time_tmp = '0000'; ! $start_time_tmp = '0000'; ! } ! if ($start_date_tmp == $end_date_tmp) { ! $end_time_tmp = $end_time; ! } else { ! $end_time_tmp = '2400'; ! $display_end_tmp = $end_time; ! } ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ( ! 'event_start' => $start_time_tmp, ! 'event_end' => $end_time_tmp, ! 'start_unixtime' => $start_unixtime_tmp, ! 'end_unixtime' => $end_unixtime_tmp, ! 'event_text' => $summary, # ! 'event_length' => $length, ! 'event_overlap' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => true, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'recur' => $recur); ! if (isset($display_end_tmp)){ ! $master_array[$start_date_tmp][$time_tmp][$uid]['display_end'] = $display_end_tmp; ! } ! checkOverlap($start_date_tmp, $time_tmp, $uid); ! $start_tmp = strtotime('+1 day',$start_tmp); ! } ! } else { ! if ($bleed_check == '-1') { ! $display_end_tmp = $end_time; ! $end_time_tmp1 = '2400'; ! ! } ! if (!isset($end_time_tmp1)) $end_time_tmp1 = $end_time; ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ( ! 'event_start' => $start_time, ! 'event_end' => $end_time_tmp1, ! 'start_unixtime' => $start_unixtime_tmp, ! 'end_unixtime' => $end_unixtime_tmp, ! 'event_text' => $summary, ! 'event_length' => $length, ! 'event_overlap' => 0, ! 'description' => $description, ! 'status' => $status, ! 'class' => $class, ! 'spans_day' => false, ! 'location' => $location, ! 'organizer' => serialize($organizer), ! 'attendee' => serialize($attendee), ! 'calnumber' => $calnumber, ! 'calname' => $actual_calname, ! 'url' => $url, ! 'recur' => $recur); ! if (isset($display_end_tmp)){ ! $master_array[($recur_data_date)][($hour.$minute)][$uid]['display_end'] = $display_end_tmp; ! } ! checkOverlap($recur_data_date, ($hour.$minute), $uid); ! } } ! ! } ! unset($recur_data); --- 293,349 ---- } foreach($recur_data as $recur_data_unixtime) { ! $recur_data_year = date('Y', $recur_data_unixtime); ! $recur_data_month = date('m', $recur_data_unixtime); ! $recur_data_day = date('d', $recur_data_unixtime); ! $recur_data_date = $recur_data_year.$recur_data_month.$recur_data_day; ! ! # initialize the loop range to the recur date + grid time ! $next_range_unixtime = mktime($recur_data_hour,$recur_data_minute,0,$recur_data_month,$recur_data_day,$recur_data_year); ! $end_range_unixtime = $next_range_unixtime + $length; ! $end_date_tmp = date("Ymd",$end_range_unixtime); ! #echo "<pre>$summary ".date("Ymd H:i:s",$next_range_unixtime)." ".date("Ymd H:i:s",$end_range_unixtime)."\n"; ! # default the time_key to -1 for allday events, overwrite as needed ! $time_key = -1; ! ! $start_unixtime_tmp = strtotime($recur_data_date.$start_time); ! $end_unixtime_tmp = strtotime($end_date_tmp.$end_time); ! while (date("Ymd", $next_range_unixtime) <= $end_date_tmp) { ! $this_date_tmp = date('Ymd',$next_range_unixtime); ! $next_range_unixtime = strtotime('+1 day',$next_range_unixtime); ! ! if (!isset($allday_start) || $allday_start == '') $time_key = $hour.$minute; ! $display_end_tmp = $end_hour.$end_minute; ! if($time_key > -1){ ! # the day is not the first day of the recurrence ! if ($this_date_tmp > $recur_data_date) $time_key = '0000'; ! # the day is not the last day of the recurrence ! if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400'; } + if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue; + $master_array[$this_date_tmp][$time_key][$uid] = array ( + 'event_start' => $start_time, # hhmm + 'event_end' => $end_time, # hhmm + 'display_end' => $display_end_tmp, # hhmm display_start is $time_key + 'start_unixtime' => $start_unixtime_tmp, # start unixtime for this recurrence + 'end_unixtime' => $end_unixtime_tmp, # end unixtime for this recurrence + 'event_text' => $summary, # + 'event_length' => $length, # length in seconds + 'event_overlap' => 0, # checkOverlap modifies this + 'description' => $description, + 'status' => $status, + 'class' => $class, + 'spans_day' => $spans_day, + 'location' => $location, + 'organizer' => serialize($organizer), + 'attendee' => serialize($attendee), + 'calnumber' => $calnumber, + 'calname' => $actual_calname, + 'url' => $url, + 'recur' => $recur + ); + checkOverlap($this_date_tmp, $time_key, $uid); } ! } # end foreach recur_data unset($recur_data); Index: overlapping_events.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/overlapping_events.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overlapping_events.php 15 Dec 2008 17:25:28 -0000 1.2 --- overlapping_events.php 27 Dec 2008 10:58:51 -0000 1.3 *************** *** 110,121 **** // Builds $overlap_array structure, and updates event_overlap in $master_array for the given events. - function checkOverlap($event_date, $event_time, $uid) { - global $master_array, $overlap_array; - if (!isset($event_date)) return; - $event = $master_array[$event_date][$event_time][$uid]; - // Copy out the array - we replace this at the end. - $ol_day_array = @$overlap_array[$event_date]; - $drawTimes = drawEventTimes($event['event_start'], $event['event_end']); - // For a given date, // - check to see if the event's already in a block, and if so, add it. --- 110,113 ---- *************** *** 141,146 **** // 'start' - start_time for the overlap block. // 'end' - end_time for the overlap block. ! $ol_day_array = @$overlap_array[$event_date]; // Track if $event has been merged in, so we don't re-add the details to 'event' or 'overlapRanges' multiple times. $already_merged_once = false; --- 133,146 ---- // 'start' - start_time for the overlap block. // 'end' - end_time for the overlap block. ! function checkOverlap($event_date, $event_time, $uid) { ! global $master_array, $overlap_array; ! if (!isset($event_date)) return; ! $event = $master_array[$event_date][$event_time][$uid]; ! // Copy out the array - we replace this at the end. $ol_day_array = @$overlap_array[$event_date]; + $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. $already_merged_once = false; *************** *** 181,185 **** // Make sure we haven't already dealt with the event, and we're not checking against ourself. if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) { ! $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['event_end']); if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) { if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) { --- 181,185 ---- // Make sure we haven't already dealt with the event, and we're not checking against ourself. if ($loop_event['event_overlap'] == 0 && $loop_event_key != $uid) { ! $loopDrawTimes = drawEventTimes($loop_event['event_start'], $loop_event['display_end']); if ($loopDrawTimes['draw_start'] < $drawTimes['draw_end'] && $loopDrawTimes['draw_end'] > $drawTimes['draw_start']) { if ($loopDrawTimes['draw_start'] < $drawTimes['draw_start']) { Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** recur_functions.php 26 Dec 2008 19:32:41 -0000 1.14 --- recur_functions.php 27 Dec 2008 10:58:51 -0000 1.15 *************** *** 252,254 **** foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time); echo "</pre>"; ! } --- 252,254 ---- foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time); echo "</pre>"; ! } \ No newline at end of file |
