mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Yet more fixes ... note there is a bug in user admin at present

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3083 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-11-24 16:22:52 +00:00
parent 95c6156b4a
commit 73650b59c7
10 changed files with 414 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
phpBB/install.php
View File

@@ -22,15 +22,6 @@
error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
define('IN_PHPBB', true);
$phpbb_root_path='./';
include($phpbb_root_path.'extension.inc');
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
$userdata = array();
$lang = array();
$reinstall = false;
if( !get_magic_quotes_gpc() )
{
if( is_array($HTTP_GET_VARS) )
@@ -94,6 +85,15 @@ if( !get_magic_quotes_gpc() )
}
}
define('IN_PHPBB', true);
$phpbb_root_path='./';
include($phpbb_root_path.'extension.inc');
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
$userdata = array();
$lang = array();
$reinstall = false;
/***************************************************************************
* Install Customization Section
*
@@ -720,25 +720,25 @@ else
$sql_query = $remove_remarks($sql_query);
$sql_query = split_sql_file($sql_query, $delimiter);
$sql_count = count($sql_query);
for($i = 0; $i < $sql_count; $i++)
for ($i = 0; $i < sizeof($sql_query); $i++)
{
$result = $db->sql_query($sql_query[$i]);
if( !$result )
if (trim($sql_query[$i]) != '')
{
$error = $db->sql_error();
$template->assign_block_vars("switch_error_install", array());
if (!($result = $db->sql_query($sql_query[$i])))
{
$error = $db->sql_error();
$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'])
);
$template->assign_vars(array(
"L_ERROR_TITLE" => $lang['Installer_Error'],
"L_ERROR" => $lang['Install_db_error'] . '<br />' . $error['message'])
);
$template->pparse('body');
$template->pparse('body');
exit;
exit;
}
}
}
@@ -751,25 +751,25 @@ else
$sql_query = $remove_remarks($sql_query);
$sql_query = split_sql_file($sql_query, $delimiter_basic);
$sql_count = count($sql_query);
for($i = 0; $i < $sql_count; $i++)
for($i = 0; $i < sizeof($sql_query); $i++)
{
$result = $db->sql_query($sql_query[$i]);
if( !$result )
if (trim($sql_query[$i]) != '')
{
$error = $db->sql_error();
$template->assign_block_vars("switch_error_install", array());
if (!($result = $db->sql_query($sql_query[$i])))
{
$error = $db->sql_error();
$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"])
);
$template->assign_vars(array(
"L_ERROR_TITLE" => $lang['Installer_Error'],
"L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"])
);
$template->pparse('body');
$template->pparse('body');
exit;
exit;
}
}
}
}
@@ -781,7 +781,7 @@ else
// this we are going to pass them over to the admin_forum.php script
// to set up their forum defaults.
//
$error = "";
$error = '';
//
// Update the default admin user with their information.
@@ -862,6 +862,8 @@ else
$error .= "Could not update user_regdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />";
}
/*
// Disabled in 2.0.4 ... too many issues with MAX ROWS
//
// Change session table to HEAP if MySQL version matches
//
@@ -881,6 +883,7 @@ else
}
}
}
*/
if( $error != "" )
{