Updated for 1.0 RC-1

3 files changed, 12 insertions, 5 deletions

diff --git a/README b/README
index 485cc41..47edf29 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ Changes:
 --------
 1.0 RC-1
 	-Fixed all reported bugs.
-	-Event popup now displays calendar name.
+	-Event and Todo popup now displays calendar name.
 	-Event popup now supports more than 1024 characters.
 	-Subscribe and download links now work again.
 	-URL support added for popups.
diff --git a/config.inc.php b/config.inc.php
index dfd654b..2e125a2 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -29,7 +29,7 @@ $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http:
 $default_path			= 'http://www.example.com/phpicalendar'; 						// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
 
 // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
-$save_parsed_cals 		= 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
+$save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
 $use_sessions 			= 'no';				// This has not yet been implemented.
 $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
 $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
@@ -38,13 +38,14 @@ $this_months_events 	= 'yes';			// Display "This month's events" at the bottom o
 $use_color_cals 		= 'yes';			// Display each calendar in the pop-up as a different color.
 $daysofweek_dayview 	= 'no';				// Display the days of the week in day.php view.
 $enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
-$enable_publishing		= 'no';				// Enable webdav style publishing to your calendar's folder. READ calendars/publish.php before using!
 $show_search			= 'yes';			// Show the search box in the sidebar.
 $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
 $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
 $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
 $show_completed			= 'no';				// Show completed todos on your todo list.
 $show_login				= 'no';				// Set to yes to prompt for login to unlock calendars.
+
+// Webdav style publishing
 $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
 
 // Administration settings
diff --git a/preferences.php b/preferences.php
index 7c67ec7..e7d464f 100644
--- a/preferences.php
+++ b/preferences.php
@@ -2,7 +2,6 @@
 
 define('BASE','./');
 include(BASE.'functions/ical_parser.php');
-include(BASE.'functions/calendar_functions.php');
 $display_date = $preferences_lang;
 
 if ($cookie_uri == '') {
@@ -158,7 +157,14 @@ include (BASE.'includes/header.inc.php');
 												// Begin Calendar Selection
 												//
 												print "<select name=\"cookie_calendar\" class=\"query_style\">\n";
-												$filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED);
+												$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
+												$filelist = array();
+												while ($file = readdir($dir_handle)) {
+													if (preg_match("/^[^.].+\.ics$/", $file)) {
+														array_push($filelist, $file);
+													}
+												}
+												natcasesort($filelist);
 												foreach ($filelist as $file) {
 													$cal_filename_tmp = substr($file,0,-4);
 													$cal_tmp = urlencode($cal_filename_tmp);