diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-20 22:31:58 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-20 22:31:58 +0000 |
| commit | 4a6c3a5ec0628d8594df97f1186ec086ee53731e (patch) | |
| tree | 33ccc188196d55528761b184580d4978a0ae2fd2 /phpBB/install.php | |
| parent | 303a5c9ed474a1c1d2d7d3f2118ec20a8669915a (diff) | |
| download | forums-4a6c3a5ec0628d8594df97f1186ec086ee53731e.tar forums-4a6c3a5ec0628d8594df97f1186ec086ee53731e.tar.gz forums-4a6c3a5ec0628d8594df97f1186ec086ee53731e.tar.bz2 forums-4a6c3a5ec0628d8594df97f1186ec086ee53731e.tar.xz forums-4a6c3a5ec0628d8594df97f1186ec086ee53731e.zip | |
Changes to schema path and mssaccess check/setup ... no doubt I missed something, I'm always issing omething
git-svn-id: file:///svn/phpbb/trunk@1395 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install.php')
| -rw-r--r-- | phpBB/install.php | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/phpBB/install.php b/phpBB/install.php index 40d981e268..c10048d10c 100644 --- a/phpBB/install.php +++ b/phpBB/install.php @@ -111,8 +111,8 @@ $available_dbms = array( "VALUE" => "mssql" ), array( - "LABEL" => "ODBC - MS Access", - "VALUE" => "odbc:msaccess" + "LABEL" => "MS Access [ ODBC ]", + "VALUE" => "msaccess" ) ); @@ -432,26 +432,20 @@ else // out some additional instruction_textions later on what to do after installation // for the odbc DBMS. // - if( ereg(':', $dbms) ) - { - $dbms = explode(':', $dbms); - $dbhost = $dbms[1] . ':' . $dbhost; - $dbms = $dbms[0]; - } - else if( isset($dbms) ) + if( isset($dbms) ) { include($phpbb_root_path.'includes/db.'.$phpEx); } - $dbms_schema = 'db/' . $dbms.'_schema.sql'; - $dbms_basic = 'db/' . $dbms . '_basic.sql'; + $dbms_schema = 'db/schemas/' . $dbms.'_schema.sql'; + $dbms_basic = 'db/schemas/' . $dbms . '_basic.sql'; $remove_remarks = ( $dbms == 'mysql' ) ? 'remove_remarks' : 'remove_comments'; $delimiter = ( $dbms == 'mssql' ) ? 'GO' : ';'; 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 @@ -473,12 +467,13 @@ else $error = $db->sql_error(); $template->assign_block_vars("switch_error_install", array()); - $template->assign_vars(array( + + $template->assign_vars(array( "L_ERROR_TITLE" => $lang['Installer_Error'], "L_ERROR" => $lang['Install_db_error'] . '<br>' . $error['message']) ); $template->pparse('body'); - die(); + exit; } } @@ -504,7 +499,7 @@ else "L_ERROR" => $lang['Install_db_error'] . "<br />" . $error["message"]) ); $template->pparse('body'); - die(); + exit; } } // |