From df98f2453d783e7fe54bf20d58a9cf014dfb1256 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 19 Mar 2025 05:05:42 +0100
Subject: [PATCH] Plugins: Load config from adminer-plugins.php

---
 .gitignore                        |  1 +
 CHANGELOG.md                      |  3 ++-
 README.md                         | 12 ++++++------
 adminer/include/bootstrap.inc.php |  2 +-
 adminer/include/plugins.inc.php   | 16 ++++++++++------
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 946395f2..131e7cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /editor*.php
 /vendor/
 adminer-plugins/
+adminer-plugins.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56a77204..b386eca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
 - CSS: Allow more custom styles with dark mode (bug #925)
 - IMAP: New plugin driver created for fun
 - Plugins: autoload plugins from adminer-plugins/
-- Plugins: configure plugins with adminer-plugins/config.php
+- Plugins: configure plugins with adminer-plugins.php
+- Plugins: Display loaded plugins in server overview
 
 ## Adminer 5.0.6 (released 2025-03-17)
 - Align numbers right (bug #912)
diff --git a/README.md b/README.md
index b70f40d0..b8086d42 100644
--- a/README.md
+++ b/README.md
@@ -32,19 +32,19 @@ To use a plugin, simply upload it to `adminer-plugins/` next to `adminer.php`.
 
 ```
 - adminer.php
-- adminer-plugins
-    - config.php
+- adminer-plugins/
     - dump-xml.php
     - login-password-less.php
+    - ...
+- adminer-plugins.php
 ```
 
-Some plugins require configuration. To use them, you need to create another file in `adminer-plugins/`:
+Some plugins require configuration. To use them, create file `adminer-plugins.php`. You can also specify loading order here.
 
 ```php
-<?php // config.php
-require_once __DIR__ . "/login-password-less.php";
-
+<?php // adminer-plugins.php
 return array(
     new AdminerLoginPasswordLess('$2y$07$Czp9G/aLi3AnaUqpvkF05OHO1LMizrAgMLvnaOdvQovHaRv28XDhG'),
+    // You can specify all plugins here or just the ones needing configuration.
 );
 ```
diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index bc19b7ec..0cc14345 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -80,7 +80,7 @@ include "./include/adminer.inc.php";
 
 if (function_exists('adminer_object')) {
 	$adminer = adminer_object();
-} elseif (file_exists("adminer-plugins/")) {
+} elseif (is_dir("adminer-plugins") || file_exists("adminer-plugins.php")) {
 	include "./include/plugins.inc.php";
 	$adminer = new Plugins(null);
 } else {
diff --git a/adminer/include/plugins.inc.php b/adminer/include/plugins.inc.php
index d7d36f5e..d5bf15b1 100644
--- a/adminer/include/plugins.inc.php
+++ b/adminer/include/plugins.inc.php
@@ -10,12 +10,16 @@ class Plugins extends Adminer {
 	function __construct($plugins) {
 		if ($plugins === null) {
 			$plugins = array();
-			foreach (glob("adminer-plugins/*.php") as $filename) {
-				$include = include_once "./$filename";
-				if (is_array($include)) { // example: return array(new AdminerLoginOtp($secret))
-					foreach ($include as $plugin) {
-						$plugins[get_class($plugin)] = $plugin;
-					}
+			$basename = "adminer-plugins";
+			if (is_dir($basename)) {
+				foreach (glob("$basename/*.php") as $filename) {
+					$include = include_once "./$filename";
+				}
+			}
+			if (file_exists("$basename.php")) {
+				$include = include_once "./$basename.php"; // example: return array(new AdminerLoginOtp($secret))
+				foreach ($include as $plugin) {
+					$plugins[get_class($plugin)] = $plugin;
 				}
 			}
 			foreach (get_declared_classes() as $class) {