gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the router the for the browse foreigners page

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-08-05 23:27:47 -03:00
parent 63cced225e
commit 00eb35b2be
8 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@ -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';

8
libraries/classes/BrowseForeigners.php
View File

@ -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)
. '">'

4
libraries/classes/InsertEdit.php
View File

@ -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,

6
browse_foreigners.php → libraries/entry_points/browse_foreigners.php
View File

@ -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 */

2
templates/sql/relational_column_dropdown.twig
View File

@ -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>

2
templates/table/search/input_box.twig
View File

@ -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">

6
test/classes/BrowseForeignersTest.php
View File

@ -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
);

7
test/classes/InsertEditTest.php
View File

@ -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" '