[PHPiCalendar-Commits] phpicalendar preferences.php,1.70,1.71

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5202

Modified Files:
	preferences.php 
Log Message:
working on rss fixes

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** preferences.php	31 Dec 2008 07:14:34 -0000	1.70
--- preferences.php	4 Jan 2009 21:58:18 -0000	1.71
***************
*** 46,51 ****
  		"cookie_timezone"   => "$cookie_timezone"
  		);
! 	$the_cookie 		= serialize($the_cookie);
! 	if ($cookie_unset) { 
  		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
  	} else {
--- 46,51 ----
  		"cookie_timezone"   => "$cookie_timezone"
  		);
! 	$the_cookie 		= addslashes(serialize($the_cookie));
! 	if (isset($cookie_unset)) { 
  		setcookie("$cookie_name","$the_cookie",time()-(60*60*24*7) ,"/","$phpiCal_config->cookie_uri",0);
  	} else {
***************
*** 79,83 ****
  }
  
! if ((!isset($_COOKIE[$cookie_name])) || ($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language 	= ucfirst($language);
--- 79,83 ----
  }
  
! if ((!isset($_COOKIE[$cookie_name])) || isset($cookie_unset)) {
  	# No cookie set -> use defaults from config file.
  	$cookie_language 	= ucfirst($language);
***************
*** 147,150 ****
--- 147,152 ----
  	$endtime_select .= ">$s</option>\n";
  }
+ 
+ $timeformat_select = '';
  $timeformat_arr = array(
  	'g:i',
***************
*** 156,160 ****
  );
  $example_time = strtotime("19700101 08:00:00");
- $timeformat_select = '';
  foreach ($timeformat_arr as $i => $s) {
  	$s = date($timeformat_arr[$i], $example_time)."/".date($timeformat_arr[$i], ($example_time + 12*60*60));
--- 158,161 ----