diff --git a/index.php b/index.php index 30011474f1..5bb6860bfb 100644 --- a/index.php +++ b/index.php @@ -24,8 +24,13 @@ if (isset($_GET['route']) || isset($_POST['route'])) { $routes->addRoute(['GET', 'POST'], '[/]', function () { require_once ROOT_PATH . 'libraries/entry_points/home.php'; }); - $routes->addRoute(['GET', 'POST'], '/server/databases', function () { - require_once ROOT_PATH . 'libraries/entry_points/server_databases.php'; + $routes->addGroup('/server', function (RouteCollector $routes) { + $routes->addRoute(['GET', 'POST'], '/databases', function () { + require_once ROOT_PATH . 'libraries/entry_points/server_databases.php'; + }); + $routes->addRoute('GET', '/plugins', function () { + require_once ROOT_PATH . 'libraries/entry_points/server_plugins.php'; + }); }); }); $routeInfo = $dispatcher->dispatch( diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 6148cdf301..739c2301ae 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -659,7 +659,7 @@ class Menu $tabs['engine']['text'] = __('Engines'); $tabs['plugins']['icon'] = 'b_plugin'; - $tabs['plugins']['link'] = 'server_plugins.php'; + $tabs['plugins']['link'] = Url::getFromRoute('/server/plugins'); $tabs['plugins']['text'] = __('Plugins'); return $tabs; diff --git a/server_plugins.php b/libraries/entry_points/server_plugins.php similarity index 76% rename from server_plugins.php rename to libraries/entry_points/server_plugins.php index b8391e971f..80052f7922 100644 --- a/server_plugins.php +++ b/libraries/entry_points/server_plugins.php @@ -10,11 +10,11 @@ declare(strict_types=1); use PhpMyAdmin\Controllers\Server\PluginsController; use PhpMyAdmin\Response; -if (! defined('ROOT_PATH')) { - define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR); +if (! defined('PHPMYADMIN')) { + exit; } -require_once ROOT_PATH . 'libraries/common.inc.php'; +global $containerBuilder; /** @var PluginsController $controller */ $controller = $containerBuilder->get(PluginsController::class);