X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=8ed6b7dffd57dfe6e3bef9b9da68db4984cd7cb6;hb=2f139f65da2e400350031bdbbeb44aa7ceeb66d8;hp=840b493b068232282b46ba44b0b10a5f11044a15;hpb=1b77725d52b62a154ef2ea579621ba7a02178996;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 840b493b..8ed6b7df 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -136,6 +136,12 @@ function db_import($filename, $connection)
 			{
 				$data_queries[] = substr($line, 0, strlen($line) - 1);
 
+			// this line does not, too
+			}
+			elseif (strtolower(substr($line,0,6)) == "update")
+			{
+				$data_queries[] = substr($line, 0, strlen($line) - 1);
+
 			// this line does not, too
 			}
 			elseif (strtolower(substr($line, 0, 20)) == "drop table if exists")
@@ -149,6 +155,10 @@ function db_import($filename, $connection)
 				$table = true;
 				$table_queries[] = $line . "\n";
 			}
+			elseif (strtolower(substr($line, 0, 11)) == "alter table")
+			{
+				$data_queries[] = substr($line, 0, strlen($line) - 1);
+			}
 
 		// the current line belongs to a create sql query
 		}
@@ -156,8 +166,10 @@ function db_import($filename, $connection)
 		{
 
 			// create sql query ending in this line
-			if (strtolower(substr($line, 0, 1)) == ")")
+			if (strtolower(substr($line, 0, 1)) == ")") {
 				$table = false;
+				$line = substr($line,0,strlen($line)-1);
+		  }
 			$table_queries[count($table_queries) - 1] .= $line . "\n";
 		}
 	}
@@ -202,6 +214,7 @@ function db_import($filename, $connection)
 			{
 				//if ($CONF['import_error']) echo $data_query."\n<div class=\"bold_left\">".mysql_error()."</div><br>\n";
 				$sql_error = true;
+				return false;
 			}
 		}
 	}
@@ -321,7 +334,9 @@ function db_export($conn, $filename, $zip='no', $comment='')
     $all_tables = array();
     while($row = db_fetch($res))
     {
-		if ($conn["tbpref"] == "" || strpos($row['Name'], $conn["tbpref"]) !== false)
+		//if ($conn["tbpref"] == "" || strpos($row['Name'], $conn["tbpref"]) !== false) replaced
+		if (($conn["tbpref"] == "" && !preg_match('/[0-9]+_/', $row['Name'])) ||
+			($conn["tbpref"] != "" && strpos($row['Name'], $conn["tbpref"]) !== false))
     		$all_tables[] = $row;
     }
         // get table structures