From 59f411639ff34bbddfd3ecd14677e43c101ae736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 12 Aug 2019 17:06:16 -0300
Subject: [PATCH] Use the router for the server status variables page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 index.php                                                  | 3 +++
 libraries/classes/Core.php                                 | 1 -
 libraries/classes/Menu.php                                 | 7 +++----
 .../entry_points/server/status/variables.php               | 5 ++---
 templates/server/status/base.twig                          | 2 +-
 templates/server/status/variables/index.twig               | 2 +-
 .../Controllers/Server/Status/VariablesControllerTest.php  | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename server_status_variables.php => libraries/entry_points/server/status/variables.php (89%)

diff --git a/index.php b/index.php
index a0aa4ebfae..cb486992b6 100644
--- a/index.php
+++ b/index.php
@@ -121,6 +121,9 @@ if (isset($_GET['route']) || isset($_POST['route'])) {
                 $routes->addRoute('GET', '/queries', function () {
                     require_once ROOT_PATH . 'libraries/entry_points/server/status/queries.php';
                 });
+                $routes->addRoute(['GET', 'POST'], '/variables', function () {
+                    require_once ROOT_PATH . 'libraries/entry_points/server/status/variables.php';
+                });
             });
             $routes->addRoute(['GET', 'POST'], '/variables', function () {
                 require_once ROOT_PATH . 'libraries/entry_points/server/variables.php';
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 0d6babcb64..8245832dc5 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -36,7 +36,6 @@ class Core
         'pdf_schema.php',
         'server_export.php',
         'server_import.php',
-        'server_status_variables.php',
         'tbl_addfield.php',
         'tbl_create.php',
         'tbl_import.php',
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index 897bc9c7f8..85b12e6e7c 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -592,15 +592,14 @@ class Menu
         $tabs['status']['icon'] = 's_status';
         $tabs['status']['link'] = Url::getFromRoute('/server/status');
         $tabs['status']['text'] = __('Status');
-        $tabs['status']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), [
-            'server_status_variables.php',
-        ]) || (isset($_REQUEST['route']) && in_array($_REQUEST['route'], [
+        $tabs['status']['active'] = isset($_REQUEST['route']) && in_array($_REQUEST['route'], [
             '/server/status',
             '/server/status/advisor',
             '/server/status/monitor',
             '/server/status/processes',
             '/server/status/queries',
-        ]));
+            '/server/status/variables',
+        ]);
 
         if ($is_superuser || $isCreateOrGrantUser) {
             $tabs['rights']['icon'] = 's_rights';
diff --git a/server_status_variables.php b/libraries/entry_points/server/status/variables.php
similarity index 89%
rename from server_status_variables.php
rename to libraries/entry_points/server/status/variables.php
index e16e22b5df..fdba2b3d29 100644
--- a/server_status_variables.php
+++ b/libraries/entry_points/server/status/variables.php
@@ -11,13 +11,12 @@ use PhpMyAdmin\Controllers\Server\Status\VariablesController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Response;
 
-if (! defined('ROOT_PATH')) {
-    define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+if (! defined('PHPMYADMIN')) {
+    exit;
 }
 
 global $containerBuilder;
 
-require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
diff --git a/templates/server/status/base.twig b/templates/server/status/base.twig
index 8d0a74c2ff..5fd69ec900 100644
--- a/templates/server/status/base.twig
+++ b/templates/server/status/base.twig
@@ -17,7 +17,7 @@
       </a>
     </li>
     <li>
-      <a href="server_status_variables.php{{ get_common() }}"{{ active == 'variables' ? ' class="tabactive"' }}>
+      <a href="{{ url('/server/status/variables') }}"{{ active == 'variables' ? ' class="tabactive"' }}>
         {% trans 'All status variables' %}
       </a>
     </li>
diff --git a/templates/server/status/variables/index.twig b/templates/server/status/variables/index.twig
index 4da632e158..58b5b6e377 100644
--- a/templates/server/status/variables/index.twig
+++ b/templates/server/status/variables/index.twig
@@ -6,7 +6,7 @@
 <div class="row">
   <fieldset id="tableFilter">
     <legend>{% trans 'Filters' %}</legend>
-    <form action="server_status_variables.php" method="post">
+    <form action="{{ url('/server/status/variables') }}" method="post">
       {{ get_hidden_inputs() }}
 
       <input class="btn btn-secondary" type="submit" value="{% trans 'Refresh' %}">
diff --git a/test/classes/Controllers/Server/Status/VariablesControllerTest.php b/test/classes/Controllers/Server/Status/VariablesControllerTest.php
index 5a935898a5..84e10c2eb1 100644
--- a/test/classes/Controllers/Server/Status/VariablesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/VariablesControllerTest.php
@@ -153,7 +153,7 @@ class VariablesControllerTest extends TestCase
             $html
         );
         $this->assertStringContainsString(
-            'server_status_variables.php',
+            'index.php?route=/server/status/variables',
             $html
         );