X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=29790b6658ad29bebd26aa92dbd8d7fae718c479;hb=34c15f2f88c2b4d8a18ca40f76df3b9748e463e1;hp=1d9a027380273950d44cb58f32aa6ba175f6c2fe;hpb=b6af4ea4c99734cfd051395289107bbba5a405e9;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 1d9a0273..29790b66 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -1,14 +1,15 @@
 <?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 
+	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>.
 ***********************************************************************/
+
 function write_config_db($new = false)
 {
 	global $path_to_root, $def_coy, $db_connections, $tb_pref_counter;
@@ -137,8 +138,10 @@ function db_import($filename, $connection, $force=true)
 	$sql_errors = array();
 
 	ini_set("max_execution_time", "180");
+	db_query("SET foreign_key_checks=0");
+
 	// uncrompress gziped backup files
-	if (strpos($filename, ".gzip") || strpos($filename, ".GZIP"))
+	if (strpos($filename, ".gz") || strpos($filename, ".GZ"))
 		$lines = db_ungzip("lines", $filename);
 	elseif (strpos($filename, ".zip") || strpos($filename, ".ZIP"))
 		$lines = db_unzip("lines", $filename);
@@ -160,8 +163,6 @@ function db_import($filename, $connection, $force=true)
 				if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) 
 				{
 					$query_table = $table;
-					if (strstr(strtolower($line), ' drop column '))
-						$query_table = 'drop_queries';
 					${$query_table}[] = array('', $line_no+1);
 					break;
 				}
@@ -209,7 +210,7 @@ function db_import($filename, $connection, $force=true)
 		{
 			if (!db_query($table_query[0]))
 			{	
-				if (!$force && !in_array(db_error_no(), $ignored_mysql_errors)) {
+				if (!in_array(db_error_no(), $ignored_mysql_errors) || !$force) {
 					$sql_errors[] = array(db_error_msg($db), $table_query[1]);
 				}
 			}
@@ -223,12 +224,14 @@ function db_import($filename, $connection, $force=true)
 		{
 			if (!db_query($data_query[0]))
 			{
-				if (!$force && !in_array(db_error_no(),$ignored_mysql_errors))
+				if (!in_array(db_error_no(),$ignored_mysql_errors) || !$force)
 					$sql_errors[] = array(db_error_msg($db), $data_query[1]);
 			}
 		}
 	}
 	
+	db_query("SET foreign_key_checks=1");
+
 	if (count($sql_errors)) {
 		// display first failure message; the rest are probably derivative 
 		$err = $sql_errors[0];
@@ -263,26 +266,24 @@ function db_unzip($mode, $path)
     $filename = substr($filename, 0, strlen($filename) - 4);
 
     // compare filname in zip and filename from $_GET
-    if (substr($all, 30, strlen($filename)) != $filename)
-    {
-		return '';
-        // exit if names differ
-        //echo F_WRONG_FILE.".";
-        //exit;
+    if (substr($all, 30, strlen($filename)-4) . substr($all, 30+strlen($filename)+9, 4)
+	  != $filename) {
+		return '';     // exit if names differ
     }
     else
     {
     	// get the suffix of the filename in hex
-        $crc_bugfix = substr(substr($filename, 0, strlen($filename) - 4), strlen($filename) - 12 - 4);
+		$crc_bugfix = substr($all, 30, strlen($filename)+13);
+        $crc_bugfix = substr(substr($crc_bugfix, 0, strlen($crc_bugfix) - 4), 
+				strlen($crc_bugfix) - 12 - 4);
         $suffix = false;
-
         // convert hex to ascii
         for ($i=0; $i < 12; )
         	$suffix .= chr($crc_bugfix[$i++] . $crc_bugfix[$i++] . $crc_bugfix[$i++]);
 
         // remove central directory information (we have always just one ziped file)
-        $comp = substr($all, -(strlen($all) - 30 - strlen($filename)));
-        $comp = substr($comp, 0, (strlen($comp) - 80 - strlen($filename)));
+        $comp = substr($all, -(strlen($all) - 30 - strlen($filename)-13));
+        $comp = substr($comp, 0, (strlen($comp) - 80 - strlen($filename)-13));
 
         // fix the crc bugfix (see function save_to_file)
         $comp = "xœ" . $comp . $suffix;
@@ -564,13 +565,14 @@ function save_to_file($backupfile, $zip, $fileData)
         $crc = crc32($fileData);
         $zdata = gzcompress($fileData);
 
-        // string needed for decoding (because of crc bug)
-        //$name_suffix = substr($zdata, -4, 4);
-        //$name_suffix2 = "_";
-        //for ($i = 0; $i < 4; $i++)
-        //	$name_suffix2 .= sprintf("%03d", ord($name_suffix[$i]));
-        //$backupfile = substr($backupfile, 0, strlen($backupfile) - 8) . $name_suffix2 . ".sql.zip";
-        $name = substr($backupfile, 0, strlen($backupfile) -4);
+		// extend stored file name with suffix
+        // needed for decoding (because of crc bug)
+        $name_suffix = substr($zdata, -4, 4);
+        $name_suffix2 = "_";
+        for ($i = 0; $i < 4; $i++)
+        	$name_suffix2 .= sprintf("%03d", ord($name_suffix[$i]));
+
+      	$name = substr($backupfile, 0, strlen($backupfile) - 8) . $name_suffix2 . ".sql";
 
         // fix crc bug
         $zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2);