[adminer-svn] SF.net SVN: adminer:[1012] trunk
Database management in a single PHP file
Brought to you by:
jakubvrana
From: <jak...@us...> - 2009-08-25 15:23:27
|
Revision: 1012 http://adminer.svn.sourceforge.net/adminer/?rev=1012&view=rev Author: jakubvrana Date: 2009-08-25 15:23:19 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Compact dump output Modified Paths: -------------- trunk/adminer/dump.inc.php trunk/adminer/include/export.inc.php trunk/adminer/lang/cs.inc.php trunk/adminer/lang/de.inc.php trunk/adminer/lang/es.inc.php trunk/adminer/lang/et.inc.php trunk/adminer/lang/fr.inc.php trunk/adminer/lang/it.inc.php trunk/adminer/lang/nl.inc.php trunk/adminer/lang/ru.inc.php trunk/adminer/lang/sk.inc.php trunk/adminer/lang/zh-tw.inc.php trunk/adminer/lang/zh.inc.php trunk/adminer/select.inc.php trunk/editor/include/export.inc.php Modified: trunk/adminer/dump.inc.php =================================================================== --- trunk/adminer/dump.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/dump.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -158,18 +158,17 @@ <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'); ?>"> Modified: trunk/adminer/include/export.inc.php =================================================================== --- trunk/adminer/include/export.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/include/export.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -157,6 +157,6 @@ 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 Modified: trunk/adminer/lang/cs.inc.php =================================================================== --- trunk/adminer/lang/cs.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/cs.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ '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.', Modified: trunk/adminer/lang/de.inc.php =================================================================== --- trunk/adminer/lang/de.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/de.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => 'Ergebnis', 'open' => 'anzeigen', 'save' => 'Datei', - 'Format' => 'Format', - 'SQL' => 'SQL', - 'CSV' => 'CSV', 'Tables' => 'Tabellen', 'Data' => 'Daten', 'Event has been dropped.' => 'Ereignis entfernt.', Modified: trunk/adminer/lang/es.inc.php =================================================================== --- trunk/adminer/lang/es.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/es.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => 'Salida', 'open' => 'mostrar', 'save' => 'archivo', - 'Format' => 'Formato', - 'SQL' => 'SQL', - 'CSV' => 'CSV', 'Tables' => 'Tablas', 'Data' => 'Datos', 'Event has been dropped.' => 'Evento eliminado.', Modified: trunk/adminer/lang/et.inc.php =================================================================== --- trunk/adminer/lang/et.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/et.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ '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.', Modified: trunk/adminer/lang/fr.inc.php =================================================================== --- trunk/adminer/lang/fr.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/fr.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ '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é.', Modified: trunk/adminer/lang/it.inc.php =================================================================== --- trunk/adminer/lang/it.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/it.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => 'Risultato', 'open' => 'apri', 'save' => 'salva', - 'Format' => 'Formato', - 'SQL' => 'SQL', - 'CSV' => 'CSV', 'Tables' => 'Tabelle', 'Data' => 'Dati', 'Event has been dropped.' => 'Evento eliminato.', Modified: trunk/adminer/lang/nl.inc.php =================================================================== --- trunk/adminer/lang/nl.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/nl.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => 'Uitvoer', 'open' => 'openen', 'save' => 'opslaan', - 'Format' => 'Formaat', - 'SQL' => 'SQL', - 'CSV' => 'CSV', 'Functions' => 'Functies', 'Aggregation' => 'Totalen', 'Event has been dropped.' => 'Event werd verwijderd.', Modified: trunk/adminer/lang/ru.inc.php =================================================================== --- trunk/adminer/lang/ru.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/ru.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => 'Выходные данные', 'open' => 'открыть', 'save' => 'сохранить', - 'Format' => 'Формат', - 'SQL' => 'SQL', - 'CSV' => 'CSV', 'Tables' => 'Таблицы', 'Data' => 'Данные', 'Event has been dropped.' => 'Событие было удалено.', Modified: trunk/adminer/lang/sk.inc.php =================================================================== --- trunk/adminer/lang/sk.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/sk.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ '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á.', Modified: trunk/adminer/lang/zh-tw.inc.php =================================================================== --- trunk/adminer/lang/zh-tw.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/zh-tw.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => '輸出', 'open' => '打開', 'save' => '儲存', - 'Format' => '格式', - 'SQL' => 'SQL', - 'CSV' => 'CVS', 'Functions' => '函數', 'Aggregation' => '集合', 'Event has been dropped.' => '已丟棄事件。', Modified: trunk/adminer/lang/zh.inc.php =================================================================== --- trunk/adminer/lang/zh.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/lang/zh.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -155,9 +155,6 @@ 'Output' => '输出', 'open' => '打开', 'save' => '保存', - 'Format' => '格式', - 'SQL' => 'SQL', - 'CSV' => 'CVS', 'Functions' => '函数', 'Aggregation' => '集合', 'Event has been dropped.' => '已丢弃事件。', Modified: trunk/adminer/select.inc.php =================================================================== --- trunk/adminer/select.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/adminer/select.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -298,7 +298,7 @@ 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"; Modified: trunk/editor/include/export.inc.php =================================================================== --- trunk/editor/include/export.inc.php 2009-08-25 14:17:58 UTC (rev 1011) +++ trunk/editor/include/export.inc.php 2009-08-25 15:23:19 UTC (rev 1012) @@ -22,5 +22,4 @@ return $ext; } -$dump_output = ""; -$dump_format = "CSV"; +$dump_output = "CSV"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |