From a1927d5b71c9f780c913ee4e43b063c407ffe75d Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Thu, 8 Feb 2018 14:27:44 +0100 Subject: [PATCH] Allow specifying server name displayed in breadcrumbs --- adminer/include/adminer.inc.php | 10 +++++++++- adminer/include/design.inc.php | 3 ++- changes.txt | 1 + editor/include/adminer.inc.php | 3 +++ plugins/login-servers.php | 4 ++++ plugins/plugin.php | 5 +++++ 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 325b3484..a234cf3c 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -39,6 +39,14 @@ class Adminer { function bruteForceKey() { return $_SERVER["REMOTE_ADDR"]; } + + /** Get server name displayed in breadcrumbs + * @param string + * @return string HTML code or null + */ + function serverName($server) { + return h($server); + } /** Identifier of selected database * @return string @@ -922,7 +930,7 @@ class Adminer { } $dbs = $_SESSION["db"][$vendor][$server][$username]; foreach (($dbs ? array_keys($dbs) : array("")) as $db) { - echo "($drivers[$vendor]) " . h($username . ($server != "" ? "@$server" : "") . ($db != "" ? " - $db" : "")) . "
\n"; + echo "($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "
\n"; } } } diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index ac09ba78..544fb5fa 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -70,7 +70,8 @@ var thousandsSeparator = ''; $link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1); echo '