[Phpbb-checkins] CVS: phpBB2 install.php,1.14,1.15

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv27579

Modified Files:
	install.php 
Log Message:
Changes to schema path and mssaccess check/setup ... no doubt I missed something, I'm always issing omething

Index: install.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/install.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** install.php	2001/11/16 20:15:32	1.14
--- install.php	2001/11/20 22:31:58	1.15
***************
*** 112,117 ****
  	),
  	array(
! 		"LABEL" => "ODBC - MS Access",
! 		"VALUE" => "odbc:msaccess"
  	)
  );
--- 112,117 ----
  	),
  	array(
! 		"LABEL" => "MS Access [ ODBC ]",
! 		"VALUE" => "msaccess"
  	)
  );
***************
*** 433,449 ****
  	// for the odbc DBMS.
  	//
! 	if( ereg(':', $dbms) )
  	{
- 		$dbms = explode(':', $dbms);
- 		$dbhost = $dbms[1] . ':' . $dbhost;
- 		$dbms = $dbms[0];
- 	}
- 	else if( isset($dbms) ) 
- 	{
  		include($phpbb_root_path.'includes/db.'.$phpEx);
  	}
  
! 	$dbms_schema = 'db/' . $dbms.'_schema.sql';
! 	$dbms_basic = 'db/' . $dbms . '_basic.sql';
  
  	$remove_remarks = ( $dbms == 'mysql' ) ? 'remove_remarks' : 'remove_comments';
--- 433,443 ----
  	// for the odbc DBMS.
  	//
! 	if( isset($dbms) ) 
  	{
  		include($phpbb_root_path.'includes/db.'.$phpEx);
  	}
  
! 	$dbms_schema = 'db/schemas/' . $dbms.'_schema.sql';
! 	$dbms_basic = 'db/schemas/' . $dbms . '_basic.sql';
  
  	$remove_remarks = ( $dbms == 'mysql' ) ? 'remove_remarks' : 'remove_comments';
***************
*** 452,456 ****
  	if( $install_step == 1 )
  	{
! 		if($dbms != 'odbc' && $upgrade != 1)
  		{
  			//
--- 446,450 ----
  	if( $install_step == 1 )
  	{
! 		if( $dbms != 'msaccess' && $upgrade != 1 )
  		{
  			//
***************
*** 474,483 ****
  	
  					$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->pparse('body');
! 					die();
  				}
  			}
--- 468,478 ----
  	
  					$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->pparse('body');
! 					exit;
  				}
  			}
***************
*** 505,509 ****
  					);
  					$template->pparse('body');
! 					die();
  				}
  			}
--- 500,504 ----
  					);
  					$template->pparse('body');
! 					exit;
  				}
  			}