[PHPiCalendar-Commits] phpicalendar config.inc.php,1.96,1.97 preferences.php,1.24,1.25

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv22814

Modified Files:
	config.inc.php preferences.php 
Log Message:
Fixed a bug where preferences set to no would still allow prefs to be set.


Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** config.inc.php	18 Feb 2003 21:19:16 -0000	1.96
--- config.inc.php	24 Feb 2003 17:20:00 -0000	1.97
***************
*** 39,44 ****
  $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
  $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).
--- 39,44 ----
  $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			= '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).

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** preferences.php	17 Feb 2003 22:02:17 -0000	1.24
--- preferences.php	24 Feb 2003 17:20:01 -0000	1.25
***************
*** 1,7 ****
  <?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";
--- 1,10 ----
  <?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'], '/'));
  }
  $current_view = "preferences";
  $default_view = "$default_view" . ".php";
***************
*** 43,47 ****
  #print_r(unserialize($HTTP_COOKIE_VARS['phpicalendar']));
  #print_r($phpicalendar);
! include(BASE.'functions/ical_parser.php');
  
  if ((!isset($HTTP_COOKIE_VARS['phpicalendar'])) || ($cookie_unset)) {
--- 46,50 ----
  #print_r(unserialize($HTTP_COOKIE_VARS['phpicalendar']));
  #print_r($phpicalendar);
! 
  
  if ((!isset($HTTP_COOKIE_VARS['phpicalendar'])) || ($cookie_unset)) {