More preference tweeks. Changed table width on search.

4 files changed, 23 insertions, 11 deletions

diff --git a/README b/README
index 8823a91..b30f385 100644
--- a/README
+++ b/README
@@ -68,8 +68,9 @@ Changes:
 		-Select default calendar
 		-Select default view
 		-Select default theme
-		-Select default start time, start day
+		-Select default start day
 		-Upload new calendars (ftp)
+	-Calendars folder can now be outside your web space.	
 	-Print view can now be set for your default view.
 	-Minor bug fixes
 
diff --git a/languages/english.inc.php b/languages/english.inc.php
index 61c41ac..bf15d21 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -70,6 +70,7 @@ $recurring_event_lang	= 'Recurring event';
 $exception_lang			= 'Exception';
 $no_query_lang			= 'No query given';
 $preferences_lang		= 'Preferences';
+$printer_lang			= 'Printer';
 
 // $format_recur, items enclosed in % will be substituted with variables
 $format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
diff --git a/preferences.php b/preferences.php
index 93d9788..98efede 100644
--- a/preferences.php
+++ b/preferences.php
@@ -119,13 +119,26 @@ if ($allow_preferences == 'no') header("Location: $default_view");
 								print "</select>\n";
 								echo '<br><br>';
 								
-								// Begin Style Selection
+								// Begin View Selection
 								//
 								echo 'Select your default view:<br><br>';
 								print "<select name=\"cookie_view\" class=\"query_style\">\n";
 								print "<option value=\"day\">$day_lang</option>\n";
 								print "<option value=\"week\">$week_lang</option>\n";
 								print "<option value=\"month\">$month_lang</option>\n";
+								print "<option value=\"print\">$printer_lang</option>\n";
+								print "</select>\n";
+								echo '<br><br>';
+								
+								// Begin Day Start Selection
+								//
+								echo 'Select your start day of week:<br><br>';
+								print "<select name=\"cookie_view\" class=\"query_style\">\n";
+								$i=1;
+								foreach ($daysofweek_lang as $daysofweek) {
+									print "<option value=\"$i\">$daysofweek</option>\n";
+									$i++;
+								}
 								print "</select>\n";
 								echo '<br><br>';
 								
@@ -133,15 +146,12 @@ if ($allow_preferences == 'no') header("Location: $default_view");
 								//
 								echo 'Select your default style:<br><br>';
 								print "<select name=\"cookie_style\" class=\"query_style\">\n";
-								$dir_handle = @opendir(BASE.'languages/');
-								$tmp_pref_language = urlencode(ucfirst($language));
+								$dir_handle = @opendir(BASE.'styles/');
 								while ($file = readdir($dir_handle)) {
-									if (substr($file, -8) == ".inc.php") {
-										$language_tmp = urlencode(ucfirst(substr($file, 0, -8)));
-										if ($language_tmp == $tmp_pref_language) {
-											print "<option value=\"$language_tmp\" selected>in $language_tmp</option>\n";
-										} else {
-											print "<option value=\"$language_tmp\">in $language_tmp</option>\n";
+									if (($file != ".") && ($file != "..") && ($file != "CVS")) {
+										if (!is_file($file)) {
+											$file = ucfirst($file);
+											print "<option value=\"$file\">$file</option>\n";
 										}
 									}
 								}
diff --git a/search.php b/search.php
index 37c87cd..a3c6966 100644
--- a/search.php
+++ b/search.php
@@ -172,7 +172,7 @@ $search_took = number_format(($search_ended-$search_started),3);
 												echo "<td align=\"left\">\n";
 												echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
 												echo "<tr>\n";
-												echo "<td width=\"100\" class=\"G10BOLD\">$time_lang:</td>\n";
+												echo "<td width=\"120\" class=\"G10BOLD\">$time_lang:</td>\n";
 												echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
 												echo "</tr>\n";
 												echo "<tr>\n";