diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2003-11-16 06:20:08 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2003-11-16 06:20:08 +0000 |
| commit | 5a10e0fb74dfe1cf8c7b081f46f68edb86dfbfac (patch) | |
| tree | 1be5e6cc3e0a7fddde7245682c25d211608a4b89 /functions | |
| parent | dd0b83f0d9872c98ec3d9848f5d8bbb2dba29064 (diff) | |
| download | phpicalendar-5a10e0fb74dfe1cf8c7b081f46f68edb86dfbfac.tar.gz phpicalendar-5a10e0fb74dfe1cf8c7b081f46f68edb86dfbfac.tar.bz2 phpicalendar-5a10e0fb74dfe1cf8c7b081f46f68edb86dfbfac.zip | |
Corrected a mistake with overlaps and newly installed bleed time.
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/ical_parser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 136b927..ae1f702 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -272,7 +272,7 @@ foreach ($cal_filelist as $filename) { // This if statement should prevent writing of an excluded date if its the first recurrance - CL if (!in_array($start_date, $except_dates)) { - $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid); + $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid); $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } @@ -616,7 +616,7 @@ foreach ($cal_filelist as $filename) { // Let's double check the until to not write past it $until_check = $recur_data_date.$hour.$minute.'00'; if ($abs_until > $until_check) { - $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid); + $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid); $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber); } } |