From c28c07d63ff8403465283c6657a157a6ef4b022b Mon Sep 17 00:00:00 2001
From: the_systech <the_systech@users.sourceforge.net>
Date: Thu, 18 Oct 2001 14:56:40 +0000
Subject: [PATCH] Some clean-ups

git-svn-id: file:///svn/phpbb/trunk@1236 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install.php                     | 25 ++++++++++++-------------
 phpBB/templates/subSilver/install.tpl | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/phpBB/install.php b/phpBB/install.php
index da25f31f89..08076d00cf 100644
--- a/phpBB/install.php
+++ b/phpBB/install.php
@@ -198,7 +198,7 @@ if( defined("PHPBB_INSTALLED") )
 	//
 	// Sorry this has already been installed can't do anything more with it
 	//
-	$template->assign_block_vars("error_install", array());
+	$template->assign_block_vars("switch_error_install", array());
 	$template->assign_vars(array(
 		"L_ERROR_TITLE" => $lang['Installer_Error'],
 		"L_ERROR" => $lang['Previous_Install'])
@@ -232,8 +232,8 @@ else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] ==
 	}
 	$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_block_vars("switch_ftp_file", array());
+	$template->assign_block_vars("switch_common_install", array());
 	$template->assign_vars(array(
 				"L_INSTRUCTION_TEXT" => $lang['ftp_instructs'],
 				"L_FTP_INFO" => $lang['ftp_info'],
@@ -265,7 +265,7 @@ else if( !empty($HTTP_POST_VARS['ftp_file']) )
 		//
 		$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());
+		$template->assign_block_vars("switch_common_install", array());
 		if ( $dbms == 'odbc' )
 		{
 			//
@@ -318,7 +318,7 @@ else if( !empty($HTTP_POST_VARS['ftp_file']) )
 			//
 			$lang['Inst_Step_2'] = $lang['ODBC_Instructs'] . '<br />' . $lang['Inst_Step_2'];
 		}
-		$template->assign_block_vars("common_install", array());
+		$template->assign_block_vars("switch_common_install", array());
 		$template->assign_vars(array(
 			"L_INSTRUCTION_TEXT" => $lang['Inst_Step_2'],
 			"L_SUBMIT" => $lang['Finish_Install'],
@@ -362,8 +362,8 @@ else if( empty($install_step) || $admin_pass1 != $admin_pass2 || $dbhost == "" )
 
 	$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_block_vars("switch_stage_one_install", array());
+	$template->assign_block_vars("switch_common_install", array());
 
 	$template->assign_vars(array(
 		"L_INSTRUCTION_TEXT" => $instruction_text,
@@ -451,7 +451,7 @@ else
 				{
 					$error = $db->sql_error();
 	
-					$template->assign_block_vars("error_install", array());
+					$template->assign_block_vars("switch_error_install", array());
 						$template->assign_vars(array(
 						"L_ERROR_TITLE" => $lang['Installer_Error'],
 						"L_ERROR" => $lang['Install_db_error'] . '<br>' . $error['message'])
@@ -477,7 +477,7 @@ else
 				{
 					$error = $db->sql_error();
 	
-					$template->assign_block_vars("error_install", array());
+					$template->assign_block_vars("switch_error_install", array());
 					$template->assign_vars(array(
 						"L_ERROR_TITLE" => $lang['Installer_Error'],
 						"L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"])
@@ -534,7 +534,7 @@ else
 			{
 				$error = $db->sql_error();
 
-				$template->assign_block_vars("error_install", array());
+				$template->assign_block_vars("switch_error_install", array());
 				$template->assign_vars(array(
 					"L_ERROR_TITLE" => $lang['Installer_Error'],
 					"L_ERROR" => $lang['Install_db_error'] . '<br /><br />' . $error)
@@ -544,7 +544,7 @@ else
 				exit;
 			}
 		}
-		$template->assign_block_vars("common_install", array());
+		$template->assign_block_vars("switch_common_install", array());
 		//
 		// Write out the config file.
 		//
@@ -571,7 +571,7 @@ else
 			$s_hidden_fields = '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />';
 			if( extension_loaded('ftp') && !defined('NO_FTP') )
 			{
-				$template->assign_block_vars('ftp_option', array());
+				$template->assign_block_vars('switch_ftp_option', array());
 				$lang['Unwriteable_config'] .= '<p>'.$lang['ftp_option'].'</p>';
 				$template->assign_vars(array(
 					"L_CHOOSE_FTP" => $lang['ftp_choose'],
@@ -639,5 +639,4 @@ else
 		exit();
 	}
 }
-
 ?>
diff --git a/phpBB/templates/subSilver/install.tpl b/phpBB/templates/subSilver/install.tpl
index e12a90c6b2..ace3c15355 100644
--- a/phpBB/templates/subSilver/install.tpl
+++ b/phpBB/templates/subSilver/install.tpl
@@ -117,7 +117,7 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
 			</tr>
 			<tr>
 				<td width="100%"><form action="{S_FORM_ACTION}" method="post"><table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
-					<!-- BEGIN stage_one_install -->
+					<!-- BEGIN switch_stage_one_install -->
 					<tr>
 						<th colspan="2">{L_INITIAL_CONFIGURATION}</th>
 					</tr>
@@ -171,16 +171,16 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
 						<td class="row1" align="right"><span class="gen">{L_ADMIN_CONFIRM_PASSWORD}: </span></td>
 						<td class="row2"><input type="password" name="admin_pass2" /></td>
 					</tr>
-					<!-- END stage_one_install -->
-					<!-- BEGIN error_install -->
+					<!-- END switch_stage_one_install -->
+					<!-- BEGIN switch_error_install -->
 					<tr>
 						<th>{L_ERROR_TITLE}</th>
 					</tr>
 					<tr>
 						<td class="row1" align="center"><span class="gen">{L_ERROR}</span></td>
 					</tr>
-					<!-- END error_install -->
-					<!-- BEGIN ftp_file -->
+					<!-- END switch_error_install -->
+					<!-- BEGIN switch_ftp_file -->
 					<tr>
 						<th colspan="2">{L_FTP_INFO}</th>
 					</tr>
@@ -196,8 +196,8 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
 						<td class="row1" align="right"><span class="gen">{L_FTP_PASS}</span></td>
 						<td class="row2"><input type="password" name="ftp_pass"></td>
 					</tr>
-					<!-- END ftp_file -->
-					<!-- BEGIN ftp_option -->
+					<!-- END switch_ftp_file -->
+					<!-- BEGIN switch_ftp_option -->
 					<tr>
 						<th colspan="2">{L_CHOOSE_FTP}</th>
 					</tr>
@@ -209,12 +209,12 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
 						<td class="row1" align="right" width="50%"><span class="gen">{L_SEND_FILE}</span></td>
 						<td class="row2"><input type="radio" name="send_file" value="1"></td>
 					</tr>
-					<!-- END ftp_option -->
-					<!-- BEGIN common_install -->
+					<!-- END switch_ftp_option -->
+					<!-- BEGIN switch_common_install -->
 					<tr> 
 					  <td class="cat" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
 					</tr>
-					<!-- END common_install -->
+					<!-- END switch_common_install -->
 				</table></form></td>
 			</tr>
 		</table></td>