More error_reporting cleanup.

3 files changed, 28 insertions, 20 deletions

diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 1ccdde5..05c9909 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -91,7 +91,7 @@ if ($parse_file) {
 				$allday_start, $allday_end, $start, $end, $the_duration, 
 				$beginning, $rrule_array, $start_of_vevent, $description, 
 				$valarm_description, $start_unixtime, $end_unixtime,
-				$recurrence_id, $uid, $class, $attendee, $location, $organizer
+				$recurrence_id, $uid, $class, $location
 			);
 				
 			$except_dates 	= array();
@@ -99,6 +99,8 @@ if ($parse_file) {
 			$first_duration = TRUE;
 			$count 			= 1000000;
 			$valarm_set 	= FALSE;
+			$attendee		= array();
+			$organizer	= array();
 			
 			unset(
 				$until, $bymonth, $byday, $bymonthday, $byweek, $byweekno, 
@@ -141,7 +143,7 @@ if ($parse_file) {
 				if (!isset($length)) $length = $master_array[$old_start_date][$old_start_time][$uid]['event_length'];
 				if (!isset($description)) $description = $master_array[$old_start_date][$old_start_time][$uid]['description'];
 				removeOverlap($start_date_tmp, $old_start_time, $uid);
-				unset($master_array[$start_date_tmp][$old_start_time]);
+				if (isset($master_array[$start_date_tmp][$old_start_time])) unset($master_array[$start_date_tmp][$old_start_time]);
 				$write_processed = false;
 			} else {
 				$write_processed = true;
diff --git a/functions/init.inc.php b/functions/init.inc.php
index 05326f8..24df31d 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -61,12 +61,16 @@ if (isset($HTTP_GET_VARS['cal']) && $HTTP_GET_VARS['cal'] != '') {
 		$cal_filename = stripslashes($cal_decoded);
 	}
 } else {
-	$calcheck = $calendar_path.'/'.$default_cal_check.'.ics';
-	$calcheckopen = @fopen($calcheck, "r");
-	if ($calcheckopen == FALSE) {
-		$cal_filename = $default_cal;
+	if (isset($default_cal_check)) {
+		$calcheck = $calendar_path.'/'.$default_cal_check.'.ics';
+		$calcheckopen = @fopen($calcheck, "r");
+		if ($calcheckopen == FALSE) {
+			$cal_filename = $default_cal;
+		} else {
+			$cal_filename = $default_cal_check;
+		}
 	} else {
-		$cal_filename = $default_cal_check;
+		$cal_filename = $default_cal;
 	}
 }
 
diff --git a/functions/overlapping_events.php b/functions/overlapping_events.php
index 362ea96..b90dd04 100644
--- a/functions/overlapping_events.php
+++ b/functions/overlapping_events.php
@@ -162,20 +162,22 @@ function checkOverlap($ol_start_date, $ol_start_time, $ol_end_time, $ol_uid) {
 // drei 20021126: function for checking and removing overlapping events
 function removeOverlap($ol_start_date, $ol_start_time, $ol_key = 0) {
 	global $master_array, $overlap_array;
-	if (sizeof($overlap_array[$ol_start_date]) > 0) {
-		$ol_end_time = $master_array[$ol_start_date][$ol_start_time][$ol_key]["event_end"];
-		foreach ($overlap_array[$ol_start_date] as $keyBlock => $blockId) {
-			if (($blockId["blockStart"] <= $ol_start_time) or ($blockId["blockEnd"] >= $ol_start_time)) {
-				foreach ($blockId["events"] as $keyEvent => $ol_event) {
-					$master_array[$ol_start_date][$ol_event["time"]][$ol_event["key"]]["event_overlap"] -= 1;
-					if (($ol_event["time"] == $ol_start_time) and ($ol_event["key"] == $ol_key)) {
-						unset ($overlap_array[$ol_start_date][$keyBlock]["events"][$keyEvent]);
+	if (isset($overlap_array[$ol_start_date])) {
+		if (sizeof($overlap_array[$ol_start_date]) > 0) {
+			$ol_end_time = $master_array[$ol_start_date][$ol_start_time][$ol_key]["event_end"];
+			foreach ($overlap_array[$ol_start_date] as $keyBlock => $blockId) {
+				if (($blockId["blockStart"] <= $ol_start_time) or ($blockId["blockEnd"] >= $ol_start_time)) {
+					foreach ($blockId["events"] as $keyEvent => $ol_event) {
+						$master_array[$ol_start_date][$ol_event["time"]][$ol_event["key"]]["event_overlap"] -= 1;
+						if (($ol_event["time"] == $ol_start_time) and ($ol_event["key"] == $ol_key)) {
+							unset ($overlap_array[$ol_start_date][$keyBlock]["events"][$keyEvent]);
+						}
+					}
+					if ($blockId["maxOverlaps"] = 1) {
+						unset ($overlap_array[$ol_start_date][$keyBlock]);
+					} else {
+						$blockId["maxOverlaps"] -= 1;
 					}
-				}
-				if ($blockId["maxOverlaps"] = 1) {
-					unset ($overlap_array[$ol_start_date][$keyBlock]);
-				} else {
-					$blockId["maxOverlaps"] -= 1;
 				}
 			}
 		}