aboutsummaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorjwangen <jwangen>2002-10-04 09:32:29 +0000
committerjwangen <jwangen>2002-10-04 09:32:29 +0000
commitce4d8be46ccefe642883253544a4ec81bdde8cc5 (patch)
tree90b62a3a91556bcbb348ae3e3f1ba8acbc494251 /functions
parent9d2eafe2e806a86b5617ed98040fd8667066f852 (diff)
downloadphpicalendar-ce4d8be46ccefe642883253544a4ec81bdde8cc5.tar.gz
phpicalendar-ce4d8be46ccefe642883253544a4ec81bdde8cc5.tar.bz2
phpicalendar-ce4d8be46ccefe642883253544a4ec81bdde8cc5.zip
Fixed almost all the warning we were getting before. Basically just added
isset() to all the conditions that were reporting errors. One line in ical_parser needs to be double checked, it's commented, towards the bottom.
Diffstat (limited to 'functions')
-rw-r--r--functions/ical_parser.php7
-rw-r--r--functions/overlapping_events.php7
2 files changed, 8 insertions, 6 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 4a33907..da967a7 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -261,7 +261,7 @@ foreach($contents as $line) {
*/
// if $until isn't set yet, we set it to the end of our range we're looking at
- if (!$until) $until = $end_range_time;
+ if (!isset($until)) $until = $end_range_time;
$end_date_time = $until;
// If the $end_range_time is less than the $start_date_time, or $start_range_time is greater
@@ -287,7 +287,7 @@ foreach($contents as $line) {
// use weekCompare to see if we even have this event this week
$diff_weeks = weekCompare(date('Ymd',$next_range_time), $start_date);
if ($diff_weeks < $count) {
- if ($week_diff % $number == 0) {
+ if ($diff_weeks % $number == 0) {
$interval = $number;
// loop through the days on which this event happens
foreach($byday as $day) {
@@ -582,9 +582,12 @@ foreach($contents as $line) {
ereg ('^P([0-9]{1,2})?([W,D]{0,1}[T])?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration);
if ($duration[2] = 'W') {
$weeks = $duration[1];
+ $days = 0;
} else {
$days = $duration[1];
+ $weeks = 0;
}
+// DOUBLE CHECK THIS, IS SETTING $weeks OR $days EQUAL TO 0 ACCEPTABLE??
$hours = ereg_replace('H', '', $duration[3]);
$minutes = ereg_replace('M', '', $duration[4]);
$seconds = ereg_replace('S', '', $duration[5]);
diff --git a/functions/overlapping_events.php b/functions/overlapping_events.php
index 98ee2a2..cd043a8 100644
--- a/functions/overlapping_events.php
+++ b/functions/overlapping_events.php
@@ -17,19 +17,18 @@ function checkOverlap() {
global $master_array, $overlap_array, $start_date, $start_time, $end_time;
$drawTimes = drawEventTimes($start_time, $end_time);
-
$maxOverlaps = 0;
- if (sizeof($master_array[($start_date)]) > 0) {
+ if (isset($master_array[($start_date)]) && sizeof($master_array[($start_date)]) > 0) {
foreach ($master_array[($start_date)] as $keyTime => $eventTime) {
foreach ($eventTime as $keyEvent => $event) {
- if (($event["event_start"] < $drawTimes["draw_end"]) and ($event["event_end"] > $drawTimes["draw_start"])) {
+ if (isset($event["event_start"], $drawTimes["draw_end"], $event["event_end"], $drawTimes["draw_start"]) && ($event["event_start"] < $drawTimes["draw_end"]) and ($event["event_end"] > $drawTimes["draw_start"])) {
if ($event["event_start"] < $drawTimes["draw_start"]) $overlap_start = $drawTimes["draw_start"];
else $overlap_start = $event["event_start"];
if ($event["event_end"] < $drawTimes["draw_end"]) $overlap_end = $event["event_end"];
else $overlap_end = $drawTimes["draw_end"];
- if (sizeof($overlap_array[($start_date)][($keyTime)][($keyEvent)]) > 0) {
+ if (isset($overlap_array[($start_date)][($keyTime)][($keyEvent)]) && sizeof($overlap_array[($start_date)][($keyTime)][($keyEvent)]) > 0) {
$newOverlapEntry = TRUE;
foreach ($overlap_array[($start_date)][($keyTime)][($keyEvent)] as $keyOverlap => $overlapEntry) {
if (($overlapEntry["start"] < $overlap_end) and ($overlapEntry["end"] > $overlap_start)) {

© 2014-2024 Faster IT GmbH | imprint | privacy policy