X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=9166a59240c8f45fd1c71cb394abf204cd62eb77;hb=3e2f1b46bb33c1720b4373f324f6126ca26d2ac7;hp=2946c79d1e65d1037af1ee8abbf29e2a11d8e749;hpb=d357340b3926a4f2956bbd9792c27e9922b00f15;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 2946c79d..9166a592 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 20;
 $path_to_root="..";
@@ -29,7 +29,7 @@ include_once($path_to_root . "/includes/ui.inc");
 //
 function check_table($pref, $table, $field=null, $properties=null)
 {
-	$fields = db_query("SHOW COLUMNS FROM ".$pref.$table);
+	$fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
 	if (!$fields)
 		return 1;		// no such table or error
 
@@ -134,13 +134,8 @@ if (get_post('Upgrade'))
 				." '".$conn['name']."'");
 			continue;
 		}
-	// create security backup		
-	 	if ($conn['tbpref'] != "")
-			$filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
-		else
-			$filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
-
-		db_export($conn, $filename, 'no', 'Security backup before upgrade', $conn['tbpref']);
+	// create security backup	
+		db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']);
 	// apply all upgrade data
 		foreach ($installers as $i => $inst) 
 		{
@@ -159,7 +154,7 @@ if (get_post('Upgrade'))
 	{	// re-read the prefs
 		global $path_to_root;
 		include_once($path_to_root . "/admin/db/users_db.inc");
-		$user = get_user($_SESSION["wa_current_user"]->username);
+		$user = get_user_by_login($_SESSION["wa_current_user"]->username);
 		$_SESSION["wa_current_user"]->prefs = new user_prefs($user);
 		display_notification(_('All companies data has been successfully updated'));
 	}