Compact dump output

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

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 6c4e6d296650599e6935d92dd05e0e7e0b6d1a33..ceb5563a219a3846cbd152c2a8058cc96b9e13a0 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -158,18 +158,17 @@ page_header(lang('Export'), "", (strlen($_GET["export"]) ? array("table" => $_GE
 <form action="" method="post">
 <table cellspacing="0">
 <?php
-$db_style = array('USE', 'DROP+CREATE', 'CREATE');
-$table_style = array('DROP+CREATE', 'CREATE');
-$data_style = array('TRUNCATE+INSERT', 'INSERT', 'INSERT+UPDATE');
+$db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
+$table_style = array('', 'DROP+CREATE', 'CREATE');
+$data_style = array('', 'TRUNCATE+INSERT', 'INSERT', 'INSERT+UPDATE');
 if ($dbh->server_info >= 5) {
        $db_style[] = 'CREATE+ALTER';
        $table_style[] = 'CREATE+ALTER';
 }
 echo "<tr><th>" . lang('Output') . "<td><input type='hidden' name='token' value='$token'>$dump_output\n";
-echo "<tr><th>" . lang('Format') . "<td>$dump_format\n";
-echo "<tr><th>" . lang('Database') . "<td><select name='db_style'><option>" . optionlist($db_style, (strlen($_GET["db"]) ? '' : 'CREATE')) . "</select>\n";
-echo "<tr><th>" . lang('Tables') . "<td><select name='table_style'><option>" . optionlist($table_style, 'DROP+CREATE') . "</select>\n";
-echo "<tr><th>" . lang('Data') . "<td><select name='data_style'><option>" . optionlist($data_style, 'INSERT') . "</select>\n";
+echo "<tr><th>" . lang('Database') . "<td><select name='db_style'>" . optionlist($db_style, (strlen($_GET["db"]) ? '' : 'CREATE')) . "</select>\n";
+echo "<tr><th>" . lang('Tables') . "<td><select name='table_style'>" . optionlist($table_style, 'DROP+CREATE') . "</select>\n";
+echo "<tr><th>" . lang('Data') . "<td><select name='data_style'>" . optionlist($data_style, 'INSERT') . "</select>\n";
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">

diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index 11a98ea17e050fa1e9c9a3ea02946a861329d162..7026b577631253f55356dd55e729b26538bfcc15 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'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
-$dump_format = "<select name='format'>" . optionlist(array('sql' => lang('SQL'), 'csv' => lang('CSV'))) . "</select>";
+$dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>"
+       . " <select name='format'>" . optionlist(array('sql' => 'SQL', 'csv' => 'CSV')) . "</select>"
 $max_packet = 1048576; // default, minimum is 1024

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 4adeaa745685db975e84b540d515b98542a2641f..b24bea9fbb8141c47174c6917905897bb1c74882 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Výstup',
        'open' => 'otevřít',
        'save' => 'uložit',
-       'Format' => 'Formát',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Tabulky',
        'Data' => 'Data',
        'Event has been dropped.' => 'Událost byla odstraněna.',

diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 7b49b316c1f7a117a6fc6c80f6dd6c7fd2b34e5c..908916424aa084ab5acbecb7def66bc23ee69ba9 100644 (file)
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Ergebnis',
        'open' => 'anzeigen',
        'save' => 'Datei',
-       'Format' => 'Format',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Tabellen',
        'Data' => 'Daten',
        'Event has been dropped.' => 'Ereignis entfernt.',

diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index 0fbfa93dbfdc14f27b71b20f8e10b68083f74e0b..21270bd5a6acf3e4445346bdb996c1a4b604892e 100644 (file)
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Salida',
        'open' => 'mostrar',
        'save' => 'archivo',
-       'Format' => 'Formato',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Tablas',
        'Data' => 'Datos',
        'Event has been dropped.' => 'Evento eliminado.',

diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 1ff8f028720e19d6840bb50c98bebb92ff98289d..7e1b63a43fc188c4a6ccb11ea25708b4d3e78592 100644 (file)
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Väljund',
        'open' => 'näita brauseris',
        'save' => 'salvesta failina',
-       'Format' => 'Formaat',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Functions' => 'Funktsioonid',
        'Aggregation' => 'Liitmine',
        'Event has been dropped.' => 'Sündmus on edukalt kustutatud.',

diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index fd5dc5dfbbd726d4d4771548bd1b9a61be7c266c..6f8ba457fd65ee629b71134223d55557ac9b6b5b 100644 (file)
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Sortie',
        'open' => 'ouvrir',
        'save' => 'sauvegarder',
-       'Format' => 'Formatter',
-       'SQL' => 'SQL',
-       'CSV' => 'CVS',
        'Functions' => 'Fonctions',
        'Aggregation' => 'Agrégation',
        'Event has been dropped.' => 'L\'évènement a été supprimé.',

diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index 9c47872c9f1062ebf75dfc88ea7024056f367f1d..ffe8ee32265de2e0fb87644c7751766d81b386bd 100644 (file)
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Risultato',
        'open' => 'apri',
        'save' => 'salva',
-       'Format' => 'Formato',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Tabelle',
        'Data' => 'Dati',
        'Event has been dropped.' => 'Evento eliminato.',

diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 5befed992ec0a96812f5fd69f8914ee3e1774900..7a98121766d9acdbeba6f924192a8df044a6a119 100644 (file)
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Uitvoer',
        'open' => 'openen',
        'save' => 'opslaan',
-       'Format' => 'Formaat',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Functions' => 'Functies',
        'Aggregation' => 'Totalen',
        'Event has been dropped.' => 'Event werd verwijderd.',

diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index 740b95d1594a6ab0217f08d0160635a05585b788..51b86a6f297307662ee104a2639c094d6aad9c56 100644 (file)
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Выходные данные',
        'open' => 'открыть',
        'save' => 'сохранить',
-       'Format' => 'Формат',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Таблицы',
        'Data' => 'Данные',
        'Event has been dropped.' => 'Событие было удалено.',

diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index cc21aadf925029810a05dc06f33432f2449f38c0..4945b6b526bd4adf0b18ae703ff328cd35656b2c 100644 (file)
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => 'Výstup',
        'open' => 'otvoriť',
        'save' => 'uložiť',
-       'Format' => 'Formát',
-       'SQL' => 'SQL',
-       'CSV' => 'CSV',
        'Tables' => 'Tabuľky',
        'Data' => 'Dáta',
        'Event has been dropped.' => 'Udalosť bola odstránená.',

diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index 9c32277e664c8d5ac4901a8676f1626791e430ed..2c66e6bad90cfddc803ac7b4aded5738021a3371 100644 (file)
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => '輸出',
        'open' => '打開',
        'save' => '儲存',
-       'Format' => '格式',
-       'SQL' => 'SQL',
-       'CSV' => 'CVS',
        'Functions' => '函數',
        'Aggregation' => '集合',
        'Event has been dropped.' => '已丟棄事件。',

diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index add1c201c4d5e0f0a84330d6be59a0e357fc294b..518f5c5f687da5f976c8cc2bfbf58a0673d33672 100644 (file)
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -155,9 +155,6 @@ $translations = array(
        'Output' => '输出',
        'open' => '打开',
        'save' => '保存',
-       'Format' => '格式',
-       'SQL' => 'SQL',
-       'CSV' => 'CVS',
        'Functions' => '函数',
        'Aggregation' => '集合',
        'Event has been dropped.' => '已丢弃事件。',

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 1eec2639f30bcd8a8c8bebe4c4a8c13aed4281e7..3a8cbc581a0600b3655678eace6ae8f4fc917d10 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -298,7 +298,7 @@ if (!$columns) {
                        echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";
                        
                        echo (information_schema($_GET["db"]) ? "" : "<fieldset><legend>" . lang('Edit') . "</legend><div><input type='submit' name='edit' value='" . lang('Edit') . "'> <input type='submit' name='clone' value='" . lang('Clone') . "'> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm></div></fieldset>\n");
-                       echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output $dump_format <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
+                       echo "<fieldset><legend>" . lang('Export') . "</legend><div>$dump_output <input type='submit' name='export' value='" . lang('Export') . "'></div></fieldset>\n";
                }
                echo "<fieldset><legend>" . lang('CSV Import') . "</legend><div><input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> <input type='submit' name='import' value='" . lang('Import') . "'></div></fieldset>\n";
                

diff --git a/editor/include/export.inc.php b/editor/include/export.inc.php
index f9dcdb9d86aeb58d6f9fdd2c38d231f69a7db4cc..b04e6cc829fe0fb750f6c0268ef87e6ab0a1b97b 100644 (file)
--- a/editor/include/export.inc.php
+++ b/editor/include/export.inc.php
@@ -22,5 +22,4 @@ function dump_headers($identifier) {
        return $ext;
 }
 
-$dump_output = "";
-$dump_format = "CSV";
+$dump_output = "CSV";