From 916ad724a5c2c69026ab8e588feb092eeaeef93c Mon Sep 17 00:00:00 2001
From: icalshare <icalshare>
Date: Mon, 15 Sep 2003 03:18:23 +0000
Subject: Fixed the bug that displayed events from blacklisted cals in combined
 calendar view.

---
 AUTHORS                   | 1 +
 functions/ical_parser.php | 1 -
 functions/init.inc.php    | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8f3b05f..de24572 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@ all who are listed here.
 PROJECT ADMINS
 --------------
 Chad Little    <chad@chadsdomain.com>
+Patrick Crowley    <patrick@icalshare.com>
 
 DEVELOPERS
 ----------
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 319bf20..a823674 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -953,7 +953,6 @@ if ($parse_file) {
 
 
 
-
 //If you want to see the values in the arrays, uncomment below.
 /*
 print '<pre>';
diff --git a/functions/init.inc.php b/functions/init.inc.php
index 2a145ed..669b716 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -103,12 +103,12 @@ if ($is_webcal) {
 				// open directory
 				$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
 	
-
 				// build the array
 				while (false != ($file = readdir($dir_handle))) {
-					if (preg_match("/^[^.].+\.ics$/", $file)) {
-						$file = $calendar_path.'/'.$file;
-						array_push($cal_filelist, $file);
+					if (preg_match("/^[^.].+\.ics$/", $file) &&
+						!in_array(substr($file, 0, -4), $blacklisted_cals)) {
+							$file = $calendar_path.'/'.$file;
+							array_push($cal_filelist, $file);
 					}
 				}
 				// add webcals
-- 
cgit v1.2.3