mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Some clean-ups

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1236 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
the_systech
2001-10-18 14:56:40 +00:00
parent 6b2915c0a2
commit c28c07d63f
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/install.php
View File

@@ -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();
}
}
?>