From a5ff38c117f0107d527fa5f9f6367329ca71ec00 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 11:55:02 +0200 Subject: [PATCH 1/6] Fix #16997 - Add missing server param on server variables get/set value Signed-off-by: William Desportes --- js/src/server/variables.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/src/server/variables.js b/js/src/server/variables.js index ddc8faf4da..6dca0a210e 100644 --- a/js/src/server/variables.js +++ b/js/src/server/variables.js @@ -46,6 +46,7 @@ AJAX.registerOnload('server/variables.js', function () { var $msgbox = Functions.ajaxShowMessage(Messages.strProcessingRequest); $.post('index.php?route=/server/variables/set/' + encodeURIComponent(varName), { 'ajax_request': true, + 'server': CommonParams.get('server'), 'varValue': $valueCell.find('input').val() }, function (data) { if (data.success) { @@ -73,7 +74,8 @@ AJAX.registerOnload('server/variables.js', function () { }); $.get('index.php?route=/server/variables/get/' + encodeURIComponent(varName), { - 'ajax_request': true + 'ajax_request': true, + 'server': CommonParams.get('server') }, function (data) { if (typeof data !== 'undefined' && data.success === true) { var $links = $('
') From 082f1715f44e128d65da85c0860b82763e4535f8 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 11:56:46 +0200 Subject: [PATCH 2/6] Add a ChangeLog entry for #16997 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8510f47381..707262d77a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - issue Fixed possible "Undefined index: clause_is_unique" on replace value in cell - issue #16991 Fixed case where $_SERVER['REQUEST_METHOD'] is undefined - issue Fixed configuration error handler registration +- issue #16997 Fixed server variables get/set value not working on multi server server > 1 5.1.1 (2021-06-04) - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa From e6c715a7a8b807f5ba8c5579a6e49bf5be416eb5 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 12:12:36 +0200 Subject: [PATCH 3/6] Fix #16998 - Multi table query submit on server > 1 logged out user Signed-off-by: William Desportes --- js/src/database/multi_table_query.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/src/database/multi_table_query.js b/js/src/database/multi_table_query.js index 10a19ba14b..0601600fca 100644 --- a/js/src/database/multi_table_query.js +++ b/js/src/database/multi_table_query.js @@ -129,6 +129,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () { 'db': $('#db_name').val(), 'sql_query': query, 'ajax_request': '1', + 'server': CommonParams.get('server'), 'token': CommonParams.get('token') }; $.ajax({ From 0b9135597be4ae5c30446b585720cab036523e31 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 12:33:27 +0200 Subject: [PATCH 4/6] Fix #17000 - Multi edit on central columns on server > 1 logged out user Signed-off-by: William Desportes --- js/src/database/central_columns.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/database/central_columns.js b/js/src/database/central_columns.js index 8238aef78d..56a508763d 100644 --- a/js/src/database/central_columns.js +++ b/js/src/database/central_columns.js @@ -64,7 +64,7 @@ AJAX.registerOnload('database/central_columns.js', function () { return false; } var argsep = CommonParams.get('arg_separator'); - var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')); + var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')) + argsep + 'server=' + CommonParams.get('server'); Functions.ajaxShowMessage(); AJAX.source = $(this); $.post('index.php?route=/database/central-columns', editColumnData, AJAX.responseHandler); @@ -73,7 +73,7 @@ AJAX.registerOnload('database/central_columns.js', function () { event.preventDefault(); event.stopPropagation(); var argsep = CommonParams.get('arg_separator'); - var multiColumnEditData = $('#multi_edit_central_columns').serialize() + argsep + 'multi_edit_central_column_save=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')); + var multiColumnEditData = $('#multi_edit_central_columns').serialize() + argsep + 'multi_edit_central_column_save=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')) + argsep + 'server=' + CommonParams.get('server'); Functions.ajaxShowMessage(); AJAX.source = $(this); $.post('index.php?route=/database/central-columns', multiColumnEditData, AJAX.responseHandler); From 285c44bdc6c07ba90ca82ea19ef7e271d624606c Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 12:36:53 +0200 Subject: [PATCH 5/6] Add a ChangeLog entries for #16998 and #17000 Signed-off-by: William Desportes --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 707262d77a..5a49d42ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ phpMyAdmin - ChangeLog - issue #16991 Fixed case where $_SERVER['REQUEST_METHOD'] is undefined - issue Fixed configuration error handler registration - issue #16997 Fixed server variables get/set value not working on multi server server > 1 +- issue #16998 Fixed Multi table query submit on server > 1 logged out user +- issue #17000 Fixed Multi edit on central columns on server > 1 logged out user 5.1.1 (2021-06-04) - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa From 874486c8c405aa4156b37c67c173fd426fde0259 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 8 Jul 2021 12:37:52 +0200 Subject: [PATCH 6/6] Update phpstan baseline Signed-off-by: William Desportes --- phpstan-baseline.neon | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 42dd4868ae..8e25f6775e 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -260,11 +260,6 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/SearchController.php - - - message: "#^Cannot cast ''\\|int to int\\.$#" - count: 1 - path: libraries/classes/Controllers/Table/StructureController.php - - message: "#^Parameter \\#1 \\$content of method PhpMyAdmin\\\\Response\\:\\:addHTML\\(\\) expects string, PhpMyAdmin\\\\Message given\\.$#" count: 1