[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.67,1.68

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

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

Modified Files:
	init.inc.php 
Log Message:
Updated to $_SERVER



Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** init.inc.php	2 Sep 2004 18:43:34 -0000	1.67
--- init.inc.php	2 Sep 2004 18:44:43 -0000	1.68
***************
*** 5,10 ****
  
  // Older versions of PHP do not define $_SERVER. Define it here instead.
! if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
! 	$_SERVER = &$HTTP_SERVER_VARS;
  }
  
--- 5,10 ----
  
  // Older versions of PHP do not define $_SERVER. Define it here instead.
! if (!isset($_SERVER) && isset($_SERVER)) {
! 	$_SERVER = &$_SERVER;
  }
  
***************
*** 30,34 ****
  // Set the cookie URI.
  if ($cookie_uri == '') {
! 	$cookie_uri = $HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/'));
  }
  
--- 30,34 ----
  // Set the cookie URI.
  if ($cookie_uri == '') {
! 	$cookie_uri = $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/'));
  }
  
***************
*** 132,136 ****
  		if (isset($filename)) {
  			if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) {
! 				$subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
  				$download_filename = $filename;
  			} elseif ($download_uri != '') {
--- 132,136 ----
  		if (isset($filename)) {
  			if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) {
! 				$subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'.$filename;
  				$download_filename = $filename;
  			} elseif ($download_uri != '') {