beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Prepare export simplification

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@635 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-05-31 22:31:09 +00:00
parent 891ed95f6d
commit 03231f99e9
3 changed files with 40 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes.txt
View file

@ -1,5 +1,6 @@
phpMinAdmin 1.11.0: phpMinAdmin 1.11.0:
Connection through socket by server :/path/to/socket Connection through socket by server :/path/to/socket
Simplify export
Display execution time in SQL query Display execution time in SQL query
Relative date and time functions Relative date and time functions
Version checker Version checker

80
dump.inc.php
View file

@ -9,18 +9,6 @@ function tar_file($filename, $contents) {
return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512); return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
} }
function dump_link($type, $name, $val, $attrs = "") {
global $SELF;
$check = $_GET;
$check[$type] = $val;
return '<a href="' . htmlspecialchars($SELF) . "dump=" . urlencode($_GET["dump"])
. (isset($check["db_check"]) ? "&amp;db_check=" . urlencode($check["db_check"]) : "")
. (isset($check["table_check"]) ? "&amp;table_check=" . urlencode($check["table_check"]) : "")
. (isset($check["data_check"]) ? "&amp;data_check=" . urlencode($check["data_check"]) : "")
. "\" onclick=\"return !dump_check(this, /^$name/, '$val');\"$attrs>" . ($val ? $val : lang('skip')) . "</a>"
;
}
if ($_POST) { 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_filter((array) $_POST["tables"]) + array_filter((array) $_POST["data"])) > 1));
if ($_POST["format"] != "csv") { if ($_POST["format"] != "csv") {
@ -143,51 +131,47 @@ page_header(lang('Export'), "", (strlen($_GET["export"]) ? array("table" => $_GE
?> ?>
<form action="" method="post"> <form action="" method="post">
<p><?php echo lang('Output') . ": $dump_output " . lang('Format') . ": $dump_format"; ?> <input type="submit" value="<?php echo lang('Export'); ?>" /></p> <table border="0">
<?php
echo "<tr><th>" . lang('Output') . "</th><td>$dump_output</td></tr>\n";
echo "<tr><th>" . lang('Format') . "</th><td>$dump_format</td></tr>\n";
echo "<tr><th>" . lang('Database') . "</th><td><select name=''><option></option>" . optionlist(array('USE', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER'), (strlen($_GET["db"]) ? '' : 'CREATE')) . "</select></td></tr>\n";
echo "<tr><th>" . lang('Tables') . "</th><td><select name=''><option></option>" . optionlist(array('DROP, CREATE', 'CREATE', 'CREATE, ALTER'), 'DROP, CREATE') . "</select></td></tr>\n";
echo "<tr><th>" . lang('Data') . "</th><td><select name=''><option></option>" . optionlist(array('TRUNCATE, INSERT', 'INSERT', 'UPDATE'), 'INSERT') . "</select></td></tr>\n"; // INSERT INTO ... ON DUPLICATE KEY UPDATE
?>
</table>
<p><input type="submit" value="<?php echo lang('Export'); ?>" /></p>
<?php <?php
echo "<table cellspacing='0'>\n<thead><tr><th>" . lang('Database') . "</th>"; if (!strlen($_GET["db"])) {
foreach (array('', 'USE', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) { echo "<table cellspacing='0'>\n<thead><tr><th><input type='checkbox' id='check-databases' onclick='dump_check(this, /^databases\\[/);' checked='checked' />" . lang('Database') . "</th></tr></thead>\n";
echo '<th>' . dump_link("db_check", "databases", $val) . '</th>'; foreach (get_databases() as $db) {
} if ($db != "information_schema" || $dbh->server_info < 5) {
echo "</tr></thead>\n"; echo '<tr><td><label><input type="checkbox" name="databases[' . htmlspecialchars(bracket_escape($db)) . ']" checked="checked" value="1" onclick="dump_uncheck(\'check-databases\');" />' . htmlspecialchars($db) . "</label></td></tr>\n"; //! uncheck all
foreach ((strlen($_GET["db"]) ? array($_GET["db"]) : get_databases()) as $db) {
if ($db != "information_schema" || $dbh->server_info < 5) {
echo "<tr" . odd() . "><td>" . htmlspecialchars($db) . "</td>";
foreach (array('', 'USE', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) {
echo '<td><input type="radio" name="databases[' . htmlspecialchars(bracket_escape($db)) . ']"' . ($val == (isset($_GET["db_check"]) ? $_GET["db_check"] : (strlen($_GET["db"]) ? '' : 'CREATE')) ? " checked='checked'" : "") . " value='$val' /></td>";
} }
echo "</tr>\n";
} }
echo "</table>\n";
} }
echo "</table>\n";
echo "<table cellspacing='0'>\n<thead><tr><th rowspan='2'>" . lang('Tables') . "</th><th colspan='4'>" . lang('Structure') . "</th><th colspan='4'>" . lang('Data') . "</th></tr><tr>"; if (strlen($_GET["db"])) {
foreach (array('', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) { $checked = (strlen($_GET["dump"]) ? "" : " checked='checked'");
echo '<th>' . dump_link("table_check", "tables", $val) . '</th>'; echo "<table cellspacing='0'>\n<thead><tr>";
} echo "<th style='text-align: left;'><label><input type='checkbox' id='check-tables' onclick='dump_check(this, /^tables\\[/);'$checked />" . lang('Tables') . "</label></th>";
foreach (array('', 'TRUNCATE, INSERT', 'INSERT', 'UPDATE') as $val) { echo "<th><label><input type='checkbox' id='check-data' onclick='dump_check(this, /^data\\[/);'$checked />" . lang('Data') . "</label></th>";
echo '<th>' . dump_link("data_check", "data", $val, ($val == 'UPDATE' ? " title='INSERT INTO ... ON DUPLICATE KEY UPDATE'" : "")) . '</th>'; echo "</tr></thead>\n";
} $views = "";
echo "</tr></thead>\n"; $result = $dbh->query("SHOW TABLE STATUS");
$views = ""; while ($row = $result->fetch_assoc()) {
$result = $dbh->query(strlen($_GET["db"]) ? "SHOW TABLE STATUS" : "SELECT 'Engine'"); $checked = (strlen($_GET["dump"]) && $row["Name"] != $_GET["dump"] ? '' : " checked='checked'");
odd(''); $print = '<tr><td><label><input type="checkbox" name="tables[' . htmlspecialchars(bracket_escape($row["Name"])) . "]\"$checked value='1' onclick=\"dump_uncheck('check-tables');\" />" . htmlspecialchars($row["Name"]) . "</label></td>"; //! uncheck all
while ($row = $result->fetch_assoc()) { if (!$row["Engine"]) {
$print = "<tr" . odd() . "><td>" . htmlspecialchars($row["Name"]) . "</td>"; $views .= "$print</tr>\n";
foreach (array('', 'DROP, CREATE', 'CREATE', 'CREATE, ALTER') as $val) { } else {
$print .= '<td><input type="radio" name="tables[' . htmlspecialchars(bracket_escape($row["Name"])) . ']"' . ($val == (isset($_GET["table_check"]) ? $_GET["table_check"] : (strlen($_GET["dump"]) && $row["Name"] != $_GET["dump"] ? '' : 'DROP, CREATE')) ? " checked='checked'" : "") . " value='$val' /></td>"; echo $print . '<td><input type="checkbox" name="data[' . htmlspecialchars(bracket_escape($row["Name"])) . "]\"$checked value='1' onclick=\"dump_uncheck('check-data');\" /></td></tr>\n";
}
if (!$row["Engine"]) {
$views .= "$print</tr>\n";
} else {
foreach (array('', 'TRUNCATE, INSERT', 'INSERT', 'UPDATE') as $val) {
$print .= '<td><input type="radio" name="data[' . htmlspecialchars(bracket_escape($row["Name"])) . ']"' . ($val == (isset($_GET["data_check"]) ? $_GET["data_check"] : ((strlen($_GET["dump"]) && $row["Name"] != $_GET["dump"]) || !$row["Engine"] ? '' : 'INSERT')) ? " checked='checked'" : "") . " value='$val' /></td>";
} }
echo "$print</tr>\n";
} }
echo "$views</table>\n";
} }
echo "$views</table>\n";
?> ?>
<p><input type="submit" value="<?php echo lang('Export'); ?>" /></p> <p><input type="submit" value="<?php echo lang('Export'); ?>" /></p>
</form> </form>

10
functions.js
View file

@ -256,12 +256,16 @@ function schema_mouseup(ev) {
function dump_check(a, name, value) { function dump_check(el, name) {
var inputs = a.parentNode.parentNode.parentNode.parentNode.getElementsByTagName('input'); var inputs = el.form.getElementsByTagName('input');
for (var i=0; i < inputs.length; i++) { for (var i=0; i < inputs.length; i++) {
if (name.test(inputs[i].name)) { if (name.test(inputs[i].name)) {
inputs[i].checked = (inputs[i].value == value); inputs[i].checked = el.checked;
} }
} }
return true; return true;
} }
function dump_uncheck(id) {
document.getElementById(id).checked = false;
}