diff --git a/js/codemirror/addon/lint/sql-lint.js b/js/codemirror/addon/lint/sql-lint.js index 0afa9c49cf..415dfeb3ae 100644 --- a/js/codemirror/addon/lint/sql-lint.js +++ b/js/codemirror/addon/lint/sql-lint.js @@ -30,7 +30,6 @@ CodeMirror.sqlLint = function(text, updateLinting, options, cm) { dataType: 'json', data: { sql_query: text, - token: PMA_commonParams.get('token'), server: PMA_commonParams.get('server'), options: options.lintOptions, no_history: true, diff --git a/js/config.js b/js/config.js index e73e000aca..ea50f7a90c 100644 --- a/js/config.js +++ b/js/config.js @@ -799,7 +799,6 @@ function savePrefsToLocalStorage(form) data: { ajax_request: true, server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token'), submit_get_json: true }, success: function (data) { @@ -853,7 +852,6 @@ function offerPrefsAutoimport() if ($a.attr('href') == '#no') { $cnt.remove(); $.post('index.php', { - token: PMA_commonParams.get('token'), server: PMA_commonParams.get('server'), prefs_autoload: 'hide' }, null, 'html'); @@ -862,7 +860,6 @@ function offerPrefsAutoimport() $cnt.remove(); localStorage.clear(); $.post('index.php', { - token: PMA_commonParams.get('token'), server: PMA_commonParams.get('server'), prefs_autoload: 'hide' }, null, 'html'); diff --git a/js/console.js b/js/console.js index 38811b7b8c..57539fca48 100644 --- a/js/console.js +++ b/js/console.js @@ -923,7 +923,7 @@ var PMA_consoleMessages = { var $message = $(this).closest('.message'); if (confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) { $.post('import.php', - {token: PMA_commonParams.get('token'), + { server: PMA_commonParams.get('server'), action_bookmark: 2, ajax_request: true, @@ -1059,7 +1059,6 @@ var PMA_consoleBookmarks = { refresh: function () { $.get('import.php', {ajax_request: true, - token: PMA_commonParams.get('token'), server: PMA_commonParams.get('server'), console_bookmark_refresh: 'refresh'}, function(data) { @@ -1094,7 +1093,7 @@ var PMA_consoleBookmarks = { } $(this).prop('disabled', true); $.post('import.php', - {token: PMA_commonParams.get('token'), + { ajax_request: true, console_bookmark_add: 'true', label: $('#pma_bookmarks').find('.card.add [name=label]').val(), diff --git a/js/db_central_columns.js b/js/db_central_columns.js index f3747c42e1..5026239a9e 100644 --- a/js/db_central_columns.js +++ b/js/db_central_columns.js @@ -72,7 +72,7 @@ AJAX.registerOnload('db_central_columns.js', function () { $('#multi_edit_central_columns').submit(function(event){ event.preventDefault(); event.stopPropagation(); - var multi_column_edit_data = $("#multi_edit_central_columns").serialize()+'&multi_edit_central_column_save=true&ajax_request=true&ajax_page_request=true&token='+PMA_commonParams.get('token')+'&db='+encodeURIComponent(PMA_commonParams.get('db')); + var multi_column_edit_data = $("#multi_edit_central_columns").serialize()+'&multi_edit_central_column_save=true&ajax_request=true&ajax_page_request=true&db='+encodeURIComponent(PMA_commonParams.get('db')); PMA_ajaxShowMessage(); AJAX.source = $(this); $.post('db_central_columns.php', multi_column_edit_data, AJAX.responseHandler); @@ -194,7 +194,6 @@ AJAX.registerOnload('db_central_columns.js', function () { var href = "db_central_columns.php"; var params = { 'ajax_request' : true, - 'token' : PMA_commonParams.get('token'), 'server' : PMA_commonParams.get('server'), 'db' : PMA_commonParams.get('db'), 'selectedTable' : selectvalue, diff --git a/js/db_operations.js b/js/db_operations.js index a55b1e4e81..537800cc36 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -137,8 +137,7 @@ AJAX.registerOnload('db_operations.js', function () { ); var params = { 'is_js_confirmed': '1', - 'ajax_request': true, - 'token': PMA_commonParams.get('token') + 'ajax_request': true }; $(this).PMA_confirm(question, $(this).attr('href'), function (url) { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); diff --git a/js/db_search.js b/js/db_search.js index 45dd8fc4a9..86195bade5 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -129,8 +129,7 @@ AJAX.registerOnload('db_search.js', function () { var params = { 'ajax_request': true, 'is_js_confirmed': true, - 'sql_query' : browse_sql, - 'token' : PMA_commonParams.get('token') + 'sql_query' : browse_sql }; $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success) { @@ -172,8 +171,7 @@ AJAX.registerOnload('db_search.js', function () { var params = { 'ajax_request': true, 'is_js_confirmed': true, - 'sql_query': $(this).data('delete-sql'), - 'token' : PMA_commonParams.get('token') + 'sql_query': $(this).data('delete-sql') }; var url = $(this).attr('href'); diff --git a/js/db_structure.js b/js/db_structure.js index f9c3f10223..db53bedd27 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -326,7 +326,6 @@ AJAX.registerOnload('db_structure.js', function () { PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); var params = getJSConfirmCommonParam(this); - params.token = PMA_commonParams.get('token'); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { @@ -390,7 +389,6 @@ AJAX.registerOnload('db_structure.js', function () { var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); var params = getJSConfirmCommonParam(this); - params.token = PMA_commonParams.get('token'); $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { diff --git a/js/db_tracking.js b/js/db_tracking.js index 5b771d2c75..7fabfcd400 100644 --- a/js/db_tracking.js +++ b/js/db_tracking.js @@ -85,10 +85,9 @@ AJAX.registerOnload('db_tracking.js', function () { AJAX.source = $anchor; var params = { 'ajax_page_request': true, - 'ajax_request': true, - 'token': PMA_commonParams.get('token') + 'ajax_request': true }; $.post(url, params, AJAX.responseHandler); }); }); -}); \ No newline at end of file +}); diff --git a/js/error_report.js b/js/error_report.js index 98f068c092..1c9beb6f26 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -22,7 +22,6 @@ var ErrorReport = { $.get("error_report.php", { ajax_request: true, server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token'), get_settings: true, exception_type: 'js' }, function (data) { @@ -195,7 +194,7 @@ var ErrorReport = { * @return void */ _redirect_to_settings: function () { - window.location.href = "prefs_forms.php?token=" + PMA_commonParams.get('token'); + window.location.href = "prefs_forms.php"; }, /** * Returns the report data to send to the server @@ -207,7 +206,6 @@ var ErrorReport = { _get_report_data: function (exception) { var report_data = { "ajax_request": true, - "token": PMA_commonParams.get('token'), "exception": exception, "current_url": window.location.href, "exception_type": 'js' diff --git a/js/export.js b/js/export.js index fbfa872966..c1d816d323 100644 --- a/js/export.js +++ b/js/export.js @@ -77,7 +77,6 @@ function createTemplate(name) var params = { ajax_request : true, - token : PMA_commonParams.get('token'), server : PMA_commonParams.get('server'), db : PMA_commonParams.get('db'), table : PMA_commonParams.get('table'), @@ -113,7 +112,6 @@ function loadTemplate(id) { var params = { ajax_request : true, - token : PMA_commonParams.get('token'), server : PMA_commonParams.get('server'), db : PMA_commonParams.get('db'), table : PMA_commonParams.get('table'), @@ -164,7 +162,6 @@ function updateTemplate(id) var params = { ajax_request : true, - token : PMA_commonParams.get('token'), server : PMA_commonParams.get('server'), db : PMA_commonParams.get('db'), table : PMA_commonParams.get('table'), @@ -193,7 +190,6 @@ function deleteTemplate(id) { var params = { ajax_request : true, - token : PMA_commonParams.get('token'), server : PMA_commonParams.get('server'), db : PMA_commonParams.get('db'), table : PMA_commonParams.get('table'), @@ -699,7 +695,6 @@ function check_time_out(time_limit) var href = "export.php"; var params = { 'ajax_request' : true, - 'token' : PMA_commonParams.get('token'), 'check_time_out' : true }; clearTimeout(time_out); diff --git a/js/functions.js b/js/functions.js index 429d3e1143..942b450cc0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -81,9 +81,9 @@ var spatial_indexes = []; $.ajaxPrefilter(function (options, originalOptions, jqXHR) { var nocache = new Date().getTime() + "" + Math.floor(Math.random() * 1000000); if (typeof options.data == "string") { - options.data += "&_nocache=" + nocache; + options.data += "&_nocache=" + nocache + "&token=" + encodeURIComponent(PMA_commonParams.get('token')); } else if (typeof options.data == "object") { - options.data = $.extend(originalOptions.data, {'_nocache' : nocache}); + options.data = $.extend(originalOptions.data, {'_nocache' : nocache, 'token': PMA_commonParams.get('token')}); } }); @@ -575,7 +575,6 @@ function PMA_display_git_revision() "index.php", { "server": PMA_commonParams.get('server'), - "token": PMA_commonParams.get('token'), "git_revision": true, "ajax_request": true, "no_debug": true @@ -935,7 +934,6 @@ AJAX.registerOnload('functions.js', function () { } var params = { 'ajax_request' : true, - 'token' : PMA_commonParams.get('token'), 'server' : PMA_commonParams.get('server'), 'db' : PMA_commonParams.get('db'), 'guid': guid, @@ -1197,7 +1195,6 @@ function insertQuery(queryType) var href = 'db_sql_format.php'; var params = { 'ajax_request': true, - 'token': PMA_commonParams.get('token'), 'sql': codemirror_editor.getValue() }; $.ajax({ @@ -1821,7 +1818,6 @@ function loadForeignKeyCheckbox() { // Load default foreign key check value var params = { 'ajax_request': true, - 'token': PMA_commonParams.get('token'), 'server': PMA_commonParams.get('server'), 'get_default_fk_check_value': true }; @@ -1973,7 +1969,6 @@ function codemirrorAutocompleteOnInputRead(instance) { var href = 'db_sql_autocomplete.php'; var params = { 'ajax_request': true, - 'token': PMA_commonParams.get('token'), 'server': PMA_commonParams.get('server'), 'db': PMA_commonParams.get('db'), 'no_debug': true @@ -3542,7 +3537,6 @@ AJAX.registerOnload('functions.js', function () { } var params = { 'ajax_request' : true, - 'token' : PMA_commonParams.get('token'), 'server' : PMA_commonParams.get('server'), 'db' : PMA_commonParams.get('db'), 'cur_table' : PMA_commonParams.get('table'), @@ -4087,7 +4081,7 @@ var toggleButton = function ($obj) { addClass = 'on'; } - var params = {'ajax_request': true, 'token': PMA_commonParams.get('token')}; + var params = {'ajax_request': true}; $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { PMA_ajaxRemoveMessage($msg); @@ -4166,8 +4160,7 @@ AJAX.registerOnload('functions.js', function () { url: 'version_check.php', method: "POST", data: { - "server": PMA_commonParams.get('server'), - "token": PMA_commonParams.get('token'), + "server": PMA_commonParams.get('server') }, success: PMA_current_version }); @@ -4215,7 +4208,6 @@ AJAX.registerOnload('functions.js', function () { favorite_tables: (isStorageSupported('localStorage') && typeof window.localStorage.favorite_tables !== 'undefined') ? window.localStorage.favorite_tables : '', - token: PMA_commonParams.get('token'), server: PMA_commonParams.get('server'), no_debug: true }, diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 35238db7ed..477072a139 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -89,7 +89,7 @@ function initGISEditorVisualization() { * @param input_name name of the input field * @param token token */ -function loadJSAndGISEditor(value, field, type, input_name, token) { +function loadJSAndGISEditor(value, field, type, input_name) { var head = document.getElementsByTagName('head')[0]; var script; @@ -113,14 +113,14 @@ function loadJSAndGISEditor(value, field, type, input_name, token) { script.onreadystatechange = function () { if (this.readyState == 'complete') { - loadGISEditor(value, field, type, input_name, token); + loadGISEditor(value, field, type, input_name); } }; script.onload = function () { - loadGISEditor(value, field, type, input_name, token); + loadGISEditor(value, field, type, input_name); }; script.onerror = function() { - loadGISEditor(value, field, type, input_name, token); + loadGISEditor(value, field, type, input_name); } script.src = 'js/openlayers/OpenLayers.js'; @@ -136,9 +136,8 @@ function loadJSAndGISEditor(value, field, type, input_name, token) { * @param field field name * @param type geometry type * @param input_name name of the input field - * @param token token */ -function loadGISEditor(value, field, type, input_name, token) { +function loadGISEditor(value, field, type, input_name) { var $gis_editor = $("#gis_editor"); $.post('gis_data_editor.php', { @@ -147,7 +146,6 @@ function loadGISEditor(value, field, type, input_name, token) { 'type' : type, 'input_name' : input_name, 'get_gis_editor' : true, - 'token' : token, 'ajax_request': true }, function (data) { if (typeof data !== 'undefined' && data.success === true) { diff --git a/js/indexes.js b/js/indexes.js index 756dc9aeee..6683ad7998 100644 --- a/js/indexes.js +++ b/js/indexes.js @@ -319,7 +319,6 @@ function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_i var table = $table.length > 0 ? $table.val() : ''; var post_data = { server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token'), db: $('input[name="db"]').val(), table: table, ajax_request: 1, @@ -611,8 +610,7 @@ AJAX.registerOnload('indexes.js', function () { var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false); var params = { 'is_js_confirmed': 1, - 'ajax_request': true, - 'token' : PMA_commonParams.get('token') + 'ajax_request': true }; $.post(url, params, function (data) { if (typeof data !== 'undefined' && data.success === true) { diff --git a/js/makegrid.js b/js/makegrid.js index 61856f2670..b67319b3bf 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -862,7 +862,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi 'db' : g.db, 'table' : g.table, 'column' : field_name, - 'token' : g.token, 'curr_value' : relation_curr_value, 'relation_key_or_display_column' : relation_key_or_display_column }; @@ -910,7 +909,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi 'db' : g.db, 'table' : g.table, 'column' : field_name, - 'token' : g.token, 'curr_value' : curr_value }; g.lastXHR = $.post('sql.php', post_params, function (data) { @@ -939,7 +937,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi 'db' : g.db, 'table' : g.table, 'column' : field_name, - 'token' : g.token, 'curr_value' : curr_value }; @@ -990,7 +987,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // Make the Ajax call and get the data, wrap it and insert it g.lastXHR = $.post('sql.php', { - 'token' : g.token, 'server' : g.server, 'db' : g.db, 'ajax_request' : true, @@ -1270,7 +1266,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi */ var post_params = {'ajax_request' : true, 'sql_query' : full_sql_query, - 'token' : g.token, 'server' : g.server, 'db' : g.db, 'table' : g.table, @@ -2166,7 +2161,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // assign common hidden inputs var $common_hidden_inputs = $(g.o).find('div.common_hidden_inputs'); - g.token = $common_hidden_inputs.find('input[name=token]').val(); g.server = $common_hidden_inputs.find('input[name=server]').val(); g.db = $common_hidden_inputs.find('input[name=db]').val(); g.table = $common_hidden_inputs.find('input[name=table]').val(); diff --git a/js/navigation.js b/js/navigation.js index 559ce0486f..4af3070eca 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -524,7 +524,6 @@ $(function () { type: 'POST', data: { server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token') }, url: $(this).attr('href') + '&ajax_request=true', success: function (data) { @@ -576,7 +575,6 @@ $(function () { type: 'POST', data: { server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token') }, url: $(this).attr('href') + '&ajax_request=true', success: function (data) { @@ -613,7 +611,6 @@ $(function () { ? window.localStorage.favorite_tables : '', server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token') }, success: function (data) { if (data.changes) { @@ -946,7 +943,6 @@ function PMA_ensureNaviSettings(selflink) { var params = { getNaviSettings: true, server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token') }; var url = $('#pma_navigation').find('a.navigation_url').attr('href'); $.post(url, params, function (data) { @@ -978,7 +974,6 @@ function PMA_reloadNavigation(callback, paths) { reload: true, no_debug: true, server: PMA_commonParams.get('server'), - token: PMA_commonParams.get('token') }; paths = paths || traverseNavigationForPaths(); $.extend(params, paths); @@ -1042,7 +1037,7 @@ function PMA_navigationTreePagination($this) { var url, params; if ($this[0].tagName == 'A') { url = $this.attr('href'); - params = 'ajax_request=true&token=' + PMA_commonParams.get('token'); + params = 'ajax_request=true'; } else { // tagName == 'SELECT' url = 'navigation.php'; params = $this.closest("form").serialize() + '&ajax_request=true'; diff --git a/js/normalization.js b/js/normalization.js index ed23ffa9c1..b381c169a8 100644 --- a/js/normalization.js +++ b/js/normalization.js @@ -19,7 +19,6 @@ function appendHtmlColumnsList() $.get( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -40,7 +39,6 @@ function goTo3NFStep1(newTables) $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "tables": newTables, @@ -69,7 +67,6 @@ function goTo2NFStep1() { $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -115,7 +112,6 @@ function goToStep4() $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -139,7 +135,6 @@ function goToStep3() $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -164,7 +159,6 @@ function goToStep2(extra) $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -201,7 +195,7 @@ function goTo2NFFinish(pd) for (var dependson in pd) { tables[dependson] = $('#extra input[name="' + dependson + '"]').val(); } - datastring = {"token": PMA_commonParams.get('token'), + datastring = { "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -248,7 +242,7 @@ function goTo3NFFinish(newTables) } } } - datastring = {"token": PMA_commonParams.get('token'), + datastring = { "ajax_request": true, "db": PMA_commonParams.get('db'), "newTables":JSON.stringify(newTables), @@ -296,7 +290,7 @@ function goTo2NFStep2(pd, primary_key) extra += ''; } else { extra += ''; - datastring = {"token": PMA_commonParams.get('token'), + datastring = { "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -345,7 +339,7 @@ function goTo3NFStep2(pd, tablesTds) extra += ''; } else { extra += ''; - datastring = {"token": PMA_commonParams.get('token'), + datastring = { "ajax_request": true, "db": PMA_commonParams.get('db'), "tables": JSON.stringify(tablesTds), @@ -437,7 +431,7 @@ function moveRepeatingGroup(repeatingCols) { $("input[name=repeatGroupColumn]").focus(); return false; } - datastring = {"token": PMA_commonParams.get('token'), + datastring = { "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -496,7 +490,6 @@ AJAX.registerOnload('normalization.js', function() { $.get( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -529,7 +522,6 @@ AJAX.registerOnload('normalization.js', function() { $.post( "sql.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -559,7 +551,6 @@ AJAX.registerOnload('normalization.js', function() { $.get( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -607,7 +598,6 @@ AJAX.registerOnload('normalization.js', function() { $.post( "sql.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), @@ -647,7 +637,6 @@ AJAX.registerOnload('normalization.js', function() { server: PMA_commonParams.get('server'), db: PMA_commonParams.get('db'), table: PMA_commonParams.get('table'), - token: PMA_commonParams.get('token'), added_fields: 1, add_fields:1, index: {Key_name:'PRIMARY'}, @@ -684,7 +673,6 @@ AJAX.registerOnload('normalization.js', function() { $.post( "normalization.php", { - "token": PMA_commonParams.get('token'), "ajax_request": true, "db": PMA_commonParams.get('db'), "table": PMA_commonParams.get('table'), diff --git a/js/pmd/move.js b/js/pmd/move.js index d79c4952b9..8f549ea709 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -656,7 +656,7 @@ function Save2(callback) { if (pmd_tables_enabled) { var poststr = '&operation=savePage&save_page=same&ajax_request=true'; - poststr += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + '&selected_page=' + selected_page; + poststr += '&server=' + server + '&db=' + db + '&selected_page=' + selected_page; poststr += Get_url_pos(); var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); @@ -743,7 +743,6 @@ function Save3(callback) var $form = $('
') .append('') .append('') - .append('') .append('') .append('') .append('