[mxbb-commits] core/install mx_install.php,1.106,1.107

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

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

Modified Files:
	mx_install.php 
Log Message:
fix

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** mx_install.php	8 Sep 2008 01:06:15 -0000	1.106
--- mx_install.php	12 Sep 2008 06:27:36 -0000	1.107
***************
*** 643,647 ****
  			// Create fresh config.php
  			//
! 			if( !defined('MX_INSTALLED') )
  			{
  				$process_msgs[] = $lang['Writing_config'] . ' ...<br />';
--- 643,647 ----
  			// Create fresh config.php
  			//
! 			if( !defined('MX_INSTALLED') || (MX_INSTALLED === false) )
  			{
  				$process_msgs[] = $lang['Writing_config'] . ' ...<br />';
***************
*** 703,707 ****
  			// Update config.php (if upgrading from 2.8.x)
  			//
! 			if( defined('MX_INSTALLED') && defined('PHPBB_INSTALLED'))
  			{
  				$upgrade_mode = 'from28x';
--- 703,707 ----
  			// Update config.php (if upgrading from 2.8.x)
  			//
! 			if( defined('MX_INSTALLED') && defined('PHPBB_INSTALLED') )
  			{
  				$upgrade_mode = 'from28x';
***************
*** 771,775 ****
  			include($mx_root_path . "includes/mx_constants.$phpEx");
  		}
! 		if( !defined('MX_INSTALLED') )
  		{
  			install_die('<b>'.$lang['Critical_Error'].':</b><br /><br />'.$lang['Error_loading_config']);
--- 771,775 ----
  			include($mx_root_path . "includes/mx_constants.$phpEx");
  		}
! 		if( !defined('MX_INSTALLED') || (MX_INSTALLED === false) )
  		{
  			install_die('<b>'.$lang['Critical_Error'].':</b><br /><br />'.$lang['Error_loading_config']);
***************
*** 1022,1026 ****
  }
  
! if( defined('MX_INSTALLED') )
  {
  	//
--- 1022,1026 ----
  }
  
! if( defined('MX_INSTALLED') && (MX_INSTALLED === true) )
  {
  	//
***************
*** 1187,1193 ****
  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");
  }
  
--- 1187,1197 ----
  if (file_exists($mx_root_path . "config.$phpEx"))
  {
  	$mx_info = get_mxbb_info($mx_root_path . "config.$phpEx");
+ 	
+ 	if ($mx_info['mx_table_prefix'])
+ 	{	
+ 		$status = $mx_info['status'] ? 'valid' : 'invalid'; 
+ 		print("Warning: Existing mxp configuration file was found with " . $status . " status, <br /> If you continue with same db table prefix the schema will be reinstalled!");
+ 	}
  }