[PHPiCalendar-Commits] phpicalendar/functions/init configs.php, 1.1, 1.2

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

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

Modified Files:
	configs.php 
Log Message:
misc changes for new config model

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configs.php	11 Dec 2008 23:48:39 -0000	1.1
--- configs.php	12 Dec 2008 06:22:59 -0000	1.2
***************
*** 3,16 ****
  include_once(BASE.'default_config.php');
  if (is_file(BASE.'config.inc.php')){
! 	include_once(BASE.'config.inc.php');
  	foreach($configs as $key=>$value) $phpiCal_config->setProperty($key, $value);
  }
- // Set the cookie URI.
  if ($phpiCal_config->cookie_uri == '') {
! 	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/') ).'phpicalendar' );
  }
! 
! if (isset($_COOKIE[$phpiCal_config->cookie_uri]) && !isset($_POST['unset'])) {
! 	$phpicalendar = unserialize(stripslashes($_COOKIE[$cookie_name]));
  	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']);
--- 3,15 ----
  include_once(BASE.'default_config.php');
  if (is_file(BASE.'config.inc.php')){
! 	include(BASE.'config.inc.php');
  	foreach($configs as $key=>$value) $phpiCal_config->setProperty($key, $value);
  }
  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);
! if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset'])) {
! 	$phpicalendar = unserialize(stripslashes($_COOKIE[$phpiCal_config->cookie_uri]));
  	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']);
***************
*** 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']);
  }
  
--- 20,24 ----
  	}	
  	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!";
  }
  
***************
*** 52,57 ****
  
  
! /*
! echo "<pre>xx";
  print_r($configs);
  print_r($phpiCal_config);
--- 51,55 ----
  
  
! /*echo "<pre>xx";
  print_r($configs);
  print_r($phpiCal_config);