Dump column names in CSV select export

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1010 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index faf907bfdf00f4b946821facbc2db1657d1a3601..00b0b52c990a45ea0229b93aa020cf7581f5a0d7 100644 (file)
--- a/adminer/include/export.inc.php
+++ b/adminer/include/export.inc.php
@@ -157,6 +157,6 @@ function dump_headers($identifier, $multi_table = false) {
        return $ext;
 }
 
-$dump_output = "<select name='output'><option value='text'>" . lang('open') . "<option value='file'>" . lang('save') . "</select>";
-$dump_format = "<select name='format'><option value='sql'>" . lang('SQL') . "<option value='csv'>" . lang('CSV') . "</select>";
+$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
+$dump_output = "<select name='output'>" . optionlist(array('sql' => lang('SQL'), 'csv' => lang('CSV'))) . "</select>";
 $max_packet = 1048576; // default, minimum is 1024

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index ce6400543e90f25917d6a74ba16cbf2969d0b099..1eec2639f30bcd8a8c8bebe4c4a8c13aed4281e7 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -35,6 +35,9 @@ if ($_POST && !$error) {
        if ($_POST["export"]) {
                dump_headers($_GET["select"]);
                dump_table($_GET["select"], "");
+               if ($_POST["format"] != "sql") { // Editor doesn't send format
+                       dump_csv($select ? $select : array_keys($fields));
+               }
                if (!is_array($_POST["check"]) || $primary === array()) {
                        dump_data($_GET["select"], "INSERT", "SELECT $from" . (is_array($_POST["check"]) ? ($where ? " AND " : " WHERE ") . "($where_check)" : "") . $group_by);
                } else {

diff --git a/editor/include/export.inc.php b/editor/include/export.inc.php
index 984159f120f914d9d54fdf5fffe65e388cbd186e..f9dcdb9d86aeb58d6f9fdd2c38d231f69a7db4cc 100644 (file)
--- a/editor/include/export.inc.php
+++ b/editor/include/export.inc.php
@@ -1,7 +1,6 @@
 <?php
 function dump_table($table) {
        echo "\xef\xbb\xbf"; // UTF-8 byte order mark
-       dump_csv(array_keys(fields($table)));
 }
 
 function dump_data($table, $style, $select = "") {