[Phpbb-checkins] CVS: phpBB2 install.php,1.8,1.9

[Jonathan H. <the...@us...>]

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

Modified Files:
	install.php 
Log Message:
Some clean-ups



Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** install.php	2001/10/16 20:56:42	1.8
--- install.php	2001/10/18 14:56:40	1.9
***************
*** 199,203 ****
  	// Sorry this has already been installed can't do anything more with it
  	//
! 	$template->assign_block_vars("error_install", array());
  	$template->assign_vars(array(
  		"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 199,203 ----
  	// Sorry this has already been installed can't do anything more with it
  	//
! 	$template->assign_block_vars("switch_error_install", array());
  	$template->assign_vars(array(
  		"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 233,238 ****
  	$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" />';
! 	$template->assign_block_vars("ftp_file", array());
! 	$template->assign_block_vars("common_install", array());
  	$template->assign_vars(array(
  				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
--- 233,238 ----
  	$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" />';
! 	$template->assign_block_vars("switch_ftp_file", array());
! 	$template->assign_block_vars("switch_common_install", array());
  	$template->assign_vars(array(
  				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
***************
*** 266,270 ****
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 		$template->assign_block_vars("common_install", array());
  		if ( $dbms == 'odbc' )
  		{
--- 266,270 ----
  		$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
  		$s_hidden_fields .= '<input type="hidden" name="send_file" value="1" />';
! 		$template->assign_block_vars("switch_common_install", array());
  		if ( $dbms == 'odbc' )
  		{
***************
*** 319,323 ****
  			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
  		}
! 		$template->assign_block_vars("common_install", array());
  		$template->assign_vars(array(
  			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
--- 319,323 ----
  			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
  		}
! 		$template->assign_block_vars("switch_common_install", array());
  		$template->assign_vars(array(
  			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
***************
*** 363,368 ****
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	$template->assign_block_vars("stage_one_install", array());
! 	$template->assign_block_vars("common_install", array());
  
  	$template->assign_vars(array(
--- 363,368 ----
  	$s_hidden_fields = '<input type="hidden" name="install_step" value="1" />';
  
! 	$template->assign_block_vars("switch_stage_one_install", array());
! 	$template->assign_block_vars("switch_common_install", array());
  
  	$template->assign_vars(array(
***************
*** 452,456 ****
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("error_install", array());
  						$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 452,456 ----
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("switch_error_install", array());
  						$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 478,482 ****
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("error_install", array());
  					$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 478,482 ----
  					$error = $db->sql_error();
  	
! 					$template->assign_block_vars("switch_error_install", array());
  					$template->assign_vars(array(
  						"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 535,539 ****
  				$error = $db->sql_error();
  
! 				$template->assign_block_vars("error_install", array());
  				$template->assign_vars(array(
  					"L_ERROR_TITLE" => $lang['Installer_Error'],
--- 535,539 ----
  				$error = $db->sql_error();
  
! 				$template->assign_block_vars("switch_error_install", array());
  				$template->assign_vars(array(
  					"L_ERROR_TITLE" => $lang['Installer_Error'],
***************
*** 545,549 ****
  			}
  		}
! 		$template->assign_block_vars("common_install", array());
  		//
  		// Write out the config file.
--- 545,549 ----
  			}
  		}
! 		$template->assign_block_vars("switch_common_install", array());
  		//
  		// Write out the config file.
***************
*** 572,576 ****
  			if( extension_loaded('ftp') && !defined('NO_FTP') )
  			{
! 				$template->assign_block_vars('ftp_option', array());
  				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
  				$template->assign_vars(array(
--- 572,576 ----
  			if( extension_loaded('ftp') && !defined('NO_FTP') )
  			{
! 				$template->assign_block_vars('switch_ftp_option', array());
  				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
  				$template->assign_vars(array(
***************
*** 640,643 ****
  	}
  }
- 
  ?>
--- 640,642 ----