From 857be4efdfdb20e57e168da3772fe93583909678 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 2 Sep 2016 14:03:51 +0530 Subject: [PATCH] Some more Token mismatch errors, Issue #12523 Signed-off-by: Deven Bansod --- js/server_status_monitor.js | 6 ++++-- js/server_variables.js | 3 ++- js/sql.js | 7 ++++++- js/tbl_structure.js | 15 +++++++++++++-- js/tbl_tracking.js | 14 ++++++++++++-- 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 2eb37fb86a..bd107e5b6b 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1365,7 +1365,8 @@ AJAX.registerOnload('server_status_monitor.js', function () { ajax_request: true, chart_data: 1, type: 'chartgrid', - requiredData: JSON.stringify(runtime.dataList) + requiredData: JSON.stringify(runtime.dataList), + token: PMA_commonParams.get('token') }, function (data) { var chartData; if (typeof data !== 'undefined' && data.success === true) { @@ -2006,7 +2007,8 @@ AJAX.registerOnload('server_status_monitor.js', function () { ajax_request: true, query_analyzer: true, query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(), - database: db + database: db, + token: PMA_commonParams.get('token') }, function (data) { var i, l; if (typeof data !== 'undefined' && data.success === true) { diff --git a/js/server_variables.js b/js/server_variables.js index 404e6f2630..5967cffd46 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -93,7 +93,8 @@ AJAX.registerOnload('server_variables.js', function () { ajax_request: true, type: 'setval', varName: varName, - varValue: $valueCell.find('input').val() + varValue: $valueCell.find('input').val(), + token: PMA_commonParams.get('token') }, function (data) { if (data.success) { $valueCell diff --git a/js/sql.js b/js/sql.js index c379420d31..881ca6de30 100644 --- a/js/sql.js +++ b/js/sql.js @@ -171,7 +171,12 @@ AJAX.registerOnload('sql.js', function () { if ($link.hasClass('formLinkSubmit')) { submitFormLink($link); } else { - $.post(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) { + var params = { + 'ajax_request': true, + 'is_js_confirmed': true, + 'token': PMA_commonParams.get('token') + }; + $.post(url, params, function (data) { if (data.success) { PMA_ajaxShowMessage(data.message); $link.closest('tr').remove(); diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 6dd5ce0ab6..db8bd7fc73 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -213,7 +213,13 @@ AJAX.registerOnload('tbl_structure.js', function () { var question = PMA_sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`;'); $(this).PMA_confirm(question, $(this).attr('href'), function (url) { var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false); - $.post(url, {'is_js_confirmed' : 1, 'ajax_request' : true, 'ajax_page_request' : true}, function (data) { + var params = { + 'is_js_confirmed' : 1, + 'ajax_request' : true, + 'ajax_page_request' : true, + 'token': PMA_commonParams.get('token') + }; + $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); if ($('.result_query').length) { @@ -287,7 +293,12 @@ AJAX.registerOnload('tbl_structure.js', function () { $(this).PMA_confirm(question, $(this).attr('href'), function (url) { PMA_ajaxShowMessage(); AJAX.source = $this; - $.post(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler); + var params = { + 'ajax_request' : true, + 'ajax_page_request' : true, + 'token': PMA_commonParams.get('token') + }; + $.post(url, params, AJAX.responseHandler); }); // end $.PMA_confirm() }); //end Add key diff --git a/js/tbl_tracking.js b/js/tbl_tracking.js index 920a922590..c037917d93 100644 --- a/js/tbl_tracking.js +++ b/js/tbl_tracking.js @@ -80,7 +80,12 @@ AJAX.registerOnload('tbl_tracking.js', function () { $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { PMA_ajaxShowMessage(); AJAX.source = $anchor; - $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler); + var params = { + 'ajax_page_request': true, + 'ajax_request': true, + 'token': PMA_commonParams.get('token') + }; + $.post(url, params, AJAX.responseHandler); }); }); @@ -94,7 +99,12 @@ AJAX.registerOnload('tbl_tracking.js', function () { $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) { PMA_ajaxShowMessage(); AJAX.source = $anchor; - $.post(url, {'ajax_page_request': true, 'ajax_request': true}, AJAX.responseHandler); + var params = { + 'ajax_page_request': true, + 'ajax_request': true, + 'token': PMA_commonParams.get('token') + }; + $.post(url, params, AJAX.responseHandler); }); }); }); \ No newline at end of file