X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=622ed2de448a8caae61b4ef0594fbb3d1517e7a9;hb=c9b7acbdfefe7a626368bfea9af867c4f8b99a1a;hp=d5124981594d41cecb485ae6b5f0215d9d737d41;hpb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index d5124981..622ed2de 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -125,6 +125,7 @@ function db_import($filename, $connection, $force=true)
 		"drop table if exists" => 'drop_queries');
 	$ignored_mysql_errors = array( //errors ignored in normal (non forced) mode
 		'1022',	// duplicate key
+		'1050', // Table %s already exists
 		'1060', // duplicate column name
 		'1061', // duplicate key name
 		'1062', // duplicate key entry
@@ -136,6 +137,8 @@ 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"))
 		$lines = db_ungzip("lines", $filename);
@@ -196,7 +199,7 @@ function db_import($filename, $connection, $force=true)
 			if (!db_query($drop_query[0]))
 			{
 				if (!in_array(db_error_no(), $ignored_mysql_errors))
-					$sql_errors[] = array(db_error_no().':'.db_error_msg($db), $drop_query[1]);
+					$sql_errors[] = array(db_error_msg($db), $drop_query[1]);
 			}
 		}
 	}
@@ -207,9 +210,10 @@ function db_import($filename, $connection, $force=true)
 		foreach($table_queries as $table_query)
 		{
 			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]);
+				}
 			}
 		}
 	}
@@ -221,12 +225,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];
@@ -640,5 +646,21 @@ function save_to_file($backupfile, $zip, $fileData)
     }
 }
 
-
+function create_comp_dirs($comp_path, $comp_subdirs)
+{
+		$index = "<?php\nheader(\"Location: ../index.php\");\n?>";
+	    $cdir = $comp_path;
+	    @mkdir($cdir);
+		$f = @fopen("$cdir/index.php", "wb");
+		@fwrite($f, $index);
+		@fclose($f);
+
+	    foreach($comp_subdirs as $dir)
+	    {
+			@mkdir($cdir.'/'.$dir);
+			$f = @fopen("$cdir/$dir/index.php", "wb");
+			@fwrite($f, $index);
+			@fclose($f);
+	    }
+}
 ?>
\ No newline at end of file