Use the router for the server status page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
parent
0f23a622bc
commit
9437c5d22a
@ -50,6 +50,9 @@ if (isset($_GET['route']) || isset($_POST['route'])) {
|
||||
require_once ROOT_PATH . 'libraries/entry_points/server/privileges.php';
|
||||
});
|
||||
$routes->addGroup('/status', function (RouteCollector $routes) {
|
||||
$routes->addRoute('GET', '', function () {
|
||||
require_once ROOT_PATH . 'libraries/entry_points/server/status.php';
|
||||
});
|
||||
$routes->addRoute('GET', '/queries', function () {
|
||||
require_once ROOT_PATH . 'libraries/entry_points/server/status/queries.php';
|
||||
});
|
||||
|
||||
@ -46,7 +46,6 @@ class Core
|
||||
'server_export.php',
|
||||
'server_import.php',
|
||||
'server_sql.php',
|
||||
'server_status.php',
|
||||
'server_status_advisor.php',
|
||||
'server_status_monitor.php',
|
||||
'server_status_variables.php',
|
||||
|
||||
@ -585,16 +585,16 @@ class Menu
|
||||
$tabs['sql']['text'] = __('SQL');
|
||||
|
||||
$tabs['status']['icon'] = 's_status';
|
||||
$tabs['status']['link'] = 'server_status.php';
|
||||
$tabs['status']['link'] = Url::getFromRoute('/server/status');
|
||||
$tabs['status']['text'] = __('Status');
|
||||
$tabs['status']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), [
|
||||
'server_status.php',
|
||||
'server_status_advisor.php',
|
||||
'server_status_monitor.php',
|
||||
'server_status_variables.php',
|
||||
'server_status_processes.php',
|
||||
]) || (isset($_REQUEST['route']) && in_array($_REQUEST['route'], [
|
||||
'/server/status/queries'
|
||||
'/server/status',
|
||||
'/server/status/queries',
|
||||
]));
|
||||
|
||||
if ($is_superuser || $isCreateOrGrantUser) {
|
||||
|
||||
@ -37,7 +37,6 @@ class Sanitize
|
||||
'./doc/html/',
|
||||
// possible return values from Util::getScriptNameForOption
|
||||
'./index.php?',
|
||||
'./server_status.php?',
|
||||
'./db_sql.php?',
|
||||
'./db_search.php?',
|
||||
'./db_operations.php?',
|
||||
|
||||
@ -3179,7 +3179,7 @@ class Util
|
||||
case 'databases':
|
||||
return Url::getFromRoute('/server/databases');
|
||||
case 'status':
|
||||
return 'server_status.php';
|
||||
return Url::getFromRoute('/server/status');
|
||||
case 'variables':
|
||||
return Url::getFromRoute('/server/variables');
|
||||
case 'privileges':
|
||||
|
||||
@ -12,11 +12,12 @@ use PhpMyAdmin\DatabaseInterface;
|
||||
use PhpMyAdmin\ReplicationGui;
|
||||
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;
|
||||
|
||||
require_once ROOT_PATH . 'libraries/server_common.inc.php';
|
||||
require_once ROOT_PATH . 'libraries/replication.inc.php';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="row">
|
||||
<ul id="topmenu2">
|
||||
<li>
|
||||
<a href="server_status.php{{ get_common() }}"{{ active == 'status' ? ' class="tabactive"' }}>
|
||||
<a href="{{ url('/server/status') }}"{{ active == 'status' ? ' class="tabactive"' }}>
|
||||
{% trans 'Server' %}
|
||||
</a>
|
||||
</li>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user