File upload on same URL

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

diff --git a/index.php b/index.php
index add9ea7c085e89c6d01fc0118fc1ea3900d1bcb7..d355f39a655836f9021f4cf66a28a747de9b38c8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
 session_start();
 error_reporting(E_ALL & ~E_NOTICE);
 $SELF = preg_replace('~^[^?]*/([^?]*).*~', '\\1?', $_SERVER["REQUEST_URI"]) . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : '');
-$TOKENS = &$_SESSION["tokens"][$_GET["server"]][preg_replace('~([?&]sql=)upload~', '\\1', $_SERVER["REQUEST_URI"])];
+$TOKENS = &$_SESSION["tokens"][$_GET["server"]][$_SERVER["REQUEST_URI"]];
 include "./functions.inc.php";
 include "./lang.inc.php";
 include "./design.inc.php";

diff --git a/sql.inc.php b/sql.inc.php
index f39e3cf0a9d85faaecd0c955e31145bf98f06101..c2e1f6c66f3a85ccb94b02d64c4ebb0d4225e2d6 100644 (file)
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -38,12 +38,12 @@ if ($_POST && $error) {
        if ($empty) {
                echo "<p class='message'>" . lang('No commands to execute.') . "</p>\n";
        }
-} elseif ($_GET["sql"] == "upload") {
+} elseif ($_POST) {
        echo "<p class='error'>" . lang('Unable to upload a file.') . "</p>\n";
 }
 ?>
 
-<form action="<?php echo htmlspecialchars($SELF); ?>sql=" method="post">
+<form action="" method="post">
 <p><textarea name="query" rows="20" cols="80"><?php echo htmlspecialchars($_POST["query"]); ?></textarea></p>
 <p><input type="hidden" name="token" value="<?php echo $token; ?>" /><input type="submit" value="<?php echo lang('Execute'); ?>" /></p>
 </form>
@@ -52,7 +52,7 @@ if ($_POST && $error) {
 if (!ini_get("file_uploads")) {
        echo "<p>" . lang('File uploads are disabled.') . "</p>\n";
 } else { ?>
-<form action="<?php echo htmlspecialchars($SELF); ?>sql=upload" method="post" enctype="multipart/form-data">
+<form action="" method="post" enctype="multipart/form-data">
 <p>
 <?php echo lang('File upload'); ?>: <input type="file" name="sql_file" />
 <input type="hidden" name="token" value="<?php echo $token; ?>" />