Separate history for server and database

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

diff --git a/include/auth.inc.php b/include/auth.inc.php
index 5e83f8af3a2cf4b73235fe93966fd5ca5aaa7703..85f70d5b01fe7ee3fa639342c0521bbbe0a1fab4 100644 (file)
--- a/include/auth.inc.php
+++ b/include/auth.inc.php
@@ -33,6 +33,7 @@ if (isset($_POST["server"])) {
                unset($_SESSION["passwords"][$_GET["server"]]);
                unset($_SESSION["databases"][$_GET["server"]]);
                unset($_SESSION["tokens"][$_GET["server"]]);
+               unset($_SESSION["history"][$_GET["server"]]);
                redirect(substr($SELF, 0, -1), lang('Logout successful.'));
        }
 }

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5f450ab7efb96884d771569e06ce69637f8f370b..e5d55f4dafa77a7b20ba0a2fbd4ebb5ca73cf851 100644 (file)
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -96,8 +96,8 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
        $id = "sql-" . count($_SESSION["messages"]);
        $sql = "";
        if ($query) {
-               $sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code> <a href="' . htmlspecialchars($SELF) . 'sql=&amp;history=' . count($_SESSION["history"]) . '">' . lang('Edit') . '</a></span>';
-               $_SESSION["history"][] = $query;
+               $sql = " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><span id='$id' class='hidden'><br /><code class='jush-sql'>" . htmlspecialchars($query) . '</code> <a href="' . htmlspecialchars($SELF) . 'sql=&amp;history=' . count($_SESSION["history"][$_GET["server"]][$_GET["db"]]) . '">' . lang('Edit') . '</a></span>';
+               $_SESSION["history"][$_GET["server"]][$_GET["db"]][] = $query;
        }
        if ($execute) {
                $failed = !$dbh->query($query);

diff --git a/sql.inc.php b/sql.inc.php
index 74454ffc0451f6a939cf7c9d4ecaceb8209c8aeb..7096910f6a3ed7763586e86b178ceca898ee8db8 100644 (file)
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -67,7 +67,7 @@ if (!$error && $_POST) {
 ?>
 
 <form action="" method="post">
-<p><textarea name="query" rows="20" cols="80" style="width: 98%;"><?php echo htmlspecialchars($_POST ? $_POST["query"] : (strlen($_GET["history"]) ? $_SESSION["history"][$_GET["history"]] : $_GET["sql"])); ?></textarea></p>
+<p><textarea name="query" rows="20" cols="80" style="width: 98%;"><?php echo htmlspecialchars($_POST ? $_POST["query"] : (strlen($_GET["history"]) ? $_SESSION["history"][$_GET["server"]][$_GET["db"]][$_GET["history"]] : $_GET["sql"])); ?></textarea></p>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Execute'); ?>" />