From e6cc8bf91ee2de0467b5151f761c067014f4a5c8 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 7 Apr 2025 20:54:51 +0200 Subject: [PATCH] AdminerConfig: Move link (fix #995) --- adminer/include/adminer.inc.php | 4 ++++ adminer/include/connect.inc.php | 1 + editor/db.inc.php | 1 + editor/include/adminer.inc.php | 3 +++ plugins/config.php | 17 +++-------------- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 2fa69905..e2e6453d 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -60,6 +60,10 @@ class Adminer { return get_databases($flush); } + /** Print links after list of plugins */ + function pluginsLinks(): void { + } + /** Operators used in select * @return list operators */ diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php index 58dac265..3009b7c5 100644 --- a/adminer/include/connect.inc.php +++ b/adminer/include/connect.inc.php @@ -108,6 +108,7 @@ if ( ; } echo "\n"; + adminer()->pluginsLinks(); echo "\n"; } } diff --git a/editor/db.inc.php b/editor/db.inc.php index 094c362e..30153885 100644 --- a/editor/db.inc.php +++ b/editor/db.inc.php @@ -32,4 +32,5 @@ if (adminer()->homepage()) { echo "\n"; echo "\n"; echo script("tableCheck();"); + adminer()->pluginsLinks(); } diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index 545baa2d..0f2b0990 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -52,6 +52,9 @@ class Adminer { return get_databases($flush); } + function pluginsLinks(): void { + } + function queryTimeout() { return 5; } diff --git a/plugins/config.php b/plugins/config.php index 0853a42c..5d4c7cd2 100644 --- a/plugins/config.php +++ b/plugins/config.php @@ -51,20 +51,9 @@ class AdminerConfig extends Adminer\Plugin { } } - function navigation() { - if (Adminer\connection()) { // don't display on login page - $link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', Adminer\ME), 0, -1); - ?> - -\n"; - } + function pluginsLinks() { + $link = preg_replace('~\b(db|ns)=[^&]*&~', '', Adminer\ME); + echo "

" . $this->lang('Configuration') . "\n"; } function screenshot() {