[mxbb-commits] core/install mx_install.php,1.104,1.105

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/install
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30825

Modified Files:
	mx_install.php 
Log Message:
one more bug to fix

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** mx_install.php	8 Sep 2008 00:07:28 -0000	1.104
--- mx_install.php	8 Sep 2008 00:54:05 -0000	1.105
***************
*** 1183,1186 ****
--- 1183,1196 ----
  
  //
+ // Check if a config.php file exists and was altered to allow re-install
+ //
+ if (file_exists($mx_root_path . "config.$phpEx"))
+ {
+ 	print("Warning: Existing mxp configuration file was found, If you continue the database will be reinstalled!");
+ 	
+ 	$mx_info = get_mxbb_info($mx_root_path . "config.$phpEx");
+ }
+ 
+ //
  // First, provide the option of standalone install
  //
***************
*** 1191,1201 ****
  	'PORTAL_BACKEND' => 'internal',
  	'PHPBB_URL'		=> '',	
! 	'DBMS'			=> '',
! 	'DB_HOST'		=> 'localhost',
! 	'DB_NAME'		=> '',
! 	'DB_USER'		=> '',
! 	'DB_PASSWD'		=> '',
! 	'DB_PREFIX'		=> '',
! 	//'ACM_TYPE'		=> ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ),	
  	'PHPBB_ROOT'	=> '',
  ));
--- 1201,1210 ----
  	'PORTAL_BACKEND' => 'internal',
  	'PHPBB_URL'		=> '',	
! 	'DBMS'			=> $mx_info['dbms'] ? $mx_info['dbms'] : '',
! 	'DB_HOST'		=> $mx_info['dbhost'] ? $mx_info['dbhost'] : 'localhost',
! 	'DB_NAME'		=> $mx_info['dbname'] ? $mx_info['dbname'] : '',
! 	'DB_USER'		=> $mx_info['dbuser'] ? $mx_info['dbuser'] : '',
! 	'DB_PASSWD'		=> $mx_info['dbpasswd'] ? $mx_info['dbpasswd'] : '',
! 	'DB_PREFIX'		=> $mx_info['table_prefix'] ? $mx_info['table_prefix'] : '',	
  	'PHPBB_ROOT'	=> '',
  ));
***************
*** 1241,1245 ****
  	else			
  	{	
! 		print_r("File: " . $phpbb_root_path . "config.$phpEx" . " not found.");
  		$portal_backend = 'internal';
  	}	
--- 1250,1254 ----
  	else			
  	{	
! 		echo("File: " . $phpbb_root_path . "config.$phpEx" . " not found.");
  		$portal_backend = 'internal';
  	}	
***************
*** 1260,1264 ****
  	if( !isset($phpbb_info['dbms']) || !array_key_exists($phpbb_info['dbms'], $available_dbms) ) 	
  	{
! 		//continue;
  	}
  	
--- 1269,1273 ----
  	if( !isset($phpbb_info['dbms']) || !array_key_exists($phpbb_info['dbms'], $available_dbms) ) 	
  	{
! 		continue;
  	}
  	
***************
*** 1300,1309 ****
  		'PORTAL_BACKEND' => $portal_backend,
  		'DBMS'			=> $phpbb_info['dbms'],
! 		'DB_HOST'		=> !empty($phpbb_info['dbhost']) ? $phpbb_info['dbhost'] : 'localhost',
  		'DB_NAME'		=> $phpbb_info['dbname'],
  		'DB_USER'		=> $phpbb_info['dbuser'],
  		'DB_PASSWD'		=> $phpbb_info['dbpasswd'],
  		'DB_PREFIX'		=> $phpbb_info['table_prefix'],
! 		'ACM_TYPE'		=> ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ),
  		'PHPBB_ROOT'	=> $phpbb_root_path,
  	));
--- 1309,1318 ----
  		'PORTAL_BACKEND' => $portal_backend,
  		'DBMS'			=> $phpbb_info['dbms'],
! 		'DB_HOST'		=> $phpbb_info['dbhost'] ? $phpbb_info['dbhost'] : 'localhost',
  		'DB_NAME'		=> $phpbb_info['dbname'],
  		'DB_USER'		=> $phpbb_info['dbuser'],
  		'DB_PASSWD'		=> $phpbb_info['dbpasswd'],
  		'DB_PREFIX'		=> $phpbb_info['table_prefix'],
! 		'ACM_TYPE'		=> $phpbb_info['acm_type'] ? $phpbb_info['acm_type'] : 'file',
  		'PHPBB_ROOT'	=> $phpbb_root_path,
  	));