[PHPiCalendar-Commits] phpicalendar index.php,1.7,1.8 preferences.php,1.49,1.50

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31747

Modified Files:
	index.php preferences.php 
Log Message:
Updated to $_COOKIE



Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	13 May 2004 18:38:14 -0000	1.7
--- index.php	2 Sep 2004 18:39:51 -0000	1.8
***************
*** 3,8 ****
  if (!isset($ALL_CALENDARS_COMBINED))  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  include "./config.inc.php";
! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
! 	$phpicalendar 		= unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	$default_view 		= $phpicalendar['cookie_view'];
  }
--- 3,8 ----
  if (!isset($ALL_CALENDARS_COMBINED))  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  include "./config.inc.php";
! if (isset($_COOKIE['phpicalendar'])) {
! 	$phpicalendar 		= unserialize(stripslashes($_COOKIE['phpicalendar']));
  	$default_view 		= $phpicalendar['cookie_view'];
  }

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** preferences.php	18 Aug 2004 00:14:48 -0000	1.49
--- preferences.php	2 Sep 2004 18:39:51 -0000	1.50
***************
*** 38,46 ****
  		setcookie("phpicalendar","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0);
  	}
! 	$HTTP_COOKIE_VARS['phpicalendar'] = $the_cookie;
  }
  
! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) {
! 	$phpicalendar 		= unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar']));
  	$cookie_language 	= $phpicalendar['cookie_language'];
  	$cookie_calendar 	= $phpicalendar['cookie_calendar'];
--- 38,46 ----
  		setcookie("phpicalendar","$the_cookie",time()+(60*60*24*7*12*10) ,"/","$cookie_uri",0);
  	}
! 	$_COOKIE['phpicalendar'] = $the_cookie;
  }
  
! if (isset($_COOKIE['phpicalendar'])) {
! 	$phpicalendar 		= unserialize(stripslashes($_COOKIE['phpicalendar']));
  	$cookie_language 	= $phpicalendar['cookie_language'];
  	$cookie_calendar 	= $phpicalendar['cookie_calendar'];
***************
*** 54,58 ****
  }
  
! if ((!isset($HTTP_COOKIE_VARS['phpicalendar'])) || ($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language = ucfirst($language);
--- 54,58 ----
  }
  
! if ((!isset($_COOKIE['phpicalendar'])) || ($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language = ucfirst($language);