[Phpbb-checkins] CVS: phpBB2 install.php,1.10,1.11

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv23860

Modified Files:
	install.php 
Log Message:
Ok, this gets all the area it needs..heh 


Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** install.php	2001/11/01 10:42:06	1.10
--- install.php	2001/11/01 10:43:30	1.11
***************
*** 213,220 ****
  	header("Content-disposition: attachment; filename=config.php");
  
! 	if( get_magic_quotes_gpc() )
! 	{
! 		$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
! 	}
  
  	echo $HTTP_POST_VARS['config_data'];
--- 213,222 ----
  	header("Content-disposition: attachment; filename=config.php");
  
! 	//
! 	// We need to stripslashes no matter what the setting of magic_quotes_gpc is
! 	// because we add slahes at the top if its off, and they are added automaticlly 
! 	// if it is on.
! 	//
! 	$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
  
  	echo $HTTP_POST_VARS['config_data'];
***************
*** 227,234 ****
  	// Ok we couldn't write the config file so let's try ftping it.
  	//
! 	if ( get_magic_quotes_gpc() )
! 	{
! 		$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
! 	}
  	$s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />';
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
--- 229,235 ----
  	// Ok we couldn't write the config file so let's try ftping it.
  	//
! 
! 	$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
! 
  	$s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />';
  	$s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />';
***************
*** 252,259 ****
  	//
  	// Here we'll actually send the file...
- 	//
- 	// We need to stripslashes no matter what the setting of magic_quotes_gpc is
- 	// because we add slahes at the top if its off, and they are added automaticlly 
- 	// if it is on.
  	//
  	$HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']);
--- 253,256 ----