Merge pull request #13379 from nijel/token

Automatically add token to all AJAX requests
This commit is contained in:
Michal Čihař 2017-06-13 12:16:38 +02:00 committed by GitHub
commit a7fb02fb1e
31 changed files with 62 additions and 153 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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 += '</div>';
} else {
extra += '</div>';
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 += '</div>';
} else {
extra += '</div>';
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'),

View File

@ -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 = $('<form action="db_designer.php" method="post" name="save_page" id="save_page" class="ajax"></form>')
.append('<input type="hidden" name="server" value="' + server + '" />')
.append('<input type="hidden" name="db" value="' + db + '" />')
.append('<input type="hidden" name="token" value="' + PMA_commonParams.get('token') + '" />')
.append('<input type="hidden" name="operation" value="savePage" />')
.append('<input type="hidden" name="save_page" value="new" />')
.append('<label for="selected_value">' + PMA_messages.strPageName +
@ -788,7 +787,7 @@ function Edit_pages()
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=edit&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
var params = 'ajax_request=true&dialog=edit&server=' + server + '&db=' + db;
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -868,7 +867,7 @@ function Delete_pages()
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=delete&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
var params = 'ajax_request=true&dialog=delete&server=' + server + '&db=' + db;
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -967,7 +966,7 @@ function Save_as()
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db;
var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + '&db=' + db;
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1044,7 +1043,7 @@ function Export_pages()
$(this).dialog('close');
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=export&server=' + server + '&token=' + PMA_commonParams.get('token') + '&db=' + db + '&selected_page=' + selected_page;
var params = 'ajax_request=true&dialog=export&server=' + server + '&db=' + db + '&selected_page=' + selected_page;
$.get("db_designer.php", params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1091,7 +1090,7 @@ function Load_page(page) {
if (page !== null) {
param_page = '&page=' + page;
}
$('<a href="db_designer.php?server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + param_page + '"></a>')
$('<a href="db_designer.php?server=' + server + '&db=' + db + param_page + '"></a>')
.appendTo($('#page_content'))
.click();
} else {
@ -1139,7 +1138,7 @@ function Angular_direct()
function saveValueInConfig(index_sent, value_sent) {
$.post('db_designer.php',
{operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, token: PMA_commonParams.get('token'), value: value_sent},
{operation: 'save_setting_value', index: index_sent, ajax_request: true, server: server, value: value_sent},
function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1219,7 +1218,7 @@ function Click_field(T, f, PK) // table field
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php',
{operation: 'setDisplayField', ajax_request: true, server: server, token: PMA_commonParams.get('token'), db: db, table: T, field: f},
{operation: 'setDisplayField', ajax_request: true, server: server, db: db, table: T, field: f},
function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1234,7 +1233,7 @@ function Click_field(T, f, PK) // table field
function New_relation()
{
document.getElementById('layer_new_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token');
link_relation += '&server=' + server + '&db=' + db;
link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += '&operation=addNewRelation&ajax_request=true';
@ -1465,7 +1464,7 @@ function Canvas_click(id, event)
function Upd_relation()
{
document.getElementById('layer_upd_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token');
link_relation += '&server=' + server + '&db=' + db;
link_relation += '&operation=removeRelation&ajax_request=true';
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);

View File

@ -86,7 +86,6 @@ AJAX.registerOnload('replication.js', function () {
var params = {
'ajax_page_request': true,
'ajax_request': true,
'token': PMA_commonParams.get('tokens')
};
$.post(url, params, AJAX.responseHandler);
});

View File

@ -404,8 +404,7 @@ RTE.COMMON = {
var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
var params = {
'is_js_confirmed': 1,
'ajax_request': true,
'token': PMA_commonParams.get('token')
'ajax_request': true
};
$.post(url, params, function (data) {
if (data.success === true) {
@ -483,8 +482,7 @@ RTE.COMMON = {
var $curr_row = $anchor.parents('tr');
var params = {
'is_js_confirmed': 1,
'ajax_request': true,
'token': PMA_commonParams.get('token')
'ajax_request': true
};
$.post($anchor.attr('href'), params, function (data) {
returnCount++;
@ -833,8 +831,7 @@ RTE.ROUTINE = {
*/
var $msg = PMA_ajaxShowMessage();
var params = {
'ajax_request': true,
'token': PMA_commonParams.get('token')
'ajax_request': true
};
$.post($this.attr('href'), params, function (data) {
if (data.success === true) {

View File

@ -65,7 +65,6 @@ AJAX.registerOnload('server_databases.js', function () {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false);
var params = getJSConfirmCommonParam(this);
params.token = PMA_commonParams.get('token');
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {

View File

@ -105,7 +105,6 @@ AJAX.registerOnload('server_privileges.js', function () {
var href = $("form[name='usersForm']").attr('action');
var params = {
'ajax_request' : true,
'token' : PMA_commonParams.get('token'),
'server' : PMA_commonParams.get('server'),
'validate_username' : true,
'username' : username
@ -218,14 +217,12 @@ AJAX.registerOnload('server_privileges.js', function () {
$(document).on('click', "a.edit_user_group_anchor.ajax", function (event) {
event.preventDefault();
$(this).parents('tr').addClass('current_row');
var token = $(this).parents('form').find('input[name="token"]').val();
var $msg = PMA_ajaxShowMessage();
$.get(
$(this).attr('href'),
{
'ajax_request': true,
'edit_user_group_dialog': true,
'token': token
'edit_user_group_dialog': true
},
function (data) {
if (typeof data !== 'undefined' && data.success === true) {

View File

@ -1350,8 +1350,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
chart_data: 1,
type: 'chartgrid',
requiredData: JSON.stringify(runtime.dataList),
server: PMA_commonParams.get('server'),
token: PMA_commonParams.get('token')
server: PMA_commonParams.get('server')
}, function (data) {
var chartData;
if (typeof data !== 'undefined' && data.success === true) {
@ -1984,8 +1983,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
query_analyzer: true,
query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),
database: db,
server: PMA_commonParams.get('server'),
token: PMA_commonParams.get('token')
server: PMA_commonParams.get('server')
}, function (data) {
var i, l;
if (typeof data !== 'undefined' && data.success === true) {

View File

@ -86,8 +86,7 @@ AJAX.registerOnload('server_variables.js', function () {
ajax_request: true,
type: 'setval',
varName: varName,
varValue: $valueCell.find('input').val(),
token: PMA_commonParams.get('token')
varValue: $valueCell.find('input').val()
}, function (data) {
if (data.success) {
$valueCell

View File

@ -173,8 +173,7 @@ AJAX.registerOnload('sql.js', function () {
} else {
var params = {
'ajax_request': true,
'is_js_confirmed': true,
'token': PMA_commonParams.get('token')
'is_js_confirmed': true
};
$.post(url, params, function (data) {
if (data.success) {
@ -585,7 +584,6 @@ AJAX.registerOnload('sql.js', function () {
type: 'POST',
url: $form.attr('action'),
data: {
token: PMA_commonParams.get('token'),
server: PMA_commonParams.get('server'),
db: db_name,
ajax_request: '1',

View File

@ -404,14 +404,12 @@ AJAX.registerOnload('tbl_change.js', function () {
var type = $span.parents('tr').find('span.column_type').text();
// Names of input field and null checkbox
var input_name = $span.parent('td').children("input[type='text']").attr('name');
//Token
var token = $("input[name='token']").val();
openGISEditor();
if (!gisEditorLoaded) {
loadJSAndGISEditor(value, field, type, input_name, token);
loadJSAndGISEditor(value, field, type, input_name);
} else {
loadGISEditor(value, field, type, input_name, token);
loadGISEditor(value, field, type, input_name);
}
});

View File

@ -137,8 +137,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
//variables which stores the common attributes
var params = {
ajax_request: 1,
server: PMA_commonParams.get('server'),
token: PMA_commonParams.get('token')
server: PMA_commonParams.get('server')
};
$.post($(this).attr('href'), params, function (data) {
function scrollToTop() {
@ -217,7 +216,6 @@ AJAX.registerOnload('tbl_operations.js', function () {
var $msgbox = 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) {
@ -254,8 +252,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
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) {
@ -290,7 +287,6 @@ AJAX.registerOnload('tbl_operations.js', function () {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
var params = getJSConfirmCommonParam(this);
params.token = PMA_commonParams.get('token');
$.post(url, params, function (data) {
if ($(".sqlqueryresults").length !== 0) {

View File

@ -70,7 +70,6 @@ function getDropdownValues($dropdown) {
var $msgbox = PMA_ajaxShowMessage();
var $form = $dropdown.parents('form');
var url = 'tbl_relation.php?getDropdownValues=true&ajax_request=true' +
'&token=' + $form.find('input[name="token"]').val() +
'&db=' + $form.find('input[name="db"]').val() +
'&table=' + $form.find('input[name="table"]').val() +
'&foreign=' + (foreign !== '') +
@ -221,8 +220,7 @@ AJAX.registerOnload('tbl_relation.js', function () {
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingForeignKey, false);
var params = {
'is_js_confirmed': 1,
'ajax_request': true,
'token': PMA_commonParams.get('token')
'ajax_request': true
};
$.post(url, params, function (data) {
if (data.success === true) {

View File

@ -156,7 +156,6 @@ AJAX.registerOnload('tbl_select.js', function () {
} else {
values.displayAllColumns = true;
}
values.token = PMA_commonParams.get('token');
$.post($search_form.attr('action'), values, function (data) {
PMA_ajaxRemoveMessage($msgbox);
@ -269,13 +268,12 @@ AJAX.registerOnload('tbl_select.js', function () {
// Names of input field and null checkbox
var input_name = $span.parent('td').children("input[type='text']").attr('name');
//Token
var token = $("input[name='token']").val();
openGISEditor();
if (!gisEditorLoaded) {
loadJSAndGISEditor(value, field, type, input_name, token);
loadJSAndGISEditor(value, field, type, input_name);
} else {
loadGISEditor(value, field, type, input_name, token);
loadGISEditor(value, field, type, input_name);
}
});
@ -309,7 +307,6 @@ AJAX.registerOnload('tbl_select.js', function () {
type: 'POST',
data: {
server: PMA_commonParams.get('server'),
token: PMA_commonParams.get('token'),
ajax_request: 1,
db: $('input[name="db"]').val(),
table: $('input[name="table"]').val(),

View File

@ -216,8 +216,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
var params = {
'is_js_confirmed' : 1,
'ajax_request' : true,
'ajax_page_request' : true,
'token': PMA_commonParams.get('token')
'ajax_page_request' : true
};
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
@ -302,8 +301,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
AJAX.source = $this;
var params = {
'ajax_request' : true,
'ajax_page_request' : true,
'token': PMA_commonParams.get('token')
'ajax_page_request' : true
};
$.post(url, params, AJAX.responseHandler);
}); // end $.PMA_confirm()
@ -462,8 +460,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
function submitPartitionAction(url) {
var params = {
'ajax_request' : true,
'ajax_page_request' : true,
'token': PMA_commonParams.get('token')
'ajax_page_request' : true
};
PMA_ajaxShowMessage();
AJAX.source = $link;
@ -495,8 +492,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
$link.PMA_confirm(question, $link.attr('href'), function (url) {
var params = {
'ajax_request' : true,
'ajax_page_request' : true,
'token': PMA_commonParams.get('token')
'ajax_page_request' : true
};
PMA_ajaxShowMessage();
AJAX.source = $link;

View File

@ -82,8 +82,7 @@ AJAX.registerOnload('tbl_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);
});
@ -101,10 +100,9 @@ AJAX.registerOnload('tbl_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);
});
});
});
});

View File

@ -158,8 +158,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'db' : PMA_commonParams.get('db'),
'table' : PMA_commonParams.get('table'),
'field' : $('#tableid_0').val(),
'it' : 0,
'token' : PMA_commonParams.get('token')
'it' : 0
}, function (data) {
$('#tableFieldsId').find('tr:eq(1) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(1) td:eq(1)').html(data.field_collation);
@ -183,8 +182,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'db' : PMA_commonParams.get('db'),
'table' : PMA_commonParams.get('table'),
'field' : $('#tableid_1').val(),
'it' : 1,
'token' : PMA_commonParams.get('token')
'it' : 1
}, function (data) {
$('#tableFieldsId').find('tr:eq(3) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(3) td:eq(1)').html(data.field_collation);
@ -207,8 +205,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'db' : PMA_commonParams.get('db'),
'table' : PMA_commonParams.get('table'),
'field' : $('#tableid_2').val(),
'it' : 2,
'token' : PMA_commonParams.get('token')
'it' : 2
}, function (data) {
$('#tableFieldsId').find('tr:eq(6) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(6) td:eq(1)').html(data.field_collation);
@ -229,8 +226,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'db' : PMA_commonParams.get('db'),
'table' : PMA_commonParams.get('table'),
'field' : $('#tableid_3').val(),
'it' : 3,
'token' : PMA_commonParams.get('token')
'it' : 3
}, function (data) {
$('#tableFieldsId').find('tr:eq(8) td:eq(0)').html(data.field_type);
$('#tableFieldsId').find('tr:eq(8) td:eq(1)').html(data.field_collation);
@ -397,7 +393,6 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
//Post SQL query to sql.php
$.post('sql.php', {
'token' : PMA_commonParams.get('token'),
'server' : PMA_commonParams.get('server'),
'db' : PMA_commonParams.get('db'),
'ajax_request' : true,
@ -598,8 +593,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
'server' : PMA_commonParams.get('server'),
'db' : PMA_commonParams.get('db'),
'table' : PMA_commonParams.get('table'),
'where_clause' : data[3],
'token' : PMA_commonParams.get('token')
'where_clause' : data[3]
};
$.post('tbl_zoom_select.php', post_params, function (data) {