X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=e23595fc4c2ad27418bcb03e4d0dd725f80ee7fb;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=cc555a8972adc0febbc2d2103847a2a0774991c0;hpb=f887591b1c39b1ad369566b1796c4ef187c47ad9;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index cc555a89..e23595fc 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -1,3 +1,4 @@
+<?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
 	Released under the terms of the GNU General Public License,
@@ -116,7 +117,8 @@ function db_drop_db($connection)
 
 function db_import($filename, $connection, $force=true)
 {
-	global $db;
+	global $db, $go_debug;
+	
 	$allowed_commands = array(
 		"create"  => 'table_queries', 
 		"alter table" => 'table_queries', 
@@ -140,7 +142,7 @@ function db_import($filename, $connection, $force=true)
 	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);
@@ -190,13 +192,13 @@ function db_import($filename, $connection, $force=true)
 	}
 */
 	// execute drop tables if exists queries
-	if ($force && is_array($drop_queries))
+	if (is_array($drop_queries))
 	{
 		foreach($drop_queries as $drop_query)
 		{
 			if (!db_query($drop_query[0]))
 			{
-				if (!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), $drop_query[1]);
 			}
 		}
@@ -265,26 +267,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;
@@ -298,6 +298,16 @@ function db_unzip($mode, $path)
     	return explode("\n", $file_data);
 }
 
+function db_backup($conn, $ext='no', $comm='', $tbpref = TB_PREF)
+{
+	if ($conn['tbpref'] != "")
+		$filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
+	else
+		$filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
+
+	return db_export($conn, $filename, $ext, $comm, $tbpref);
+}
+
 // generates a dump of $db database
 // $drop and $zip tell if to include the drop table statement or dry to pack
 function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
@@ -566,13 +576,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);