X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=4e7e05b43309b0f6fb1c5ebd69d641712e843646;hb=a4b28f3fedae28ea92f597e345f75911c8118639;hp=ecfc5b899d821e2cbaa513d75fd31dac47f3dab2;hpb=676c52e955fba6ea4095816a44233404d73f90ce;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index ecfc5b89..4e7e05b4 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -13,45 +13,13 @@ $page_security = 'SA_SOFTWAREUPGRADE';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Software Upgrade"));
+page(_($help_context = "Software Upgrade"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 include_once($path_to_root . "/includes/ui.inc");
 
-//
-//	Checks $field existence in $table with given field $properties
-//	$table - table name without prefix
-//  $field -  optional field name
-//  $properties - optional properties of field defined by MySQL:
-//		'Type', 'Null', 'Key', 'Default', 'Extra'
-//
-function check_table($pref, $table, $field=null, $properties=null)
-{
-	$fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
-	if (!$fields)
-		return 1;		// no such table or error
-
-	if (!isset($field)) 
-		return 0;		// table exists
-
-	while( $row = db_fetch_assoc($fields)) 
-	{
-		if ($row['Field'] == $field) 
-		{
-			if (!isset($properties)) 
-				return 0;
-			foreach($properties as $property => $value) 
-			{
-				if ($row[$property] != $value) 
-					return 3;	// failed type/length check
-			}
-			return 0; // property check ok.
-		}
-	}
-	return 2; // field not found
-}
 //
 //	Creates table of installer objects sorted by version.
 //
@@ -68,7 +36,7 @@ function get_installers()
 		while(false !== ($fname = readdir($datadir)))
 		{ // check all php files but index.php
 			if (!is_dir($patchdir . $fname) && ($fname != 'index.php')
-				&& stristr($fname, '.php') != false)
+				&& stristr($fname, '.php') != false && $fname[0] != '.')
 			{
 				unset($install);
 				include_once($patchdir . $fname);
@@ -84,7 +52,7 @@ function get_installers()
 //
 //	Apply one differential data set.
 //
-function upgrade_step($index, $conn) 
+function upgrade_step($index, $company, $conn) 
 {
 	global $path_to_root, $installers;
 
@@ -101,10 +69,16 @@ function upgrade_step($index, $conn)
 			if (!$inst->pre_check($pref, $force)) return false;
 			$sql = $inst->sql;
 
+			error_log(sprintf(_("Database upgrade for company '%s' (%s:%s*) started..."),
+				$conn['name'], $conn['dbname'], $conn['tbpref']));
+				
 			if ($sql != '')
 				$ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
 
-			$ret &= $inst->install($pref, $force);
+ 			$ret &= $inst->install($company, $force);
+
+			error_log(_("Database upgrade finished."));
+
 		} else
 			if ($state!==true) {
 				display_error(_("Upgrade cannot be done because database has been already partially upgraded. Please downgrade database to clean previous version or try forced upgrade."));
@@ -114,37 +88,27 @@ function upgrade_step($index, $conn)
 	return $ret;
 }
 
-function db_open($conn)
-{
-	$db = mysql_connect($conn["host"] ,$conn["dbuser"], $conn["dbpassword"]);
-	if (!$db)
-		return false;
-	if (!mysql_select_db($conn["dbname"], $db))
-		return false;
-	return $db;
-}
-
 $installers = get_installers();
 
 if (get_post('Upgrade')) 
 {
 
 	$ret = true;
-	foreach ($db_connections as $conn) 
+	foreach ($db_connections as $comp => $conn) 
 	{
 	// connect to database
-		if (!($db = db_open($conn))) 
+		if (!(set_global_connection($comp))) 
 		{
 			display_error(_("Cannot connect to database for company")
 				." '".$conn['name']."'");
 			continue;
 		}
 	// create security backup	
-		db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']);
+		db_backup($conn, 'no', 'Security backup before upgrade');
 	// apply all upgrade data
 		foreach ($installers as $i => $inst) 
 		{
-			$ret = upgrade_step($i, $conn);
+			$ret = upgrade_step($i, $comp, $conn);
 			if (!$ret)
 				display_error(
 				sprintf(_("Database upgrade to version %s failed for company '%s'."),
@@ -155,6 +119,7 @@ if (get_post('Upgrade'))
 // 		db_close($conn); ?
 		if (!$ret) break;
 	}
+	set_global_connection();
 	if($ret)
 	{	// re-read the prefs
 		global $path_to_root;
@@ -163,11 +128,12 @@ if (get_post('Upgrade'))
 		$_SESSION["wa_current_user"]->prefs = new user_prefs($user);
 		display_notification(_('All companies data has been successfully updated'));
 	}	
+	refresh_sys_prefs(); // re-read system setup
 	$Ajax->activate('_page_body');
 }
 
 start_form();
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Version"), _("Description"), _("Sql file"), _("Install"),
 	_("Force upgrade"));
 table_header($th);