diff --git a/dump.inc.php b/dump.inc.php index 783ea7ba..98a8db0a 100644 --- a/dump.inc.php +++ b/dump.inc.php @@ -10,7 +10,7 @@ function tar_file($filename, $contents) { } if ($_POST) { - $ext = dump_headers((strlen($_GET["dump"]) ? $_GET["dump"] : $_GET["db"]), (!strlen($_GET["db"]) || count(array_filter((array) $_POST["tables"]) + array_filter((array) $_POST["data"])) > 1)); + $ext = dump_headers((strlen($_GET["dump"]) ? $_GET["dump"] : $_GET["db"]), (!strlen($_GET["db"]) || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1)); if ($_POST["format"] != "csv") { $max_packet = 1048576; // default, minimum is 1024 echo "SET NAMES utf8;\n"; @@ -19,15 +19,15 @@ if ($_POST) { echo "\n"; } - foreach ($_POST["databases"] as $db => $style) { - $db = bracket_escape($db, "back"); + $style = $_POST["db_style"]; + foreach ((strlen($_GET["db"]) ? array($_GET["db"]) : (array) $_POST["databases"]) as $db) { if ($dbh->select_db($db)) { if ($_POST["format"] != "csv" && ereg('CREATE', $style) && ($result = $dbh->query("SHOW CREATE DATABASE " . idf_escape($db)))) { - if ($style == "DROP, CREATE") { + if ($style == "DROP+CREATE") { echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n"; } $create = $dbh->result($result, 1); - echo ($style == "CREATE, ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n"; + echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n"; $result->free(); } if ($style && $_POST["format"] != "csv") { @@ -52,35 +52,38 @@ if ($_POST) { echo ($out ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : ""); } - if (($style || strlen($_GET["db"])) && (array_filter((array) $_POST["tables"]) || array_filter((array) $_POST["data"]))) { + if ($_POST["table_style"] || $_POST["data_style"]) { $views = array(); $result = $dbh->query("SHOW TABLE STATUS"); while ($row = $result->fetch_assoc()) { - $key = (strlen($_GET["db"]) ? bracket_escape($row["Name"]) : 0); - if ($_POST["tables"][$key] || $_POST["data"][$key]) { + $table = (!strlen($_GET["db"]) || in_array($row["Name"], (array) $_POST["tables"])); + $data = (!strlen($_GET["db"]) || in_array($row["Name"], (array) $_POST["data"])); + if ($table || $data) { if (isset($row["Engine"])) { if ($ext == "tar") { ob_start(); } - dump_table($row["Name"], $_POST["tables"][$key]); - dump_data($row["Name"], $_POST["data"][$key]); + dump_table($row["Name"], ($table ? $_POST["table_style"] : "")); + if ($data) { + dump_data($row["Name"], $_POST["data_style"]); + } if ($ext == "tar") { echo tar_file((strlen($_GET["db"]) ? "" : "$db/") . "$row[Name].csv", ob_get_clean()); } elseif ($_POST["format"] != "csv") { echo "\n"; } } elseif ($_POST["format"] != "csv") { - $views[$row["Name"]] = $_POST["tables"][$key]; + $views[] = $row["Name"]; } } } $result->free(); - foreach ($views as $view => $style1) { - dump_table($view, $style1, true); + foreach ($views as $view) { + dump_table($view, $_POST["table_style"], true); } } - if ($dbh->server_info >= 5 && $style == "CREATE, ALTER" && $_POST["format"] != "csv") { + if ($style == "CREATE+ALTER" && $_POST["format"] != "csv") { $query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()"; ?> DELIMITER ;; @@ -131,23 +134,30 @@ page_header(lang('Export'), "", (strlen($_GET["export"]) ? array("table" => $_GE ?>