Permalink
Browse files

Show upload_max_filesize

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@841 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
1 parent 04a3f5b commit e2a03c08c385c3be7fff036d03571200f0963701 jakubvrana committed Jul 16, 2009
Showing with 10 additions and 3 deletions.
  1. +5 −0 adminer/include/functions.inc.php
  2. +1 −0 adminer/lang/cs.inc.php
  3. +1 −1 adminer/select.inc.php
  4. +3 −2 adminer/sql.inc.php
@@ -151,6 +151,11 @@ function get_file($key) {
return (!$_FILES[$key] || $_FILES[$key]["error"] ? $_FILES[$key]["error"] : file_get_contents($_FILES[$key]["tmp_name"]));
}
+function upload_error($error) {
+ $max_size = ($error == UPLOAD_ERR_INI_SIZE ? ini_get("upload_max_filesize") : null); // post_max_size is checked in index.php
+ return lang('Unable to upload a file.') . ($max_size ? " " . lang('Maximum allowed file size is %sB.', $max_size) : "");
+}
+
function odd($s = ' class="odd"') {
static $i = 0;
if (!$s) { // reset counter
View
@@ -228,4 +228,5 @@
'Binary' => 'Binární',
'Lists' => 'Seznamy',
'Relations' => 'Vztahy',
+ 'Maximum allowed file size is %sB.' => 'Maximální povolená velikost souboru je %sB.',
);
View
@@ -166,7 +166,7 @@
$result = queries("INSERT INTO " . idf_escape($_GET["select"]) . "$cols VALUES" . implode(",", $rows));
query_redirect(queries(), remove_from_uri("page"), lang('%d row(s) has been imported.', $dbh->affected_rows), $result, false, !$result);
} else {
- $error = lang('Unable to upload a file.');
+ $error = upload_error($file);
}
}
View
@@ -3,7 +3,8 @@
$history = &$_SESSION["history"][$_GET["server"]][$_GET["db"]];
if (!$error && $_POST) {
- if (is_string($query = (isset($_POST["file"]) ? get_file("sql_file") : $_POST["query"]))) { // get_file() returns error as number
+ $query = (isset($_POST["file"]) ? get_file("sql_file") : $_POST["query"]);
+ if (is_string($query)) { // get_file() returns error as number
@set_time_limit(0); // set_time_limit() can be disabled
$query = str_replace("\r", "", $query); // parser looks for \n
$query = rtrim($query);
@@ -64,7 +65,7 @@
echo "<p class='message'>" . lang('No commands to execute.') . "\n";
}
} else {
- echo "<p class='error'>" . lang('Unable to upload a file.') . "\n";
+ echo "<p class='error'>" . upload_error($query) . "\n";
}
}
?>

0 comments on commit e2a03c0

Please sign in to comment.