From 51e1ff79ca59b55f6c2df8758357d7107d33e4ca Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 8 Jan 2010 10:07:08 +0000 Subject: [PATCH] Show status git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1285 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/connect.inc.php | 4 ++++ adminer/static/editing.js | 3 ++- adminer/variables.inc.php | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php index 64618f55..592506c8 100644 --- a/adminer/include/connect.inc.php +++ b/adminer/include/connect.inc.php @@ -21,6 +21,7 @@ function connect_error() { 'privileges' => lang('Privileges'), 'processlist' => lang('Process list'), 'variables' => lang('Variables'), + 'status' => lang('Status'), ) as $key => $val) { echo "$val\n"; } @@ -47,6 +48,9 @@ function connect_error() { page_footer("db"); } +if (isset($_GET["status"])) { + $_GET["variables"] = $_GET["status"]; +} if (!(strlen(DB) ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]))) { if (strlen(DB)) { unset($_SESSION["databases"][$_GET["server"]]); diff --git a/adminer/static/editing.js b/adminer/static/editing.js index ef4651f8..11220964 100644 --- a/adminer/static/editing.js +++ b/adminer/static/editing.js @@ -11,7 +11,8 @@ function bodyLoad(version) { if (window.jush) { // IE runs in case of an error too jush.create_links = ' target="_blank"'; jush.urls.sql[0] = 'http://dev.mysql.com/doc/refman/' + version + '/en/$key'; - jush.urls.sql[0] = jush.urls.sql[0]; + jush.urls.sqlset[0] = jush.urls.sql[0]; + jush.urls.sqlstatus[0] = jush.urls.sql[0]; jush.style(jushRoot + 'jush.css'); jush.highlight_tag('pre', 0); jush.highlight_tag('code'); diff --git a/adminer/variables.inc.php b/adminer/variables.inc.php index 127ddc6c..eb33eaf1 100644 --- a/adminer/variables.inc.php +++ b/adminer/variables.inc.php @@ -1,11 +1,12 @@ query($status ? "SHOW STATUS" : "SHOW VARIABLES"); echo "\n"; -$result = $connection->query("SHOW VARIABLES"); while ($row = $result->fetch_assoc()) { echo ""; - echo "
" . h($row["Variable_name"]) . ""; + echo "" . h($row["Variable_name"]) . ""; echo "" . nbsp($row["Value"]); } echo "
\n";