Report Drop database error

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

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index b4dde686bbe9c8b649f099439d1c20e56e947ccd..d93255449b1e87ad0bbd5988e862ff0e2aa621fa 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -82,3 +82,8 @@ if (!$_SESSION["tokens"][$_GET["server"]]) {
 if (isset($_POST["server"]) && $_POST["token"]) {
        $_POST["token"] = $_SESSION["tokens"][$_GET["server"]];
 }
+$token = $_SESSION["tokens"][$_GET["server"]]; ///< @var string CSRF protection
+$error = ($_POST ///< @var string
+       ? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
+       : ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
+);

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index f105164932665936f942e0da5ad891de71baea62..2fa3bcf19088b5f40f04a4ee61589f8c8370bfa4 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -100,9 +100,3 @@ if (!ini_get("session.use_cookies") || @ini_set("session.use_cookies", false) !=
 
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); ///< @var array used in foreign_keys()
 $confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; ///< @var string
-$token = $_SESSION["tokens"][$_GET["server"]]; ///< @var string CSRF protection
-/** @var string */
-$error = ($_POST
-       ? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
-       : ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
-);

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index dc82806ff8de68140704876021cbab0c2f40b7cb..7ebdbf93d08c48d2f9f5ed109ef8fbd6a556605e 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -14,7 +14,7 @@ function connect_error() {
                        queries_redirect(substr(ME, 0, -1), lang('Database has been dropped.'), !$connection->error);
                }
                
-               page_header(lang('Select database'), "", null);
+               page_header(lang('Select database'), $error, null);
                echo "<p>";
                foreach (array(
                        'database' => lang('Create new database'),
@@ -35,7 +35,7 @@ function connect_error() {
                        echo "<thead><tr><td><input type='hidden' name='token' value='$token'>&nbsp;<th>" . lang('Database') . "<td>" . lang('Collation') . "</thead>\n";
                        foreach ($databases as $db) {
                                $root = h(ME) . "db=" . urlencode($db);
-                               echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, false);
+                               echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]));
                                echo "<th><a href='$root'>" . h($db) . "</a>";
                                echo "<td><a href='$root&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
                                echo "\n";