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

Simplify SQL command user interface

Browse source
This commit is contained in:
Jakub Vrana 2010-05-20 22:46:46 +02:00
parent dc4fc82db8
commit 8f0c2608cc
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adminer/lang/cs.inc.php
View file

@ -256,4 +256,5 @@ $translations = array(
'Type has been created.' => 'Typ byl vytvořen.', 'Type has been created.' => 'Typ byl vytvořen.',
'Alter type' => 'Pozměnit typ', 'Alter type' => 'Pozměnit typ',
'Search data in tables' => 'Vyhledat data v tabulkách', 'Search data in tables' => 'Vyhledat data v tabulkách',
'From server' => 'Ze serveru',
); );

16
adminer/sql.inc.php
View file

@ -18,7 +18,7 @@ if (!$error && $_POST) {
: "compress.bzip2://adminer.sql.bz2" : "compress.bzip2://adminer.sql.bz2"
)), "rb"); )), "rb");
$query = ($fp ? fread($fp, 1e6) : false); $query = ($fp ? fread($fp, 1e6) : false);
} elseif ($_POST["file"]) { } elseif ($_FILES["sql_file"]["error"] != 4) { // 4 - UPLOAD_ERR_NO_FILE
$query = get_file("sql_file", true); $query = get_file("sql_file", true);
} }
if (is_string($query)) { // get_file() returns error as number, fread() as false if (is_string($query)) { // get_file() returns error as number, fread() as false
@ -143,16 +143,10 @@ textarea("query", $q, 20);
<input type="submit" value="<?php echo lang('Execute'); ?>"> <input type="submit" value="<?php echo lang('Execute'); ?>">
<?php echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')); ?> <?php echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')); ?>
<p>
<?php <?php
if (!ini_bool("file_uploads")) { echo "<p>" . (ini_bool("file_uploads") ? lang('File upload') . ': <input type="file" name="sql_file">' : lang('File uploads are disabled.'));
echo lang('File uploads are disabled.');
} else { ?>
<?php echo lang('File upload'); ?>: <input type="file" name="sql_file">
<input type="submit" name="file" value="<?php echo lang('Run file'); ?>">
<?php } ?>
<p><?php print_fieldset("webfile", lang('From server'), $_POST["webfile"]);
$compress = array(); $compress = array();
foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) { foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) {
if (extension_loaded($val)) { if (extension_loaded($val)) {
@ -160,9 +154,9 @@ foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) {
} }
} }
echo lang('Webserver file %s', "<code>adminer.sql" . ($compress ? "[" . implode("|", $compress) . "]" : "") . "</code>"); echo lang('Webserver file %s', "<code>adminer.sql" . ($compress ? "[" . implode("|", $compress) . "]" : "") . "</code>");
?> <input type="submit" name="webfile" value="<?php echo lang('Run file'); ?>"> echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
echo "</div></fieldset>\n";
<?php
if ($history) { if ($history) {
print_fieldset("history", lang('History'), $_GET["history"] != ""); print_fieldset("history", lang('History'), $_GET["history"] != "");
foreach ($history as $key => $val) { foreach ($history as $key => $val) {