phpicalendar-commits

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

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

Modified Files:
	configs.php 
Log Message:
debug rrules; fix cookie injection vuln

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configs.php	12 Dec 2008 06:37:29 -0000	1.3
--- configs.php	13 Dec 2008 23:42:31 -0000	1.4
***************
*** 7,11 ****
  }
  if ($phpiCal_config->cookie_uri == '') {
! 	$phpiCal_config->cookie_uri = $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/'));
  }
  $cookie_name = 'phpicalendar_'.basename($phpiCal_config->default_path);
--- 7,13 ----
  }
  if ($phpiCal_config->cookie_uri == '') {
! 	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')) );
! 	if ($phpiCal_config->cookie_uri == 'localhost')	$phpiCal_config->setProperty('cookie_uri', '');
! ;
  }
  $cookie_name = 'phpicalendar_'.basename($phpiCal_config->default_path);
***************
*** 14,18 ****
  	if (isset($phpicalendar['cookie_language'])) 	$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
  	if (isset($phpicalendar['cookie_calendar'])) 	$phpiCal_config->setProperty('default_cal_check', 	$phpicalendar['cookie_calendar']);
! 	if (isset($phpicalendar['cookie_cpath'])) 		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
  	if (isset($phpicalendar['cookie_view'])) 		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
  	if (isset($phpicalendar['cookie_style']) && is_dir(BASE.'templates/'.$phpicalendar['cookie_style'].'/')){ 
--- 16,20 ----
  	if (isset($phpicalendar['cookie_language'])) 	$phpiCal_config->setProperty('language', 			$phpicalendar['cookie_language']);
  	if (isset($phpicalendar['cookie_calendar'])) 	$phpiCal_config->setProperty('default_cal_check', 	$phpicalendar['cookie_calendar']);
! 	if (isset($phpicalendar['cookie_cpath']) && strpos($phpicalendar['cookie_cpath'],'../') === false) 		$phpiCal_config->setProperty('default_cpath_check', $phpicalendar['cookie_cpath']);
  	if (isset($phpicalendar['cookie_view'])) 		$phpiCal_config->setProperty('default_view', 		$phpicalendar['cookie_view']);
  	if (isset($phpicalendar['cookie_style']) && is_dir(BASE.'templates/'.$phpicalendar['cookie_style'].'/')){ 
***************
*** 21,25 ****
  	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
- 	echo "cookie!";
  }
  
--- 23,26 ----
***************
*** 51,55 ****
  }
  
! 
  /*echo "<pre>xx";
  print_r($configs);
--- 52,56 ----
  }
  
! $tz_array=array();
  /*echo "<pre>xx";
  print_r($configs);