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.

7 files changed, 46 insertions, 34 deletions

diff --git a/day.php b/day.php
index 75cfb3a..b76b999 100644
--- a/day.php
+++ b/day.php
@@ -118,6 +118,9 @@ if ($master_array[($getdate)]) {
 						foreach($master_array[($getdate)]['-1'] as $allday) {
 							$all_day_text = $allday['event_text'];
 							$description = $allday['description'];
+							$event_text2 = urlencode(addslashes($all_day_text));
+							$event_start = 'All';
+							$event_end = 'Day';
 					
 							echo '<tr>'."\n";
 							echo '<td valign="top" align="center" bgcolor="#6699CC"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\')"><font color="#ffffff"><i>'.$all_day_text.'</i></font></a></td>'."\n";
@@ -149,7 +152,7 @@ if ($master_array[($getdate)]) {
 									$key = date ($timeFormat, $key);
 																		
 									// check for eventstart 
-									if (sizeof($master_array[($getdate)][$cal_time]) > 0) {
+									if (isset($master_array[($getdate)][$cal_time]) && sizeof($master_array[($getdate)][$cal_time]) > 0) {
 										foreach ($master_array[($getdate)][$cal_time] as $eventKey => $loopevent) {
 											$drawEvent = drawEventTimes ($loopevent['event_start'], $loopevent['event_end']);
 											$j = 0;
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)) {
diff --git a/month.php b/month.php
index e3b7335..c6ddf25 100644
--- a/month.php
+++ b/month.php
@@ -21,7 +21,7 @@
 	$display_month = localizeDate ($dateFormat_month, $date);
 	$parse_month = date ("Ym", $date);
 	$first_of_month = $this_year.$this_month."01";
-	$start_month_day = dateOfWeek($first_of_month, $start_week_day);
+	$start_month_day = dateOfWeek($first_of_month, $week_start_day);
 	$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
 
 
@@ -119,7 +119,7 @@
 							}
 						}
 						if ($i == 0) echo "<tr height=\"105\">\n";
-						if (($master_array[("$daylink")]) && ($check_month == $this_month)) {
+						if (isset($master_array[("$daylink")]) && ($check_month == $this_month)) {
 							echo "<td align=\"center\" valign=\"top\" bgcolor=\"$bgcolor\" width=\"105\" height=\"105\">\n";
 							echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
 							echo "<tr>\n";
@@ -137,10 +137,10 @@
 											$event_text2 	= urlencode($event_text2);
 											$description 	= addslashes($val["description"]);
 											$description	= urlencode($description);
-											$event_start 	= $val["event_start"];
-											$event_end 		= $val["event_end"];
-											$event_start 	= date ($timeFormat, strtotime ("$event_start"));
-											$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+											$event_start 	= @$val["event_start"];
+											$event_end 		= @$val["event_end"];
+											$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
+											$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
 											$calendar_name2	= addslashes($calendar_name);
 											$calendar_name2 = urlencode($calendar_name2);
 											if (strlen($event_text) > 12) {
@@ -152,7 +152,9 @@
 											echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
 											echo "<tr>\n";
 											echo "<td>\n";
-											if (!$event_start == $val["event_start"]) {
+											if (!isset($val["event_start"])) {
+												$event_start = 'All';
+												$event_end = 'Day';
 												echo "<center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a></center>\n";
 											} else {	
 												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</a>\n";
diff --git a/month_bottom.php b/month_bottom.php
index 0ab537b..de75a14 100644
--- a/month_bottom.php
+++ b/month_bottom.php
@@ -58,7 +58,7 @@
 											$minical_month = date("m", $minical_time);
 											$minical_year = date("Y", $minical_time);
 											$first_of_month = $minical_year.$minical_month."01";
-											$start_day = strtotime(dateOfWeek($first_of_month, $start_week_day));
+											$start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
 											$i = 0;
 											$whole_month = TRUE;
 											$num_of_events = 0;
@@ -68,7 +68,7 @@
 												$check_month = date ("m", $start_day);
 												if ($check_month != $minical_month) $day= "<font class=\"G10B\">$day</font>";
 												if ($i == 0) echo "<tr>\n";
-												if (($master_array[("$daylink")]) && ($check_month == $minical_month)) {
+												if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
 													echo "<td align=\"center\" class=\"G10B\">\n";
 													echo "<a class=\"ps2\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
 													echo "</td>\n";
@@ -264,7 +264,7 @@
 									$minical_month = date("m", $minical_time);
 									$minical_year = date("Y", $minical_time);
 									$first_of_month = $minical_year.$minical_month."01";
-									$start_day = strtotime(dateOfWeek($first_of_month, $start_week_day));
+									$start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
 									$i = 0;
 									$whole_month = TRUE;
 									$num_of_events = 0;
@@ -274,7 +274,7 @@
 										$check_month = date ("m", $start_day);
 										if ($check_month != $minical_month) $day= "<font class=\"G10B\">$day</font>";
 										if ($i == 0) echo "<tr>\n";
-										if (($master_array[("$daylink")]) && ($check_month == $minical_month)) {
+										if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
 											echo "<td align=\"center\" class=\"G10B\">\n";
 											echo "<a class=\"ps2\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
 											echo "</td>\n";
diff --git a/sidebar.php b/sidebar.php
index 851515d..4654512 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -134,7 +134,7 @@
 		</tr>
 	</table>
 	<br>
-<?php if (sizeof($master_array[($tomorrows_date)]) > 0) { ?>
+<?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
 	<table cellpadding="0" cellspacing="0" border="0" width="160">
 		<tr>
 			<td valign="center" align="center">
@@ -162,10 +162,10 @@
 											$description 	= $val["description"];
 											$description 	= addslashes($val["description"]);
 											$description	= urlencode($description);
-											$event_start 	= $val["event_start"];
-											$event_end 		= $val["event_end"];
-											$event_start 	= date ($timeFormat, strtotime ("$event_start"));
-											$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+											$event_start 	= @$val["event_start"];
+											$event_end 		= @$val["event_end"];
+											$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
+											$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
 											$calendar_name2	= addslashes($calendar_name);
 											$calendar_name2 = urlencode($calendar_name2);
 											if (strlen($event_text) > 21) {
@@ -175,14 +175,16 @@
 											echo "<tr>\n";
 											echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\"></td>";
 											echo "<td colspan=\"6\" class=\"G10B\">\n";
-											if (!$event_start == $val["event_start"]) {
+											if (!isset($val["event_start"])) {
+												$event_start = 'All';
+												$event_end = 'Day';
 												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a>\n";
 											} else {	
 												echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">&#149; $event_text</font></a>\n";
 											}
 											echo "</td>\n";
 											echo "</tr>\n";
-											$num_of_events++;
+											//$num_of_events++;
 										}
 									}
 								}
@@ -250,7 +252,7 @@
 										$check_month = date ("m", $start_day);
 										if ($check_month != $minical_month) $day= "<font class=\"G10B\">$day</font>";
 										if ($i == 0) echo "<tr>\n";
-										if (($master_array[("$daylink")]) && ($check_month == $minical_month)) {
+										if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
 											echo "<td align=\"center\" class=\"G10B\">\n";
 											echo "<a class=\"ps2\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
 											echo "</td>\n";
@@ -330,7 +332,7 @@
 										$check_month = date ("m", $start_day);
 										if ($check_month != $minical_month) $day= "<font class=\"G10B\">$day</font>";
 										if ($i == 0) echo "<tr>\n";
-										if (($master_array[("$daylink")]) && ($check_month == $minical_month)) {
+										if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
 											echo "<td align=\"center\" class=\"G10B\">\n";
 											echo "<a class=\"ps2\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
 											echo "</td>\n";
@@ -410,7 +412,7 @@
 										$check_month = date ("m", $start_day);
 										if ($check_month != $minical_month) $day= "<font class=\"G10B\">$day</font>";
 										if ($i == 0) echo "<tr>\n";
-										if (($master_array[("$daylink")]) && ($check_month == $minical_month)) {
+										if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
 											echo "<td align=\"center\" class=\"G10B\">\n";
 											echo "<a class=\"ps2\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
 											echo "</td>\n";
diff --git a/week.php b/week.php
index c1f443d..e0f0e11 100644
--- a/week.php
+++ b/week.php
@@ -42,7 +42,7 @@ $thisdate = $start_week_time;
 for ($i=0;$i<7;$i++) {
 	$thisday = date("Ymd", $thisdate);
 	$nbrGridCols[$thisday] = 1;
-	if ($master_array[($thisday)]) {
+	if (isset($master_array[$thisday])) {
 		foreach($master_array[($thisday)] as $ovlKey => $ovlValue) {
 			if ($ovlKey != "-1") {
 				foreach($ovlValue as $ovl2Value) {
@@ -138,7 +138,7 @@ for ($i=0;$i<7;$i++) {
 							$thisdate = $start_week_time;
 							for ($i=0;$i<7;$i++) {
 								$thisday = date("Ymd", $thisdate);
-								if ($master_array[($thisday)]["-1"]) {
+								if (isset($master_array[($thisday)]["-1"])) {
 									$allday_events_this_week = true;
 									break;
 								}
@@ -152,11 +152,14 @@ for ($i=0;$i<7;$i++) {
 								do {
 									$thisday = date("Ymd", $thisdate);
 									echo "<td bgcolor=\"#f5f5f5\" height=\"24\">\n";
-									if ($master_array[($thisday)]["-1"]) {
+									if (isset($master_array[($thisday)]["-1"])) {
 										echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n";
 										foreach($master_array[($thisday)]["-1"] as $allday) {
 											$all_day_text = $allday["event_text"];
+											$event_text2 = urlencode(addslashes($all_day_text));
 											$description = $allday["description"];
+											$event_start = 'All';
+											$event_end = 'Day';
 											echo "<tr>\n";
 											echo "<td colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"top\" align=\"center\" bgcolor=\"#6699CC\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\n";
 											echo "</tr>\n";
@@ -204,11 +207,11 @@ for ($i=0;$i<7;$i++) {
 										
 										
 										// check for eventstart 
-										if (sizeof($master_array[($thisday)]["$cal_time"]) > 0) {
+										if (isset($master_array[($thisday)]["$cal_time"]) && sizeof($master_array[($thisday)]["$cal_time"]) > 0) {
 											foreach ($master_array[($thisday)]["$cal_time"] as $eventKey => $loopevent) {
 												$drawEvent = drawEventTimes ($loopevent["event_start"], $loopevent["event_end"]);
 												$j = 0;
-												while ($event_length[$thisday][$j]) {
+												while (isset($event_length[$thisday][$j])) {
 													if ($event_length[$thisday][$j]["state"] == "ended") {
 														$event_length[$thisday][$j] = array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin");
 														break;
@@ -305,7 +308,7 @@ for ($i=0;$i<7;$i++) {
 											if ($emptyWidth > 0) {
 												echo "<td bgcolor=\"#ffffff\" colspan=\"" . $emptyWidth . "\">&nbsp;</td>\n";
 											}
-											while ($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") {
+											while (isset($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"]) && $event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") {
 												array_pop($event_length[$thisday]);
 											}
 										}