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

Changes to schema path and mssaccess check/setup ... no doubt I missed something, I'm always issing omething

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1395 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-20 22:31:58 +00:00
parent 303a5c9ed4
commit 4a6c3a5ec0
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/install.php
View File

@ -111,8 +111,8 @@ $available_dbms = array(
"VALUE" => "mssql" "VALUE" => "mssql"
), ),
array( array(
"LABEL" => "ODBC - MS Access", "LABEL" => "MS Access [ ODBC ]",
"VALUE" => "odbc:msaccess" "VALUE" => "msaccess"
) )
); );
@ -432,26 +432,20 @@ else
// out some additional instruction_textions later on what to do after installation // out some additional instruction_textions later on what to do after installation
// for the odbc DBMS. // for the odbc DBMS.
// //
if( ereg(':', $dbms) ) if( isset($dbms) )
{
$dbms = explode(':', $dbms);
$dbhost = $dbms[1] . ':' . $dbhost;
$dbms = $dbms[0];
}
else if( isset($dbms) )
{ {
include($phpbb_root_path.'includes/db.'.$phpEx); include($phpbb_root_path.'includes/db.'.$phpEx);
} }
$dbms_schema = 'db/' . $dbms.'_schema.sql'; $dbms_schema = 'db/schemas/' . $dbms.'_schema.sql';
$dbms_basic = 'db/' . $dbms . '_basic.sql'; $dbms_basic = 'db/schemas/' . $dbms . '_basic.sql';
$remove_remarks = ( $dbms == 'mysql' ) ? 'remove_remarks' : 'remove_comments'; $remove_remarks = ( $dbms == 'mysql' ) ? 'remove_remarks' : 'remove_comments';
$delimiter = ( $dbms == 'mssql' ) ? 'GO' : ';'; $delimiter = ( $dbms == 'mssql' ) ? 'GO' : ';';
if( $install_step == 1 ) if( $install_step == 1 )
{ {
if($dbms != 'odbc' && $upgrade != 1) if( $dbms != 'msaccess' && $upgrade != 1 )
{ {
// //
// Ok we have the db info go ahead and read in the relevant schema // Ok we have the db info go ahead and read in the relevant schema
@ -473,12 +467,13 @@ else
$error = $db->sql_error(); $error = $db->sql_error();
$template->assign_block_vars("switch_error_install", array()); $template->assign_block_vars("switch_error_install", array());
$template->assign_vars(array(
$template->assign_vars(array(
"L_ERROR_TITLE" => $lang['Installer_Error'], "L_ERROR_TITLE" => $lang['Installer_Error'],
"L_ERROR" => $lang['Install_db_error'] . '<br>' . $error['message']) "L_ERROR" => $lang['Install_db_error'] . '<br>' . $error['message'])
); );
$template->pparse('body'); $template->pparse('body');
die(); exit;
} }
} }
@ -504,7 +499,7 @@ else
"L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"]) "L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"])
); );
$template->pparse('body'); $template->pparse('body');
die(); exit;
} }
} }
// //