mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-09 08:06:59 +02:00
Code Issues Releases Wiki Activity

Minimize the chance of displaying message on different page (thanks to Tomas Brukner)

Browse Source
This commit is contained in:
Jakub Vrana
2011-01-30 20:37:22 +01:00
parent ceef6bc6d3
commit 79fa7dab3b
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adminer/include/adminer.inc.php
View File

@@ -404,8 +404,9 @@ username.form['driver'].onchange();
*/ */
function messageQuery($query) { function messageQuery($query) {
global $jush; global $jush;
static $count = 0;
restart_session(); restart_session();
$id = "sql-" . count($_SESSION["messages"]); $id = "sql-" . ($count++);
$history = &get_session("queries"); $history = &get_session("queries");
$history[$_GET["db"]][] = (strlen($query) > 1e6 // not DB - reset in drop database $history[$_GET["db"]][] = (strlen($query) > 1e6 // not DB - reset in drop database
? ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..." // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment ? ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..." // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment

8
adminer/include/design.inc.php
View File

@@ -64,9 +64,11 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
} }
echo "<h2>$title_all</h2>\n"; echo "<h2>$title_all</h2>\n";
restart_session(); restart_session();
if ($_SESSION["messages"]) { $uri = preg_replace('~^[^?]*/~', '', $_SERVER["REQUEST_URI"]);
echo "<div class='message'>" . implode("</div>\n<div class='message'>", $_SESSION["messages"]) . "</div>\n"; $messages = $_SESSION["messages"][$uri];
$_SESSION["messages"] = array(); if ($messages) {
echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>\n";
unset($_SESSION["messages"][$uri]);
} }
$databases = &get_session("dbs"); $databases = &get_session("dbs");
if (DB != "" && $databases && !in_array(DB, $databases, true)) { if (DB != "" && $databases && !in_array(DB, $databases, true)) {

2
adminer/include/editing.inc.php
View File

@@ -349,7 +349,7 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
$created = queries($create); $created = queries($create);
if (!queries_redirect($location, ($name != "" ? $message_alter : $message_create), $created) && $dropped) { if (!queries_redirect($location, ($name != "" ? $message_alter : $message_create), $created) && $dropped) {
restart_session(); restart_session();
$_SESSION["messages"][] = $message_drop; $_SESSION["messages"][preg_replace('~^[^?]*/~', '', $_SERVER["REQUEST_URI"])][] = $message_drop;
} }
return $dropped; return $dropped;
} }

2
adminer/include/functions.inc.php
View File

@@ -384,7 +384,7 @@ function is_ajax() {
function redirect($location, $message = null) { function redirect($location, $message = null) {
if (isset($message)) { if (isset($message)) {
restart_session(); restart_session();
$_SESSION["messages"][] = $message; $_SESSION["messages"][preg_replace('~^[^?]*/~', '', $location)][] = $message;
} }
if (isset($location)) { if (isset($location)) {
if ($location == "") { if ($location == "") {