Fixed a bug where preferences set to no would still allow prefs to be set.

2 files changed, 7 insertions, 4 deletions

diff --git a/config.inc.php b/config.inc.php
index 46caa0d..3977c7f 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -38,8 +38,8 @@ $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).
-$show_search			= 'yes';			// Show the search box in the sidebar.
-$header_always			= 'no';				// Set to yes to have header on print.php
+$show_search			= 'no';				// Show the search box in the sidebar.
+$header_always			= 'yes';			// Set to yes to have header on print.php
 $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.
diff --git a/preferences.php b/preferences.php
index b21793a..a1057b1 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,8 +1,11 @@
 <?php
+
+define('BASE','./');
+include(BASE.'functions/ical_parser.php');
+
 if ($cookie_uri == '') {
 	$cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
 }
-define('BASE','./');
 $current_view = "preferences";
 $default_view = "$default_view" . ".php";
 if ($allow_preferences == 'no') header("Location: $default_view");
@@ -42,7 +45,7 @@ if ($HTTP_COOKIE_VARS['phpicalendar']) {
 #echo "$cookie_uri";
 #print_r(unserialize($HTTP_COOKIE_VARS['phpicalendar']));
 #print_r($phpicalendar);
-include(BASE.'functions/ical_parser.php');
+
 
 if ((!isset($HTTP_COOKIE_VARS['phpicalendar'])) || ($cookie_unset)) {
 	# No cookie set -> use defaults from config file.