From 00eb35b2beadc3dc354183ba8641156fd979dfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 5 Aug 2019 23:27:47 -0300
Subject: [PATCH] Use the router the for the browse foreigners 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/BrowseForeigners.php                    | 8 ++++----
 libraries/classes/InsertEdit.php                          | 4 +++-
 .../entry_points/browse_foreigners.php                    | 6 ++----
 templates/sql/relational_column_dropdown.twig             | 2 +-
 templates/table/search/input_box.twig                     | 2 +-
 test/classes/BrowseForeignersTest.php                     | 6 +++++-
 test/classes/InsertEditTest.php                           | 7 +++++--
 8 files changed, 24 insertions(+), 14 deletions(-)
 rename browse_foreigners.php => libraries/entry_points/browse_foreigners.php (92%)

diff --git a/index.php b/index.php
index 9368f2b940..3b84e406f4 100644
--- a/index.php
+++ b/index.php
@@ -28,6 +28,9 @@ if (isset($_GET['route']) || isset($_POST['route'])) {
         $routes->addRoute(['GET', 'POST'], '/ajax', function () {
             require_once ROOT_PATH . 'libraries/entry_points/ajax.php';
         });
+        $routes->addRoute(['GET', 'POST'], '/browse_foreigners', function () {
+            require_once ROOT_PATH . 'libraries/entry_points/browse_foreigners.php';
+        });
         $routes->addGroup('/database', function (RouteCollector $routes) {
             $routes->addRoute(['GET', 'POST'], '/central_columns', function () {
                 require_once ROOT_PATH . 'libraries/entry_points/database/central_columns.php';
diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
index cc5216866a..d4685770dc 100644
--- a/libraries/classes/BrowseForeigners.php
+++ b/libraries/classes/BrowseForeigners.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Contains functions used by browse_foreigners.php
+ * Contains functions used by /browse_foreigners
  *
  * @package PhpMyAdmin
  */
@@ -183,9 +183,9 @@ class BrowseForeigners
         ]);
 
         $output = '<form class="ajax" '
-            . 'id="browse_foreign_form" name="browse_foreign_from" '
-            . 'action="browse_foreigners.php" method="post">'
-            . '<fieldset>'
+            . 'id="browse_foreign_form" name="browse_foreign_from" action="'
+            . Url::getFromRoute('/browse_foreigners')
+            . '" method="post"><fieldset>'
             . Url::getHiddenInputs($db, $table)
             . '<input type="hidden" name="field" value="' . htmlspecialchars($field)
             . '">'
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index c6d06c67ea..db2621b522 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -883,7 +883,9 @@ class InsertEdit
             . 'id="field_' . $idindex . '_3" '
             . 'value="' . htmlspecialchars($data) . '">';
 
-        $html_output .= '<a class="ajax browse_foreign" href="browse_foreigners.php" data-post="'
+        $html_output .= '<a class="ajax browse_foreign" href="'
+            . Url::getFromRoute('/browse_foreigners')
+            . '" data-post="'
             . Url::getCommon(
                 [
                     'db' => $db,
diff --git a/browse_foreigners.php b/libraries/entry_points/browse_foreigners.php
similarity index 92%
rename from browse_foreigners.php
rename to libraries/entry_points/browse_foreigners.php
index 2755b51dc5..91ade361aa 100644
--- a/browse_foreigners.php
+++ b/libraries/entry_points/browse_foreigners.php
@@ -14,14 +14,12 @@ use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
 
-if (! defined('ROOT_PATH')) {
-    define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+if (! defined('PHPMYADMIN')) {
+    exit;
 }
 
 global $containerBuilder;
 
-require_once ROOT_PATH . 'libraries/common.inc.php';
-
 Util::checkParameters(['db', 'table', 'field'], true);
 
 /** @var Response $response */
diff --git a/templates/sql/relational_column_dropdown.twig b/templates/sql/relational_column_dropdown.twig
index 6a2aaffc21..a60a74e070 100644
--- a/templates/sql/relational_column_dropdown.twig
+++ b/templates/sql/relational_column_dropdown.twig
@@ -1,4 +1,4 @@
 <span class="curr_value">{{ current_value }}</span>
-<a href="browse_foreigners.php" data-post="{{ get_common(params, '') }}">
+<a href="{{ url('/browse_foreigners') }}" data-post="{{ get_common(params, '') }}">
   {% trans 'Browse foreign values' %}
 </a>
diff --git a/templates/table/search/input_box.twig b/templates/table/search/input_box.twig
index 5c30535bd7..75c025bd71 100644
--- a/templates/table/search/input_box.twig
+++ b/templates/table/search/input_box.twig
@@ -20,7 +20,7 @@
             {% if criteria_values[column_index] is defined %}
                 value="{{ criteria_values[column_index] }}"
             {% endif %}>
-        <a class="ajax browse_foreign" href="browse_foreigners.php" data-post="
+        <a class="ajax browse_foreign" href="{{ url('/browse_foreigners') }}" data-post="
             {{- get_common({'db': db, 'table': table}, '') -}}
             &amp;field={{ column_name|url_encode }}&amp;fieldkey=
             {{- column_index }}&amp;fromsearch=1">
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index 825db139e8..eea6923d01 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -220,7 +220,11 @@ class BrowseForeignersTest extends TestCase
         $this->assertStringContainsString(
             '<form class="ajax" '
             . 'id="browse_foreign_form" name="browse_foreign_from" '
-            . 'action="browse_foreigners.php" method="post">',
+            . 'action="index.php?route=/browse_foreigners',
+            $result
+        );
+        $this->assertStringContainsString(
+            '" method="post">',
             $result
         );
 
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 2f84c13cd6..67358ef65b 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -1023,11 +1023,14 @@ class InsertEditTest extends TestCase
         );
 
         $this->assertStringContainsString(
-            '<a class="ajax browse_foreign" href="browse_'
-            . 'foreigners.php" data-post="db=db&amp;table=tbl&amp;field=f&amp;rownumber=8'
+            '" data-post="db=db&amp;table=tbl&amp;field=f&amp;rownumber=8'
             . '&amp;data=abc&amp;server=1&amp;lang=en">',
             $result
         );
+        $this->assertStringContainsString(
+            '<a class="ajax browse_foreign" href="index.php?route=/browse_foreigners',
+            $result
+        );
 
         $this->assertStringContainsString(
             '<input type="text" name="fieldsb" class="textfield" d tabindex="2" '