added blacklisting of local calendars and the ability to view remote

calendars

1 files changed, 22 insertions, 6 deletions

diff --git a/functions/list_icals.php b/functions/list_icals.php
index 8ca60d1..c2635aa 100644
--- a/functions/list_icals.php
+++ b/functions/list_icals.php
@@ -15,20 +15,36 @@ if ($display_ical_list == "yes") {
 	// build the <option> tags
 	while ($file = readdir($dir_handle)) {
 		if (substr($file, -4) == ".ics") {
+			
 			// $cal_filename is the filename of the calendar without .ics
 			// $cal is a urlencoded version of $cal_filename
 			// $cal_displayname is $cal_filename with occurrences of "32" replaced with " "
 			$cal_filename_tmp = substr($file,0,-4);
 			$cal_tmp = urlencode($cal_filename_tmp);
 			$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
-			
-			if ($cal_tmp == $cal) {
-				print "<option value=\"$current_view.php?cal=$cal_tmp\" selected>$cal_displayname_tmp Calendar</option>\n";
-			} else {
-				print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp Calendar</option>\n";	
-			}			
+			if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
+				if ($cal_tmp == $cal) {
+					print "<option value=\"$current_view.php?cal=$cal_tmp\" selected>$cal_displayname_tmp Calendar</option>\n";
+				} else {
+					print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp Calendar</option>\n";	
+				}		
+			}	
 		}
 	}			
+	foreach($list_webcals as $cal_tmp) {
+		if ($cal_tmp != '') {
+			$cal_displayname_tmp = basename($cal_tmp);
+			$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
+			$cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
+			$cal_encoded_tmp = urlencode($cal_tmp);
+			if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
+				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>\n";
+			} else {
+				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n";	
+			}		
+		}
+	}
+	
 	
 	// close file
 	closedir($dir_handle);