Skip to content
Browse files

Simplify dumpOutput, dumpFormat and dumpData methods

  • Loading branch information...
1 parent 095d472 commit be3410f8227e95c9456af06c124a63b320600eea @vrana committed Oct 29, 2010
Showing with 20 additions and 23 deletions.
  1. +3 −3 adminer/dump.inc.php
  2. +9 −13 adminer/include/adminer.inc.php
  3. +2 −1 adminer/select.inc.php
  4. +6 −6 editor/include/adminer.inc.php
View
6 adminer/dump.inc.php
@@ -75,7 +75,7 @@
}
$adminer->dumpTable($row["Name"], ($table ? $_POST["table_style"] : ""));
if ($data) {
- $adminer->dumpData($row["Name"], $_POST["data_style"]);
+ $adminer->dumpData($row["Name"], $_POST["data_style"], "SELECT * FROM " . table($row["Name"]));
}
if ($is_sql && $_POST["triggers"]) {
$triggers = trigger_sql($row["Name"], $_POST["table_style"]);
@@ -167,8 +167,8 @@
$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
}
$checked = ($_GET["dump"] == "");
-echo "<tr><th>" . lang('Output') . "<td>" . $adminer->dumpOutput(0, $row["output"]) . "\n";
-echo "<tr><th>" . lang('Format') . "<td>" . $adminer->dumpFormat(0, $row["format"]) . "\n";
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
. (support("routine") ? checkbox("routines", 1, $checked, lang('Routines')) : "")
. (support("event") ? checkbox("events", 1, $checked, lang('Events')) : "")
View
22 adminer/include/adminer.inc.php
@@ -476,11 +476,9 @@ function processInput($field, $value, $function = "") {
}
/** Returns export output options
- * @param bool generate select (otherwise radio)
- * @param string
- * @return string
+ * @return array
*/
- function dumpOutput($select, $value = "") {
+ function dumpOutput() {
$return = array('text' => lang('open'), 'file' => lang('save'));
if (function_exists('gzencode')) {
$return['gz'] = 'gzip';
@@ -489,16 +487,14 @@ function dumpOutput($select, $value = "") {
$return['bz2'] = 'bzip2';
}
// ZipArchive requires temporary file, ZIP can be created by gzcompress - see PEAR File_Archive
- return html_select("output", $return, $value, $select);
+ return $return;
}
/** Returns export format options
- * @param bool generate select (otherwise radio)
- * @param string
- * @return string
+ * @return array
*/
- function dumpFormat($select, $value = "") {
- return html_select("format", array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
+ function dumpFormat() {
+ return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;');
}
/** Export table structure
@@ -602,18 +598,18 @@ function dumpTable($table, $style, $is_view = false) {
/** Export table data
* @param string
* @param string
- * @param string query to execute, defaults to SELECT * FROM $table
+ * @param string
* @return null prints data
*/
- function dumpData($table, $style, $select = "") {
+ function dumpData($table, $style, $query) {
global $connection, $jush;
$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
if ($style) {
if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
echo truncate_sql($table) . ";\n";
}
$fields = fields($table);
- $result = $connection->query(($select ? $select : "SELECT * FROM " . table($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
+ $result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
if ($result) {
$insert = "";
$buffer = "";
View
3 adminer/select.inc.php
@@ -389,7 +389,8 @@
<?php
}
print_fieldset("export", lang('Export'));
- echo $adminer->dumpOutput(1, $adminer_export["output"]) . " " . $adminer->dumpFormat(1, $adminer_export["format"]); // 1 - select
+ $output = $adminer->dumpOutput();
+ echo ($output ? html_select("output", $output, $adminer_export["output"]) . " " : "") . html_select("format", $adminer->dumpFormat(), $adminer_export["format"]);
echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
echo "</div></fieldset>\n";
}
View
12 editor/include/adminer.inc.php
@@ -434,21 +434,21 @@ function processInput($field, $value, $function = "") {
return $return;
}
- function dumpOutput($select, $value = "") {
- return "";
+ function dumpOutput() {
+ return array();
}
- function dumpFormat($select, $value = "") {
- return html_select("format", array('csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
+ function dumpFormat() {
+ return array('csv' => 'CSV,', 'csv;' => 'CSV;');
}
function dumpTable() {
echo "\xef\xbb\xbf"; // UTF-8 byte order mark
}
- function dumpData($table, $style, $select = "") {
+ function dumpData($table, $style, $query) {
global $connection;
- $result = $connection->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT
+ $result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT
if ($result) {
while ($row = $result->fetch_assoc()) {
dump_csv($row);

0 comments on commit be3410f

Please sign in to comment.
Something went wrong with that request. Please try again.