[mxbb-commits] mx_contact db_upgrade.php,1.3,1.4

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

Update of /cvsroot/mxbb/mx_contact
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24077

Modified Files:
	db_upgrade.php 
Log Message:
fix

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_contact/db_upgrade.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_upgrade.php	25 Dec 2008 08:49:37 -0000	1.3
--- db_upgrade.php	25 Dec 2008 09:32:40 -0000	1.4
***************
*** 44,48 ****
  	//
  	$upgrade_200 = 0;
! 
  	//
  	// validate before 2.00
--- 44,49 ----
  	//
  	$upgrade_200 = 0;
! 	$upgrade_291 = 0;
! 		
  	//
  	// validate before 2.00
***************
*** 51,56 ****
  	if ( $db->sql_numrows( $result ) == 0 )
  	{
! 		$upgrade_200 = 1;
  	}
  
  	$message = "<b>Upgrading!</b><br/><br/>";
--- 52,66 ----
  	if ( $db->sql_numrows( $result ) == 0 )
  	{
! 		$upgrade_200 = 1;		
  	}
+ 	
+ 	//
+ 	// validate before 2.91
+ 	//
+ 	$result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "contact_config WHERE config_name = 'domainkey_signature'" );
+ 	if ( $db->sql_numrows( $result ) == 0 )
+ 	{
+ 		$upgrade_291 = 1;		
+ 	}	
  
  	$message = "<b>Upgrading!</b><br/><br/>";
***************
*** 76,83 ****
  		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD phone VARCHAR(50) NOT NULL DEFAULT '' AFTER institution";
  		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD fax VARCHAR(50) NOT NULL DEFAULT '' AFTER phone";
! 		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD newsletter int(3) NOT NULL default '0' AFTER message";
! 		$sql[] = "INSERT INTO " . $mx_table_prefix . "contact_config VALUES('domainkey_signature','')";		
  		$sql[] = "INSERT INTO " . $mx_table_prefix . "contact_config VALUES ('newsletter_version', '1.0.0')";
  	}
  	else
  	{
--- 86,98 ----
  		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD phone VARCHAR(50) NOT NULL DEFAULT '' AFTER institution";
  		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD fax VARCHAR(50) NOT NULL DEFAULT '' AFTER phone";
! 		$sql[] = "ALTER TABLE " . $mx_table_prefix . "contact_msgs ADD newsletter int(3) NOT NULL default '0' AFTER message";	
  		$sql[] = "INSERT INTO " . $mx_table_prefix . "contact_config VALUES ('newsletter_version', '1.0.0')";
  	}
+ 	else if ( $upgrade_291 == 1 )
+ 	{
+ 		$message .= "<b>Upgrading to v. 2.91...</b><br/><br/>";
+ 		
+ 		$sql[] = "INSERT INTO " . $mx_table_prefix . "contact_config VALUES('domainkey_signature','')";
+ 	}	
  	else
  	{