diff options
author | drei <drei> | 2002-10-09 00:15:56 +0000 |
---|---|---|
committer | drei <drei> | 2002-10-09 00:15:56 +0000 |
commit | 1a783431b2f07298c1d3a43092c5787715313da4 (patch) | |
tree | a45f2cbf24aaa3a87ba836285b50a83ba59aefdf /functions/overlapping_events.php | |
parent | 2c8d24b59a1dad7557305bae5ff6637242148405 (diff) | |
download | phpicalendar-1a783431b2f07298c1d3a43092c5787715313da4.tar.gz phpicalendar-1a783431b2f07298c1d3a43092c5787715313da4.tar.bz2 phpicalendar-1a783431b2f07298c1d3a43092c5787715313da4.zip |
Ironed out another bug that wouldn't count the overlaps correctly.
Diffstat (limited to 'functions/overlapping_events.php')
-rw-r--r-- | functions/overlapping_events.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/functions/overlapping_events.php b/functions/overlapping_events.php index eb69c45..4230269 100644 --- a/functions/overlapping_events.php +++ b/functions/overlapping_events.php @@ -60,7 +60,7 @@ function checkOverlap() { if ($overlapRange["start"] < $drawTimes["draw_start"]) $overlap_array[($start_date)][($loopBlockKey)]["overlapRanges"][($keyOverlap)]["start"] = $drawTimes["draw_start"]; if ($overlapRange["end"] > $drawTimes["draw_end"]) $overlap_array[($start_date)][($loopBlockKey)]["overlapRanges"][($keyOverlap)]["end"] = $drawTimes["draw_end"]; $newOverlapRange = FALSE; - break; + // break; } } if ($newOverlapRange) { @@ -81,7 +81,7 @@ function checkOverlap() { if ($overlapRange["start"] < $overlap_start) $overlap_array[($start_date)][($loopBlockKey)]["overlapRanges"][($keyOverlap)]["start"] = $overlap_start; if ($overlapRange["end"] > $overlap_end) $overlap_array[($start_date)][($loopBlockKey)]["overlapRanges"][($keyOverlap)]["end"] = $overlap_end; $newOverlapRange2 = FALSE; - break; + // break; } } if ($newOverlapRange2) { @@ -107,7 +107,6 @@ function checkOverlap() { } if (!$newEventAdded) { if (isset($master_array[($start_date)])) { - $newBlockKey = ""; foreach ($master_array[($start_date)] as $keyTime => $eventTime) { foreach ($eventTime as $keyEvent => $event) { $entryDrawTimes = drawEventTimes($event["event_start"], $event["event_end"]); @@ -128,7 +127,7 @@ function checkOverlap() { $overlap_end = $entryDrawTimes["draw_end"]; $overlapBlock_end = $drawTimes["draw_end"]; } - if ($newBlockKey == "") { + if (!isset($newBlockKey)) { $overlap_array[($start_date)][] = array ("blockStart" => $overlapBlock_start, "blockEnd" => $overlapBlock_end, "maxOverlaps" => 1, "events" => array (array ("time" => $keyTime, "key" => $keyEvent), array ("time" => $newMasterTime, "key" => $newMasterEventKey)), "overlapRanges" => array (array ("count" => 1, "start" => $overlap_start, "end" => $overlap_end))); $maxOverlaps = 1; end($overlap_array[($start_date)]); |