gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2018-03-01 16:02:57 +01:00
commit f4026f60a4
23 changed files with 161 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -47,6 +47,8 @@ phpMyAdmin - ChangeLog
- issue #14042 Rename PMD to Designer
4.7.9 (not yet released)
- issue #13940 Honor arg_separator in AJAX requests
- issue #13931 Fixed browsing tables with more results
4.7.8 (2018-02-20)
- issue #13914 Fixed resetting default setting values.

9
js/ajax.js
View File

@ -282,12 +282,13 @@ var AJAX = {
$('html, body').animate({ scrollTop: 0 }, 'fast');
var url = isLink ? href : $(this).attr('action');
var params = 'ajax_request=true&ajax_page_request=true';
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=true' + argsep + 'ajax_page_request=true';
var dataPost = AJAX.source.getPostData();
if (! isLink) {
params += '&' + $(this).serialize();
params += argsep + $(this).serialize();
} else if (dataPost) {
params += '&' + dataPost;
params += argsep + dataPost;
isLink = false;
}
if (! (history && history.pushState)) {
@ -757,7 +758,7 @@ $(function () {
var state = event.originalEvent.state;
if (state && state.menu) {
AJAX.$msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&ajax_page_request=true';
var params = 'ajax_request=true' + PMA_commonParams.get('arg_separator') + 'ajax_page_request=true';
var url = state.url || location.href;
$.get(url, params, AJAX.responseHandler);
// TODO: Check if sometimes menu is not retrieved from server,

5
js/common.js
View File

@ -86,11 +86,12 @@ var PMA_commonParams = (function () {
getUrlQuery: function () {
var common = this.get('common_query');
var separator = '?';
var argsep = PMA_commonParams.get('arg_separator');
if (common.length > 0) {
separator = '&';
separator = argsep;
}
return PMA_sprintf(
'%s%sserver=%s&db=%s&table=%s',
'%s%sserver=%s' + argsep + 'db=%s' + argsep + 'table=%s',
this.get('common_query'),
separator,
encodeURIComponent(this.get('server')),

8
js/db_central_columns.js
View File

@ -64,7 +64,8 @@ AJAX.registerOnload('db_central_columns.js', function () {
PMA_ajaxShowMessage(PMA_messages.strRadioUnchecked);
return false;
}
var editColumnData = editColumnList + '&edit_central_columns_page=true&ajax_request=true&ajax_page_request=true&db=' + PMA_commonParams.get('db');
var argsep = PMA_commonParams.get('arg_separator');
var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + PMA_commonParams.get('db');
PMA_ajaxShowMessage();
AJAX.source = $(this);
$.get('db_central_columns.php', editColumnData, AJAX.responseHandler);
@ -72,7 +73,8 @@ 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&db=' + encodeURIComponent(PMA_commonParams.get('db'));
var argsep = PMA_commonParams.get('arg_separator');
var multi_column_edit_data = $('#multi_edit_central_columns').serialize() + argsep + 'multi_edit_central_column_save=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(PMA_commonParams.get('db'));
PMA_ajaxShowMessage();
AJAX.source = $(this);
$.post('db_central_columns.php', multi_column_edit_data, AJAX.responseHandler);
@ -152,7 +154,7 @@ AJAX.registerOnload('db_central_columns.js', function () {
$.ajax({
type: 'POST',
url: 'db_central_columns.php',
data: datastring + '&ajax_request=true',
data: datastring + PMA_commonParams.get('arg_separator') + 'ajax_request=true',
dataType: 'json',
success: function (data) {
if (data.message !== '1') {

4
js/db_operations.js
View File

@ -52,7 +52,7 @@ AJAX.registerOnload('db_operations.js', function () {
$form.PMA_confirm(question, $form.attr('action'), function (url) {
PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false);
$.post(url, $('#rename_db_form').serialize() + '&is_js_confirmed=1', function (data) {
$.post(url, $('#rename_db_form').serialize() + PMA_commonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
PMA_commonParams.set('db', data.newname);
@ -120,7 +120,7 @@ AJAX.registerOnload('db_operations.js', function () {
var $form = $(this);
PMA_prepareForAjaxRequest($form);
PMA_ajaxShowMessage(PMA_messages.strChangingCharset);
$.post($form.attr('action'), $form.serialize() + '&submitcollation=1', function (data) {
$.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + 'submitcollation=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
} else {

2
js/db_search.js
View File

@ -210,7 +210,7 @@ AJAX.registerOnload('db_search.js', function () {
PMA_prepareForAjaxRequest($form);
var url = $form.serialize() + '&submit_search=' + $('#buttonGo').val();
var url = $form.serialize() + PMA_commonParams.get('arg_separator') + 'submit_search=' + $('#buttonGo').val();
$.post($form.attr('action'), url, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
// found results

6
js/db_tracking.js
View File

@ -43,7 +43,8 @@ AJAX.registerOnload('db_tracking.js', function () {
e.preventDefault();
var $button = $(this);
var $form = $button.parent('form');
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val();
if ($button.val() === 'delete_tracking') {
var question = PMA_messages.strDeleteTrackingDataMultiple;
@ -66,7 +67,8 @@ AJAX.registerOnload('db_tracking.js', function () {
e.preventDefault();
var $button = $(this);
var $form = $button.parent('form');
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val();
PMA_ajaxShowMessage();
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);

53
js/designer/move.js
View File

@ -660,11 +660,12 @@ function Save (url) {
function Get_url_pos (forceString) {
if (designer_tables_enabled || forceString) {
var poststr = '';
var argsep = PMA_commonParams.get('arg_separator');
for (var key in j_tabs) {
poststr += '&t_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10);
poststr += '&t_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10);
poststr += '&t_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1);
poststr += '&t_h[' + key + ']=' + (document.getElementById('check_vis_' + key).checked ? 1 : 0);
poststr += argsep + 't_x[' + key + ']=' + parseInt(document.getElementById(key).style.left, 10);
poststr += argsep + 't_y[' + key + ']=' + parseInt(document.getElementById(key).style.top, 10);
poststr += argsep + 't_v[' + key + ']=' + (document.getElementById('id_tbody_' + key).style.display === 'none' ? 0 : 1);
poststr += argsep + 't_h[' + key + ']=' + (document.getElementById('check_vis_' + key).checked ? 1 : 0);
}
return poststr;
} else {
@ -683,8 +684,9 @@ function Get_url_pos (forceString) {
function Save2 (callback) {
if (designer_tables_enabled) {
var poststr = '&operation=savePage&save_page=same&ajax_request=true';
poststr += '&server=' + server + '&db=' + db + '&selected_page=' + selected_page;
var argsep = PMA_commonParams.get('arg_separator');
var poststr = argsep + 'operation=savePage' + argsep + 'save_page=same' + argsep + 'ajax_request=true';
poststr += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'selected_page=' + selected_page;
poststr += Get_url_pos();
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
@ -811,7 +813,8 @@ function Edit_pages () {
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=edit&server=' + server + '&db=' + db;
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=true' + argsep + 'dialog=edit' + argsep + 'server=' + server + argsep + 'db=' + db;
$.get('db_designer.php', params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -890,7 +893,8 @@ function Delete_pages () {
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=delete&server=' + server + '&db=' + db;
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=true' + argsep + 'dialog=delete' + argsep + 'server=' + server + argsep + 'db=' + db;
$.get('db_designer.php', params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -988,7 +992,8 @@ function Save_as () {
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=save_as&server=' + server + '&token=' + '&db=' + db;
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=true' + argsep + 'dialog=save_as' + argsep + 'server=' + server + argsep + 'token=' + argsep + 'db=' + db;
$.get('db_designer.php', params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1063,7 +1068,8 @@ function Export_pages () {
$(this).dialog('close');
};
var $msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=true&dialog=export&server=' + server + '&db=' + db + '&selected_page=' + selected_page;
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=true' + argsep + 'dialog=export' + argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'selected_page=' + selected_page;
$.get('db_designer.php', params, function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);
@ -1074,7 +1080,7 @@ function Export_pages () {
if (!designer_tables_enabled) {
$form.append('<input type="hidden" name="offline_export" value="true" />');
}
$.each(Get_url_pos(true).substring(1).split('&'), function () {
$.each(Get_url_pos(true).substring(1).split(argsep), function () {
var pair = this.split('=');
var input = $('<input type="hidden" />');
input.attr('name', pair[0]);
@ -1107,10 +1113,11 @@ function Export_pages () {
function Load_page (page) {
if (designer_tables_enabled) {
var param_page = '';
var argsep = PMA_commonParams.get('arg_separator');
if (page !== null) {
param_page = '&page=' + page;
param_page = argsep + 'page=' + page;
}
$('<a href="db_designer.php?server=' + server + '&db=' + db + param_page + '"></a>')
$('<a href="db_designer.php?server=' + server + argsep + 'db=' + db + param_page + '"></a>')
.appendTo($('#page_content'))
.click();
} else {
@ -1188,6 +1195,7 @@ function Start_relation () {
// table field
function Click_field (db, T, f, PK) {
PK = parseInt(PK);
var argsep = PMA_commonParams.get('arg_separator');
if (ON_relation) {
if (!click_field) {
// .style.display=='none' .style.display = 'none'
@ -1199,7 +1207,7 @@ function Click_field (db, T, f, PK) {
document.getElementById('foreign_relation').style.display = 'none';
}
click_field = 1;
link_relation = 'DB1=' + db + '&T1=' + T + '&F1=' + f;
link_relation = 'DB1=' + db + argsep + 'T1=' + T + argsep + 'F1=' + f;
document.getElementById('designer_hint').innerHTML = PMA_messages.strSelectForeignKey;
} else {
Start_relation(); // hidden hint...
@ -1211,7 +1219,7 @@ function Click_field (db, T, f, PK) {
var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight;
document.getElementById('layer_new_relation').style.top = top + 'px';
document.getElementById('layer_new_relation').style.display = 'block';
link_relation += '&DB2=' + db + '&T2=' + T + '&F2=' + f;
link_relation += argsep + 'DB2=' + db + argsep + 'T2=' + T + argsep + 'F2=' + f;
}
}
@ -1249,9 +1257,10 @@ function Click_field (db, T, f, PK) {
function New_relation () {
document.getElementById('layer_new_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&db2=p';
link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += '&operation=addNewRelation&ajax_request=true';
var argsep = PMA_commonParams.get('arg_separator');
link_relation += argsep + 'server=' + server + argsep + 'db=' + db + argsep + 'db2=p';
link_relation += argsep + 'on_delete=' + document.getElementById('on_delete').value + argsep + 'on_update=' + document.getElementById('on_update').value;
link_relation += argsep + 'operation=addNewRelation' + argsep + 'ajax_request=true';
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php', link_relation, function (data) {
@ -1475,14 +1484,16 @@ function Canvas_click (id, event) {
var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10;
document.getElementById('layer_upd_relation').style.top = top + 'px';
document.getElementById('layer_upd_relation').style.display = 'block';
link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key;
var argsep = PMA_commonParams.get('arg_separator');
link_relation = 'T1=' + Key0 + argsep + 'F1=' + Key1 + argsep + 'T2=' + Key2 + argsep + 'F2=' + Key3 + argsep + 'K=' + Key;
}
}
function Upd_relation () {
document.getElementById('layer_upd_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db;
link_relation += '&operation=removeRelation&ajax_request=true';
var argsep = PMA_commonParams.get('arg_separator');
link_relation += argsep + 'server=' + server + argsep + 'db=' + db;
link_relation += argsep + 'operation=removeRelation' + argsep + 'ajax_request=true';
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php', link_relation, function (data) {

44
js/functions.js
View File

@ -220,7 +220,7 @@ function PMA_handleRedirectAndReload (data) {
if (window.location.href.indexOf('?') === -1) {
window.location.href += '?session_expired=1';
} else {
window.location.href += '&session_expired=1';
window.location.href += PMA_commonParams.get('arg_separator') + 'session_expired=1';
}
window.location.reload();
} else if (parseInt(data.reload_flag) === 1) {
@ -673,8 +673,13 @@ function confirmLink (theLink, theSqlQuery) {
var is_confirmed = confirm(PMA_sprintf(PMA_messages.strDoYouReally, theSqlQuery));
if (is_confirmed) {
if (typeof(theLink.href) !== 'undefined') {
<<<<<<< HEAD
theLink.href += '&is_js_confirmed=1';
} else if (typeof(theLink.form) !== 'undefined') {
=======
theLink.href += PMA_commonParams.get('arg_separator') + 'is_js_confirmed=1';
} else if (typeof(theLink.form) != 'undefined') {
>>>>>>> QA_4_7
theLink.form.action += '?is_js_confirmed=1';
}
}
@ -1794,16 +1799,17 @@ function loadForeignKeyCheckbox () {
function getJSConfirmCommonParam (elem, params) {
var $elem = $(elem);
var sep = PMA_commonParams.get('arg_separator');
if (params) {
// Strip possible leading ?
if (params.startsWith('?')) {
params = params.substr(1);
}
params += '&';
params += sep;
} else {
params = '';
}
params += 'is_js_confirmed=1&ajax_request=true&fk_checks' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0);
params += 'is_js_confirmed=1' + sep + 'ajax_request=true' + sep 'fk_checks' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0);
return params;
}
@ -2349,10 +2355,11 @@ function PMA_ajaxRemoveMessage ($this_msgbox) {
*/
function PMA_previewSQL ($form) {
var form_url = $form.attr('action');
var sep = PMA_commonParams.get('arg_separator');
var form_data = $form.serialize() +
'&do_save_data=1' +
'&preview_sql=1' +
'&ajax_request=1';
sep + 'do_save_data=1' +
sep + 'preview_sql=1' +
sep + 'ajax_request=1';
var $msgbox = PMA_ajaxShowMessage();
$.ajax({
type: 'POST',
@ -2404,7 +2411,7 @@ function PMA_checkReservedWordColumns ($form) {
$.ajax({
type: 'POST',
url: 'tbl_structure.php',
data: $form.serialize() + '&reserved_word_check=1',
data: $form.serialize() + PMA_commonParams.get('arg_separator') + 'reserved_word_check=1',
success: function (data) {
if (typeof data.success !== 'undefined' && data.success === true) {
is_confirmed = confirm(data.message);
@ -2838,7 +2845,7 @@ AJAX.registerOnload('functions.js', function () {
if (PMA_checkReservedWordColumns($form)) {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
// User wants to submit the form
$.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
$.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + 'do_save_data=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
$('#properties_message')
.removeClass('error')
@ -2897,13 +2904,14 @@ AJAX.registerOnload('functions.js', function () {
// Refresh navigation as a new table has been added
PMA_reloadNavigation();
// Redirect to table structure page on creation of new table
var params_12 = 'ajax_request=true&ajax_page_request=true';
var argsep = PMA_commonParams.get('arg_separator');
var params_12 = 'ajax_request=true' + argsep + 'ajax_page_request=true';
if (! (history && history.pushState)) {
params_12 += PMA_MicroHistory.menus.getRequestParam();
}
tblStruct_url = 'tbl_structure.php?server=' + data._params.server +
'&db=' + data._params.db + '&token=' + data._params.token +
'&goto=db_structure.php&table=' + data._params.table + '';
argsep + 'db=' + data._params.db + argsep + 'token=' + data._params.token +
argsep + 'goto=db_structure.php' + argsep + 'table=' + data._params.table + '';
$.get(tblStruct_url, params_12, AJAX.responseHandler);
} else {
PMA_ajaxShowMessage(
@ -3137,7 +3145,7 @@ AJAX.registerOnload('functions.js', function () {
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$the_form.append('<input type="hidden" name="ajax_request" value="true" />');
$.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) {
$.post($the_form.attr('action'), $the_form.serialize() + PMA_commonParams.get('arg_separator') + 'change_pw=' + this_value, function (data) {
if (typeof data === 'undefined' || data.success !== true) {
PMA_ajaxShowMessage(data.error, false);
return;
@ -3735,9 +3743,15 @@ function indexEditorDialog (url, title, callback_success, callback_failure) {
var $form = $('#index_frm');
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
PMA_prepareForAjaxRequest($form);
<<<<<<< HEAD
// User wants to submit the form
$.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
var $sqlqueryresults = $('.sqlqueryresults');
=======
//User wants to submit the form
$.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + "do_save_data=1", function (data) {
var $sqlqueryresults = $(".sqlqueryresults");
>>>>>>> QA_4_7
if ($sqlqueryresults.length !== 0) {
$sqlqueryresults.remove();
}
@ -4538,7 +4552,13 @@ AJAX.registerOnload('functions.js', function () {
function PMA_createViewDialog ($this) {
var $msg = PMA_ajaxShowMessage();
<<<<<<< HEAD
$.get($this.attr('href') + '&ajax_request=1&ajax_dialog=1', function (data) {
=======
var syntaxHighlighter = null;
var sep = PMA_commonParams.get('arg_separator');
$.get($this.attr('href') + sep + 'ajax_request=1' + sep 'ajax_dialog=1', function (data) {
>>>>>>> QA_4_7
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var buttonOptions = {};

9
js/gis_data_editor.js
View File

@ -195,7 +195,8 @@ function insertDataAndClose () {
var $form = $('form#gis_data_editor_form');
var input_name = $form.find('input[name=\'input_name\']').val();
$.post('gis_data_editor.php', $form.serialize() + '&generate=true&ajax_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post('gis_data_editor.php', $form.serialize() + argsep + 'generate=true' + argsep + 'ajax_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
$('input[name=\'' + input_name + '\']').val(data.result);
} else {
@ -242,7 +243,8 @@ AJAX.registerOnload('gis_data_editor.js', function () {
*/
$(document).on('change', '#gis_editor input[type=\'text\']', function () {
var $form = $('form#gis_data_editor_form');
$.post('gis_data_editor.php', $form.serialize() + '&generate=true&ajax_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post('gis_data_editor.php', $form.serialize() + argsep + 'generate=true' + argsep + 'ajax_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
$('#gis_data_textarea').val(data.result);
$('#placeholder').empty().removeClass('hasSVG').html(data.visualization);
@ -263,7 +265,8 @@ AJAX.registerOnload('gis_data_editor.js', function () {
var $gis_editor = $('#gis_editor');
var $form = $('form#gis_data_editor_form');
$.post('gis_data_editor.php', $form.serialize() + '&get_gis_editor=true&ajax_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post('gis_data_editor.php', $form.serialize() + argsep + 'get_gis_editor=true' + argsep + 'ajax_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
$gis_editor.html(data.gis_editor);
initGISEditorVisualization();

5
js/indexes.js
View File

@ -557,7 +557,8 @@ AJAX.registerOnload('indexes.js', function () {
$(document).on('click', '#save_index_frm', function (event) {
event.preventDefault();
var $form = $('#index_frm');
var submitData = $form.serialize() + '&do_save_data=1&ajax_request=true&ajax_page_request=true';
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'do_save_data=1' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);
@ -668,7 +669,7 @@ AJAX.registerOnload('indexes.js', function () {
}
title = PMA_messages.strEditIndex;
}
url += '&ajax_request=true';
url += PMA_commonParams.get('arg_separator') + 'ajax_request=true';
indexEditorDialog(url, title, function () {
// refresh the page using ajax
PMA_commonActions.refreshMain(false, function () {

2
js/microhistory.js
View File

@ -202,7 +202,7 @@ PMA_MicroHistory = {
}
var menuHashesParam = menuHashes.join('-');
if (menuHashesParam) {
param = '&menuHashes=' + menuHashesParam;
param = PMA_commonParams.get('arg_separator') + 'menuHashes=' + menuHashesParam;
}
return param;
},

4
js/multi_column_sort.js
View File

@ -28,7 +28,7 @@ function captureURL (url) {
function removeColumnFromMultiSort (target, parent) {
var URL = captureURL(target);
var begin = target.indexOf('ORDER+BY') + 8;
var end = target.indexOf('&session_max_rows');
var end = target.indexOf(PMA_commonParams.get('arg_separator') + 'session_max_rows');
// get the names of the columns involved
var between_part = target.substr(begin, end - begin);
var columns = between_part.split('%2C+');
@ -47,7 +47,7 @@ function removeColumnFromMultiSort (target, parent) {
URL.head = head;
// removing the last sort order should have priority over what
// is remembered via the RememberSorting directive
URL.tail += '&discard_remembered_sort=1';
URL.tail += PMA_commonParams.get('arg_separator') + 'discard_remembered_sort=1';
}
var middle_part = columns.join('%2C+');
url = URL.head + middle_part + URL.tail;

22
js/navigation.js
View File

@ -188,7 +188,7 @@ function loadChildNodes (isNode, $expandElem, callback) {
if (window.location.href.indexOf('?') === -1) {
window.location.href += '?session_expired=1';
} else {
window.location.href += '&session_expired=1';
window.location.href += PMA_commonParams.get('arg_separator') + 'session_expired=1';
}
window.location.reload();
} else {
@ -495,7 +495,7 @@ $(function () {
event.preventDefault();
var url = $(this).attr('href').substr(
$(this).attr('href').indexOf('?') + 1
) + '&ajax_request=true';
) + PMA_commonParams.get('arg_separator') + 'ajax_request=true';
var title = PMA_messages.strAddIndex;
indexEditorDialog(url, title);
});
@ -505,7 +505,7 @@ $(function () {
event.preventDefault();
var url = $(this).attr('href').substr(
$(this).attr('href').indexOf('?') + 1
) + '&ajax_request=true';
) + PMA_commonParams.get('arg_separator') + 'ajax_request=true';
var title = PMA_messages.strEditIndex;
indexEditorDialog(url, title);
});
@ -524,7 +524,7 @@ $(function () {
data: {
server: PMA_commonParams.get('server'),
},
url: $(this).attr('href') + '&ajax_request=true',
url: $(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=true',
success: function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_reloadNavigation();
@ -539,7 +539,7 @@ $(function () {
$(document).on('click', 'a.showUnhide.ajax', function (event) {
event.preventDefault();
var $msg = PMA_ajaxShowMessage();
$.get($(this).attr('href') + '&ajax_request=1', function (data) {
$.get($(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var buttonOptions = {};
@ -575,7 +575,7 @@ $(function () {
data: {
server: PMA_commonParams.get('server'),
},
url: $(this).attr('href') + '&ajax_request=true',
url: $(this).attr('href') + PMA_commonParams.get('arg_separator') + 'ajax_request=true',
success: function (data) {
PMA_ajaxRemoveMessage($msg);
if (typeof data !== 'undefined' && data.success === true) {
@ -1037,18 +1037,18 @@ function PMA_navigationTreePagination ($this) {
params = 'ajax_request=true';
} else { // tagName === 'SELECT'
url = 'navigation.php';
params = $this.closest('form').serialize() + '&ajax_request=true';
params = $this.closest('form').serialize() + PMA_commonParams.get('arg_separator') + 'ajax_request=true';
}
var searchClause = PMA_fastFilter.getSearchClause();
if (searchClause) {
params += '&searchClause=' + encodeURIComponent(searchClause);
params += PMA_commonParams.get('arg_separator') + 'searchClause=' + encodeURIComponent(searchClause);
}
if (isDbSelector) {
params += '&full=true';
params += PMA_commonParams.get('arg_separator') + 'full=true';
} else {
var searchClause2 = PMA_fastFilter.getSearchClause2($this);
if (searchClause2) {
params += '&searchClause2=' + encodeURIComponent(searchClause2);
params += PMA_commonParams.get('arg_separator') + 'searchClause2=' + encodeURIComponent(searchClause2);
}
}
$.post(url, params, function (data) {
@ -1554,7 +1554,7 @@ PMA_fastFilter.filter.prototype.request = function () {
if (self.$this.find('> ul > li > form.fast_filter:first input[name=searchClause]').length === 0) {
var $input = $('#pma_navigation_tree').find('li.fast_filter.db_fast_filter input.searchClause');
if ($input.length && $input.val() !== $input[0].defaultValue) {
params += '&searchClause=' + encodeURIComponent($input.val());
params += PMA_commonParams.get('arg_separator') + 'searchClause=' + encodeURIComponent($input.val());
}
}
self.xhr = $.ajax({

6
js/normalization.js
View File

@ -524,8 +524,9 @@ AJAX.registerOnload('normalization.js', function () {
$('#newCols #field_0_1').focus();
return false;
}
var argsep = PMA_commonParams.get('arg_separator');
datastring = $('#newCols :input').serialize();
datastring += '&ajax_request=1&do_save_data=1&field_where=last';
datastring += argsep + 'ajax_request=1' + argsep + 'do_save_data=1' + argsep + 'field_where=last';
$.post('tbl_addfield.php', datastring, function (data) {
if (data.success) {
$.post(
@ -590,7 +591,8 @@ AJAX.registerOnload('normalization.js', function () {
});
$('.tblFooters').on('click', '#saveNewPrimary', function () {
var datastring = $('#newCols :input').serialize();
datastring += '&field_key[0]=primary_0&ajax_request=1&do_save_data=1&field_where=last';
var argsep = PMA_commonParams.get('arg_separator');
datastring += argsep + 'field_key[0]=primary_0' + argsep + 'ajax_request=1' + argsep + 'do_save_data=1' + argsep + 'field_where=last';
$.post('tbl_addfield.php', datastring, function (data) {
if (data.success === true) {
$('#mainContent h4').html(PMA_messages.strPrimaryKeyAdded);

5
js/server_databases.js
View File

@ -56,10 +56,11 @@ AJAX.registerOnload('server_databases.js', function () {
var question = PMA_messages.strDropDatabaseStrongWarning + ' ' +
PMA_sprintf(PMA_messages.strDoYouReally, selected_dbs.join('<br />'));
var argsep = PMA_commonParams.get('arg_separator');
$(this).PMA_confirm(
question,
$form.prop('action') + '?' + $(this).serialize() +
'&drop_selected_dbs=1&is_js_confirmed=1&ajax_request=true',
argsep + 'drop_selected_dbs=1' + argsep + 'is_js_confirmed=1' + argsep + 'ajax_request=true',
function (url) {
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest, false);
@ -122,7 +123,7 @@ AJAX.registerOnload('server_databases.js', function () {
// make ajax request to load db structure page - taken from ajax.js
var dbStruct_url = data.url_query;
dbStruct_url = dbStruct_url.replace(/amp;/ig, '');
var params = 'ajax_request=true&ajax_page_request=true';
var params = 'ajax_request=true' + PMA_commonParams.get('arg_separator') + 'ajax_page_request=true';
if (! (history && history.pushState)) {
params += PMA_MicroHistory.menus.getRequestParam();
}

9
js/server_privileges.js
View File

@ -174,7 +174,8 @@ AJAX.registerOnload('server_privileges.js', function () {
PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
$.post(url, $form.serialize() + '&delete=' + $thisButton.val() + '&ajax_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post(url, $form.serialize() + argsep + 'delete=' + $thisButton.val() + argsep + 'ajax_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxShowMessage(data.message);
// Refresh navigation, if we droppped some databases with the name
@ -229,9 +230,10 @@ AJAX.registerOnload('server_privileges.js', function () {
.find('select[name="userGroup"]')
.val();
var $message = PMA_ajaxShowMessage();
var argsep = PMA_commonParams.get('arg_separator');
$.post(
'server_privileges.php',
$('#changeUserGroupDialog').find('form').serialize() + '&ajax_request=1',
$('#changeUserGroupDialog').find('form').serialize() + argsep + 'ajax_request=1',
function (data) {
PMA_ajaxRemoveMessage($message);
if (typeof data !== 'undefined' && data.success === true) {
@ -296,9 +298,10 @@ AJAX.registerOnload('server_privileges.js', function () {
button_options[PMA_messages.strClose] = function () {
$(this).dialog('close');
};
var argsep = PMA_commonParams.get('arg_separator');
$.post(
$(this.form).prop('action'),
$(this.form).serialize() + '&submit_mult=export&ajax_request=true',
$(this.form).serialize() + argsep + 'submit_mult=export' + argsep + 'ajax_request=true',
function (data) {
if (typeof data !== 'undefined' && data.success === true) {
var $ajaxDialog = $('<div />')

20
js/sql.js
View File

@ -187,10 +187,11 @@ AJAX.registerOnload('sql.js', function () {
var $link = $(this);
$link.PMA_confirm(question, $link.attr('href'), function (url) {
$msgbox = PMA_ajaxShowMessage();
var params = 'ajax_request=1&is_js_confirmed=1';
var argsep = PMA_commonParams.get('arg_separator');
var params = 'ajax_request=1' + argsep + 'is_js_confirmed=1';
var postData = $link.getPostData();
if (postData) {
params += '&' + postData;
params += argsep + postData;
}
$.post(url, params, function (data) {
if (data.success) {
@ -207,7 +208,8 @@ AJAX.registerOnload('sql.js', function () {
$(document).on('submit', '.bookmarkQueryForm', function (e) {
e.preventDefault();
PMA_ajaxShowMessage();
$.post($(this).attr('action'), 'ajax_request=1&' + $(this).serialize(), function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post($(this).attr('action'), 'ajax_request=1' + argsep + $(this).serialize(), function (data) {
if (data.success) {
PMA_ajaxShowMessage(data.message);
} else {
@ -474,7 +476,8 @@ AJAX.registerOnload('sql.js', function () {
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + '&ajax_page_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post($form.attr('action'), $form.serialize() + argsep + 'ajax_page_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
// success happens if the query returns rows or not
@ -586,7 +589,8 @@ AJAX.registerOnload('sql.js', function () {
$form = $(this);
var $msgbox = PMA_ajaxShowMessage();
$.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post($form.attr('action'), $form.serialize() + argsep + 'ajax_request=true', function (data) {
PMA_ajaxRemoveMessage($msgbox);
var $sqlqueryresults = $form.parents('.sqlqueryresults');
$sqlqueryresults
@ -637,7 +641,8 @@ AJAX.registerOnload('sql.js', function () {
}
function submitShowAllForm () {
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true';
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
PMA_ajaxShowMessage();
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);
@ -736,7 +741,8 @@ AJAX.registerOnload('sql.js', function () {
e.preventDefault();
var $button = $(this);
var $form = $button.closest('form');
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val();
PMA_ajaxShowMessage();
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);

13
js/tbl_operations.js
View File

@ -24,7 +24,8 @@ AJAX.registerOnload('tbl_operations.js', function () {
event.preventDefault();
var $form = $(this);
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + '&submit_copy=Go', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post($form.attr('action'), $form.serialize() + argsep + 'submit_copy=Go', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
if ($form.find('input[name=\'switch_to_new\']').prop('checked')) {
PMA_commonParams.set(
@ -56,7 +57,8 @@ AJAX.registerOnload('tbl_operations.js', function () {
event.preventDefault();
var $form = $(this);
PMA_prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize() + '&submit_move=1', function (data) {
var argsep = PMA_commonParams.get('arg_separator');
$.post($form.attr('action'), $form.serialize() + argsep + 'submit_move=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_commonParams.set('db', data._params.db);
PMA_commonParams.set('table', data._params.tbl);
@ -128,7 +130,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
$(document).on('click', '#tbl_maintenance li a.maintain_action.ajax', function (event) {
event.preventDefault();
var $link = $(this);
if ($('.sqlqueryresults').length !== 0) {
$('.sqlqueryresults').remove();
}
@ -142,7 +144,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
});
var postData = $link.getPostData();
if (postData) {
params += '&' + postData;
params += PMA_commonParams.get('arg_separator') + postData;
}
$.post($link.attr('href'), params, function (data) {
@ -192,7 +194,8 @@ AJAX.registerOnload('tbl_operations.js', function () {
var $form = $(this);
function submitPartitionMaintenance () {
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true';
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);

15
js/tbl_relation.js
View File

@ -71,17 +71,18 @@ function getDropdownValues ($dropdown) {
}
var $msgbox = PMA_ajaxShowMessage();
var $form = $dropdown.parents('form');
var url = 'tbl_relation.php?getDropdownValues=true&ajax_request=true' +
'&db=' + $form.find('input[name="db"]').val() +
'&table=' + $form.find('input[name="table"]').val() +
'&foreign=' + (foreign !== '') +
'&foreignDb=' + encodeURIComponent(foreignDb) +
var argsep = PMA_commonParams.get('arg_separator');
var url = 'tbl_relation.php?getDropdownValues=true' + argsep + 'ajax_request=true' +
argsep + 'db=' + $form.find('input[name="db"]').val() +
argsep + 'table=' + $form.find('input[name="table"]').val() +
argsep + 'foreign=' + (foreign !== '') +
argsep + 'foreignDb=' + encodeURIComponent(foreignDb) +
(foreignTable !== null ?
'&foreignTable=' + encodeURIComponent(foreignTable) : ''
argsep + 'foreignTable=' + encodeURIComponent(foreignTable) : ''
);
var $server = $form.find('input[name="server"]');
if ($server.length > 0) {
url += '&server=' + $form.find('input[name="server"]').val();
url += argsep + 'server=' + $form.find('input[name="server"]').val();
}
$.ajax({
url: url,

13
js/tbl_structure.js
View File

@ -22,7 +22,7 @@
* Reload fields table
*/
function reloadFieldForm () {
$.post($('#fieldsForm').attr('action'), $('#fieldsForm').serialize() + '&ajax_request=true', function (form_data) {
$.post($('#fieldsForm').attr('action'), $('#fieldsForm').serialize() + PMA_commonParams.get('arg_separator') + 'ajax_request=true', function (form_data) {
var $temp_div = $('<div id=\'temp_div\'><div>').append(form_data.message);
$('#fieldsForm').replaceWith($temp_div.find('#fieldsForm'));
$('#addColumns').replaceWith($temp_div.find('#addColumns'));
@ -75,7 +75,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
function submitForm () {
$msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
$.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + 'do_save_data=1', function (data) {
if ($('.sqlqueryresults').length !== 0) {
$('.sqlqueryresults').remove();
} else if ($('.error:not(.tab)').length !== 0) {
@ -184,7 +184,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
$this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false);
var params = getJSConfirmCommonParam(this, $this_anchor.getPostData());
params += '&ajax_page_request=1';
params += PMA_commonParams.get('arg_separator') + 'ajax_page_request=1';
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
@ -270,7 +270,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
AJAX.source = $this;
var params = getJSConfirmCommonParam(this, $this_anchor.getPostData());
params += '&ajax_page_request=1';
params += PMA_commonParams.get('arg_separator') + 'ajax_page_request=1';
$.post(url, params, AJAX.responseHandler);
}); // end $.PMA_confirm()
}); // end Add key
@ -305,7 +305,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
return;
}
$.post($form.prop('action'), serialized + '&ajax_request=true', function (data) {
$.post($form.prop('action'), serialized + PMA_commonParams.get('arg_separator') + 'ajax_request=true', function (data) {
if (data.success === false) {
PMA_ajaxRemoveMessage($msgbox);
$this
@ -406,7 +406,8 @@ AJAX.registerOnload('tbl_structure.js', function () {
e.preventDefault();
var $button = $(this);
var $form = $button.parents('form');
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val();
PMA_ajaxShowMessage();
AJAX.source = $form;
$.post($form.attr('action'), submitData, AJAX.responseHandler);

3
js/tbl_tracking.js
View File

@ -53,7 +53,8 @@ AJAX.registerOnload('tbl_tracking.js', function () {
e.preventDefault();
var $button = $(this);
var $form = $button.parent('form');
var submitData = $form.serialize() + '&ajax_request=true&ajax_page_request=true&submit_mult=' + $button.val();
var argsep = PMA_commonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + $button.val();
if ($button.val() === 'delete_version') {
var question = PMA_messages.strDeleteTrackingVersionMultiple;

1
libraries/classes/Header.php
View File

@ -256,6 +256,7 @@ class Header
'logged_in' => (isset($GLOBALS['dbi']) ? $GLOBALS['dbi']->isUserType('logged') : false),
'is_https' => $GLOBALS['PMA_Config']->isHttps(),
'rootPath' => $GLOBALS['PMA_Config']->getRootPath(),
'arg_separator' => URL::getArgSeparator(),
'PMA_VERSION' => PMA_VERSION
);
if (isset($GLOBALS['cfg']['Server'])