diff --git a/browse_foreigners.php b/browse_foreigners.php index 0ae36334d1..f3c3fab41b 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -14,7 +14,7 @@ use PhpMyAdmin\Util; require_once 'libraries/common.inc.php'; /** - * Sets globals from $_REQUEST + * Sets globals from $_POST */ $request_params = array( 'data', @@ -22,8 +22,8 @@ $request_params = array( ); foreach ($request_params as $one_request_param) { - if (isset($_REQUEST[$one_request_param])) { - $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param]; + if (isset($_POST[$one_request_param])) { + $GLOBALS[$one_request_param] = $_POST[$one_request_param]; } } @@ -49,13 +49,13 @@ $browseForeigners = new BrowseForeigners( $GLOBALS['pmaThemeImage'] ); $foreign_limit = $browseForeigners->getForeignLimit( - isset($_REQUEST['foreign_showAll']) ? $_REQUEST['foreign_showAll'] : null + isset($_POST['foreign_showAll']) ? $_POST['foreign_showAll'] : null ); $foreignData = $relation->getForeignData( - $foreigners, $_REQUEST['field'], true, - isset($_REQUEST['foreign_filter']) - ? $_REQUEST['foreign_filter'] + $foreigners, $_POST['field'], true, + isset($_POST['foreign_filter']) + ? $_POST['foreign_filter'] : '', isset($foreign_limit) ? $foreign_limit : null, true // for getting value in $foreignData['the_total'] @@ -65,7 +65,7 @@ $foreignData = $relation->getForeignData( $html = $browseForeigners->getHtmlForRelationalFieldSelection( $db, $table, - $_REQUEST['field'], + $_POST['field'], $foreignData, isset($fieldkey) ? $fieldkey : null, isset($data) ? $data : null diff --git a/js/sql.js b/js/sql.js index 21b7d1f714..b66ba5a3eb 100644 --- a/js/sql.js +++ b/js/sql.js @@ -792,7 +792,10 @@ function browseForeignDialog ($this_a) { var tableId = '#browse_foreign_table'; var filterId = '#input_foreign_filter'; var $dialog = null; - $.get($this_a.attr('href'), { 'ajax_request': true }, function (data) { + var argSep = PMA_commonParams.get('arg_separator'); + var params = $this_a.getPostData(); + params += argSep + 'ajax_request=true'; + $.post($this_a.attr('href'), params, function (data) { // Creates browse foreign value dialog $dialog = $('
').append(data.message).dialog({ title: PMA_messages.strBrowseForeignValues, diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php index b41ed78f2a..8d799740ad 100644 --- a/libraries/classes/BrowseForeigners.php +++ b/libraries/classes/BrowseForeigners.php @@ -182,12 +182,12 @@ class BrowseForeigners . ''; - if (isset($_REQUEST['rownumber'])) { + if (isset($_POST['rownumber'])) { $output .= ''; + . htmlspecialchars($_POST['rownumber']) . '" />'; } - $filter_value = (isset($_REQUEST['foreign_filter']) - ? htmlspecialchars($_REQUEST['foreign_filter']) + $filter_value = (isset($_POST['foreign_filter']) + ? htmlspecialchars($_POST['foreign_filter']) : ''); $output .= '' . '' @@ -302,7 +302,7 @@ class BrowseForeigners private function getHtmlForGotoPage($foreignData) { $gotopage = ''; - isset($_REQUEST['pos']) ? $pos = $_REQUEST['pos'] : $pos = 0; + isset($_POST['pos']) ? $pos = $_POST['pos'] : $pos = 0; if (!is_array($foreignData['disp_row'])) { return $gotopage; } @@ -340,7 +340,7 @@ class BrowseForeigners if (isset($foreignShowAll) && $foreignShowAll == __('Show all')) { return null; } - isset($_REQUEST['pos']) ? $pos = $_REQUEST['pos'] : $pos = 0; + isset($_POST['pos']) ? $pos = $_POST['pos'] : $pos = 0; return 'LIMIT ' . $pos . ', ' . $this->maxRows . ' '; } } diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index a42ee74944..90aa28f38e 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -849,7 +849,7 @@ class InsertEdit . 'id="field_' . ($idindex) . '_3" ' . 'value="' . htmlspecialchars($data) . '" />'; - $html_output .= '' . str_replace("'", "\'", $titles['Browse']) . ''; return $html_output; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index ac2c1886af..4f43ce144c 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -221,8 +221,8 @@ class Sql $dropdown = '' . htmlspecialchars($_POST['curr_value']) . '' - . '' . __('Browse foreign values') . ''; diff --git a/templates/table/search/input_box.twig b/templates/table/search/input_box.twig index 59f9ab77a3..d82c9a8475 100644 --- a/templates/table/search/input_box.twig +++ b/templates/table/search/input_box.twig @@ -20,11 +20,10 @@ {% if criteria_values[column_index] is defined %} value="{{ criteria_values[column_index] }}" {% endif %} /> - + {{ titles['Browse']|replace({"'": "\\'"})|raw }} {% endif %} diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php index 9dcb7eee5e..0231224510 100644 --- a/test/classes/BrowseForeignersTest.php +++ b/test/classes/BrowseForeignersTest.php @@ -66,7 +66,7 @@ class BrowseForeignersTest extends TestCase $this->browseForeigners->getForeignLimit(null) ); - $_REQUEST['pos'] = 10; + $_POST['pos'] = 10; $this->assertEquals( 'LIMIT 10, 25 ', @@ -107,7 +107,7 @@ class BrowseForeignersTest extends TestCase ) ); - $_REQUEST['pos'] = 15; + $_POST['pos'] = 15; $foreignData = array(); $foreignData['disp_row'] = array(); $foreignData['the_total'] = 5; @@ -196,8 +196,8 @@ class BrowseForeignersTest extends TestCase $foreignData['disp_row'] = ''; $fieldkey = 'bar'; $current_value = ''; - $_REQUEST['rownumber'] = 1; - $_REQUEST['foreign_filter'] = '5'; + $_POST['rownumber'] = 1; + $_POST['foreign_filter'] = '5'; $result = $this->browseForeigners->getHtmlForRelationalFieldSelection( $db, $table, diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 5e5b15a3bb..7af7cf4712 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -798,7 +798,7 @@ class InsertEditTest extends TestCase $this->assertContains( '', $result );