Databases are server specific

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

diff --git a/auth.inc.php b/auth.inc.php
index 3806d71dffc376e12d8bfce534c5a1128614f02c..49a7428456d29127896098f20a783905b81efe47 100644 (file)
--- a/auth.inc.php
+++ b/auth.inc.php
@@ -25,6 +25,7 @@ if (isset($_POST["server"])) {
 } elseif (isset($_GET["logout"])) {
        unset($_SESSION["usernames"][$_GET["server"]]);
        unset($_SESSION["passwords"][$_GET["server"]]);
+       unset($_SESSION["databases"][$_GET["server"]]);
        $_SESSION["tokens"][$_GET["server"]] = array();
        redirect(substr($SELF, 0, -1), lang('Logout successful.'));
 }

diff --git a/connect.inc.php b/connect.inc.php
index a85c2ef972acba1c8183bd6b7c6eff5e3b2deb02..db22707f3636e5e6fe0b41f019a53f762b54ab59 100644 (file)
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]))) {
-       unset($_SESSION["databases"]);
+       unset($_SESSION[$_GET["server"]]["databases"]);
        page_header(lang('Select database'));
        if (strlen($_GET["db"])) {
                echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";

diff --git a/database.inc.php b/database.inc.php
index 524b5cb26772049eaf06bc3bf539dd19e25d7dca..2e6bf818145f4b54704576276287a3287c63136d 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -6,7 +6,7 @@ if ($_POST && !$error) {
                }
        } elseif ($_GET["db"] !== $_POST["name"]) {
                if ($mysql->query("CREATE DATABASE " . idf_escape($_POST["name"]) . ($_POST["collation"] ? " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'" : ""))) {
-                       unset($_SESSION["databases"]);
+                       unset($_SESSION[$_GET["server"]]["databases"]);
                        if (!strlen($_GET["db"])) {
                                redirect(preg_replace('~db=[^&]*&~', '', $SELF) . "db=" . urlencode($_POST["name"]), lang('Database has been created.'));
                        }

diff --git a/design.inc.php b/design.inc.php
index bc838b4f2eefa1564bf4b1a5d515c645355ba947..748548ac9c918bee976a38fc4dbc52160783ba2e 100644 (file)
--- a/design.inc.php
+++ b/design.inc.php
@@ -27,7 +27,7 @@ function page_header($title) {
                echo "<p class='message'>$_SESSION[message]</p>\n";
                $_SESSION["message"] = "";
        }
-       if (isset($_SESSION["databases"])) {
+       if (isset($_SESSION[$_GET["server"]]["databases"])) {
                session_write_close();
        }
 }
@@ -51,10 +51,10 @@ function page_footer($missing = false) {
 <select name="db" onchange="this.form.submit();"><option value="">(<?php echo lang('database'); ?>)</option>
 <?php
                flush();
-               if (!isset($_SESSION["databases"])) {
-                       $_SESSION["databases"] = get_vals("SHOW DATABASES");
+               if (!isset($_SESSION[$_GET["server"]]["databases"])) {
+                       $_SESSION[$_GET["server"]]["databases"] = get_vals("SHOW DATABASES");
                }
-               echo optionlist($_SESSION["databases"], $_GET["db"]);
+               echo optionlist($_SESSION[$_GET["server"]]["databases"], $_GET["db"]);
                ?>
 </select><?php if (isset($_GET["sql"])) { ?><input type="hidden" name="sql" value="" /><?php } ?></p>
 <noscript><p><input type="submit" value="<?php echo lang('Use'); ?>" /></p></noscript>