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

More fixes to new PMA_URL_getCommon style

Browse Source 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
This commit is contained in:
Ann + J.M 2014-10-18 17:01:00 +02:00
parent e0af0a6e1b
commit a540e6ba87
22 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_operations.php
View File

@ -264,7 +264,7 @@ if (!$is_information_schema) {
);
$message->addParam(
'<a href="' . $cfg['PmaAbsoluteUri']
. 'chk_rel.php?' . $url_query . '">',
. 'chk_rel.php' . $url_query . '">',
false
);
$message->addParam('</a>', false);

2
db_structure.php
View File

@ -177,7 +177,7 @@ foreach ($tables as $keyname => $current_table) {
if ($is_show_stats) {
if ($formatted_overhead != '') {
$overhead = '<a href="tbl_structure.php?'
$overhead = '<a href="tbl_structure.php'
. $tbl_url_query . '#showusage">'
. '<span>' . $formatted_overhead . '</span>'
. '<span class="unit">' . $overhead_unit . '</span>'

6
db_tracking.php
View File

@ -118,9 +118,9 @@ if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) {
$table_result = PMA_queryAsControlUser($table_query);
$version_data = $GLOBALS['dbi']->fetchArray($table_result);
$tmp_link = 'tbl_tracking.php?' . $url_query . '&amp;table='
$tmp_link = 'tbl_tracking.php' . $url_query . '&amp;table='
. htmlspecialchars($version_data['table_name']);
$delete_link = 'db_tracking.php?' . $url_query . '&amp;table='
$delete_link = 'db_tracking.php' . $url_query . '&amp;table='
. htmlspecialchars($version_data['table_name'])
. '&amp;delete_tracking=true&amp';
?>
@ -216,7 +216,7 @@ if (count($my_tables) > 0) {
foreach ($my_tables as $key => $tablename) {
if (PMA_Tracker::getVersion($GLOBALS['db'], $tablename) == -1) {
$my_link = '<a href="tbl_tracking.php?' . $url_query
$my_link = '<a href="tbl_tracking.php' . $url_query
. '&amp;table=' . htmlspecialchars($tablename) . '">';
$my_link .= PMA_Util::getIcon('eye.png', __('Track table'));
$my_link .= '</a>';

12
js/server_status_monitor.js
View File

@ -572,7 +572,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$('<form />', {
"class": "disableAjax",
method: "post",
action: "file_echo.php?" + PMA_commonParams.get('common_query') + "&filename=1",
action: "file_echo.php" + PMA_commonParams.get('common_query') + "&filename=1",
style: "display:none;"
})
.append(
@ -590,7 +590,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$('a[href="#importMonitorConfig"]').click(function (event) {
event.preventDefault();
$('#emptyDialog').dialog({title: PMA_messages.strImportDialogTitle});
$('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php?' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
$('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
'<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
var dlgBtns = {};
@ -697,7 +697,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
$.extend(vars, getvars);
}
$.get('server_status_monitor.php?' + PMA_commonParams.get('common_query'), vars,
$.get('server_status_monitor.php' + PMA_commonParams.get('common_query'), vars,
function (data) {
var logVars;
if (typeof data !== 'undefined' && data.success === true) {
@ -1353,7 +1353,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
/* Called in regular intervalls, this function updates the values of each chart in the grid */
function refreshChartGrid() {
/* Send to server */
runtime.refreshRequest = $.post('server_status_monitor.php?' + PMA_commonParams.get('common_query'), {
runtime.refreshRequest = $.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
ajax_request: true,
chart_data: 1,
type: 'chartgrid',
@ -1592,7 +1592,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
});
logRequest = $.get('server_status_monitor.php?' + PMA_commonParams.get('common_query'),
logRequest = $.get('server_status_monitor.php' + PMA_commonParams.get('common_query'),
{ ajax_request: true,
log_data: 1,
type: opts.src,
@ -1986,7 +1986,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
PMA_messages.strAnalyzing + ' <img class="ajaxIcon" src="' +
pmaThemeImage + 'ajax_clock_small.gif" alt="">');
$.post('server_status_monitor.php?' + PMA_commonParams.get('common_query'), {
$.post('server_status_monitor.php' + PMA_commonParams.get('common_query'), {
ajax_request: true,
query_analyzer: true,
query: codemirror_editor ? codemirror_editor.getValue() : $('#sqlquery').val(),

2
js/server_status_processes.js
View File

@ -28,7 +28,7 @@ var processList = {
init: function() {
processList.setRefreshLabel();
if (processList.refreshUrl === null) {
processList.refreshUrl = 'server_status_processes.php?' +
processList.refreshUrl = 'server_status_processes.php' +
PMA_commonParams.get('common_query');
}
if (processList.refreshInterval === null) {

2
libraries/Header.class.php
View File

@ -221,7 +221,7 @@ class PMA_Header
$pftext = ! empty($_SESSION['tmpval']['pftext'])
? $_SESSION['tmpval']['pftext'] : '';
return array(
'common_query' => PMA_URL_getCommon(array(), 'text', '&'),
'common_query' => PMA_URL_getCommon(array(), 'text'),
'opendb_url' => $GLOBALS['cfg']['DefaultTabDatabase'],
'safari_browser' => PMA_USR_BROWSER_AGENT == 'SAFARI' ? 1 : 0,
'collation_connection' => $GLOBALS['collation_connection'],

2
libraries/Menu.class.php
View File

@ -180,7 +180,7 @@ class PMA_Menu
: ':' . $GLOBALS['cfg']['Server']['port'];
$separator = "<span class='separator item'>&nbsp;»</span>";
$item = '<a href="%1$s?%2$s" class="item">';
$item = '<a href="%1$s%2$s" class="item">';
if (PMA_Util::showText('TabsMode')) {
$item .= '%4$s: ';

2
libraries/build_html_for_db.lib.php
View File

@ -167,7 +167,7 @@ function PMA_buildHtmlForDb(
. '<a onclick="'
. 'PMA_commonActions.setDb(\''
. PMA_jsFormat($current['SCHEMA_NAME']) . '\');'
. '" href="server_privileges.php?' . $url_query
. '" href="server_privileges.php' . $url_query
. '&amp;db=' . urlencode($current['SCHEMA_NAME'])
. '&amp;checkprivsdb=' . urlencode($current['SCHEMA_NAME'])
. '" title="'

2
libraries/db_common.inc.php
View File

@ -52,7 +52,7 @@ if (! isset($is_db) || ! $is_db) {
}
// Not a valid db name -> back to the welcome page
$uri = $cfg['PmaAbsoluteUri'] . 'index.php'
. PMA_URL_getCommon(array(), 'text', '&')
. PMA_URL_getCommon(array(), 'text')
. (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1';
if (!$pmaString->strlen($db) || ! $is_db) {
$response = PMA_Response::getInstance();

2
libraries/db_table_exists.lib.php
View File

@ -42,7 +42,7 @@ if (empty($is_db)) {
}
PMA_sendHeaderLocation(
$cfg['PmaAbsoluteUri'] . 'index.php'
. PMA_URL_getCommon($url_params, 'text', '&')
. PMA_URL_getCommon($url_params, 'text')
);
}
exit;

4
libraries/display_import.lib.php
View File

@ -442,7 +442,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
{
//some variable for javascript
$ajax_url = "import_status.php?id=" . $upload_id . "&"
. PMA_URL_getCommon(array('import_status'=>1), 'text', '&');
. PMA_URL_getCommon(array('import_status'=>1), 'text');
$promot_str = PMA_jsFormat(
__(
'The file being uploaded is probably larger than '
@ -460,7 +460,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
__('The file is being processed, please be patient.'),
false
);
$import_url = PMA_URL_getCommon(array('import_status'=>1), 'text', '&');
$import_url = PMA_URL_getCommon(array('import_status'=>1), 'text');
//start output
$html = 'var finished = false; ';

2
libraries/navigation/NavigationHeader.class.php
View File

@ -156,7 +156,7 @@ class PMA_NavigationHeader
if ($GLOBALS['server'] != 0) {
// Logout for advanced authentication
if ($GLOBALS['cfg']['Server']['auth_type'] != 'config') {
$link = 'index.php?' . $GLOBALS['url_query'];
$link = 'index.php' . $GLOBALS['url_query'];
$link .= '&amp;old_usr=' . urlencode($GLOBALS['PHP_AUTH_USER']);
$retval .= PMA_Util::getNavigationLink(
$link,

2
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -619,7 +619,7 @@ class AuthenticationCookie extends AuthenticationPlugin
PMA_Response::getInstance()->disable();
PMA_sendHeaderLocation(
$redirect_url . PMA_URL_getCommon($url_params, 'text', '&'),
$redirect_url . PMA_URL_getCommon($url_params, 'text'),
true
);
if (! defined('TESTSUITE')) {

2
libraries/relation.lib.php
View File

@ -1878,7 +1878,7 @@ function PMA_getHtmlFixPMATables()
);
$message->addParam(
'<a href="' . $GLOBALS['cfg']['PmaAbsoluteUri']
. 'chk_rel.php?' . $url_query . '">',
. 'chk_rel.php' . $url_query . '">',
false
);
$message->addParam('</a>', false);

2
libraries/replication_gui.lib.php
View File

@ -953,7 +953,7 @@ function PMA_handleControlRequest()
} else {
PMA_sendHeaderLocation(
$GLOBALS['cfg']['PmaAbsoluteUri'] . 'server_replication.php'
. PMA_URL_getCommon($GLOBALS['url_params'], 'text', '&')
. PMA_URL_getCommon($GLOBALS['url_params'], 'text')
);
}
}

4
libraries/rte/rte_footer.lib.php
View File

@ -33,7 +33,7 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
if (PMA_Util::currentUserHasPrivilege($priv, $db, $table)) {
$retval .= " <a {$ajax_class['add']} ";
$retval .= "href='db_" . $pmaString->strtolower($name) . "s.php";
$retval .= "?$url_query&amp;add_item=1' ";
$retval .= "$url_query&amp;add_item=1' ";
$retval .= "onclick='$.datepicker.initialized = false;'>";
$icon = 'b_' . $pmaString->strtolower($name) . '_add.png';
$retval .= PMA_Util::getIcon($icon);
@ -115,7 +115,7 @@ function PMA_EVN_getFooterLinks()
$retval .= " <div class='wrap'>\n";
// show the toggle button
$retval .= PMA_Util::toggleButton(
"sql.php?$url_query&amp;goto=db_events.php" . urlencode("?db=$db"),
"sql.php$url_query&amp;goto=db_events.php" . urlencode("?db=$db"),
'sql_query',
$options,
'PMA_slidingMessage(data.sql_query);'

22
libraries/rte/rte_list.lib.php
View File

@ -153,7 +153,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
&& PMA_Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
) {
$retval .= ' <a ' . $ajax_class['edit']
. ' href="db_routines.php?'
. ' href="db_routines.php'
. $url_query
. '&amp;edit_item=1'
. '&amp;item_name='
@ -194,7 +194,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
break;
}
$retval .= ' <a ' . $ajax_class['exec']
. ' href="db_routines.php?'
. ' href="db_routines.php'
. $url_query
. '&amp;' . $execute_action . '=1'
. '&amp;item_name='
@ -209,7 +209,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
$retval .= " </td>\n";
$retval .= " <td>\n";
$retval .= ' <a ' . $ajax_class['export']
. ' href="db_routines.php?'
. ' href="db_routines.php'
. $url_query
. '&amp;export_item=1'
. '&amp;item_name='
@ -219,7 +219,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
$retval .= " </td>\n";
$retval .= " <td>\n";
$retval .= ' <a ' . $ajax_class['drop']
. ' href="sql.php?'
. ' href="sql.php'
. $url_query
. '&amp;sql_query=' . urlencode($sql_drop)
. '&amp;goto=db_routines.php'
@ -260,7 +260,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
$retval .= " </td>\n";
if (empty($table)) {
$retval .= " <td>\n";
$retval .= "<a href='db_triggers.php?{$url_query}"
$retval .= "<a href='db_triggers.php{$url_query}"
. "&amp;table=" . urlencode($trigger['table']) . "'>"
. urlencode($trigger['table']) . "</a>";
$retval .= " </td>\n";
@ -268,7 +268,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
$retval .= " <td>\n";
if (PMA_Util::currentUserHasPrivilege('TRIGGER', $db, $table)) {
$retval .= ' <a ' . $ajax_class['edit']
. ' href="db_triggers.php?'
. ' href="db_triggers.php'
. $url_query
. '&amp;edit_item=1'
. '&amp;item_name='
@ -280,7 +280,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
$retval .= " </td>\n";
$retval .= " <td>\n";
$retval .= ' <a ' . $ajax_class['export']
. ' href="db_triggers.php?'
. ' href="db_triggers.php'
. $url_query
. '&amp;export_item=1'
. '&amp;item_name='
@ -290,7 +290,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
$retval .= " <td>\n";
if (PMA_Util::currentUserHasPrivilege('TRIGGER', $db)) {
$retval .= ' <a ' . $ajax_class['drop']
. ' href="sql.php?'
. ' href="sql.php'
. $url_query
. '&amp;sql_query='
. urlencode($trigger['drop'])
@ -344,7 +344,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
$retval .= " <td>\n";
if (PMA_Util::currentUserHasPrivilege('EVENT', $db)) {
$retval .= ' <a ' . $ajax_class['edit']
. ' href="db_events.php?'
. ' href="db_events.php'
. $url_query
. '&amp;edit_item=1'
. '&amp;item_name='
@ -356,7 +356,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
$retval .= " </td>\n";
$retval .= " <td>\n";
$retval .= ' <a ' . $ajax_class['export']
. ' href="db_events.php?'
. ' href="db_events.php'
. $url_query
. '&amp;export_item=1'
. '&amp;item_name='
@ -366,7 +366,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
$retval .= " <td>\n";
if (PMA_Util::currentUserHasPrivilege('EVENT', $db)) {
$retval .= ' <a ' . $ajax_class['drop']
. ' href="sql.php?'
. ' href="sql.php'
. $url_query
. '&amp;sql_query=' . urlencode($sql_drop)
. '&amp;goto=db_events.php'

2
libraries/server_databases.lib.php
View File

@ -365,7 +365,7 @@ function PMA_getHtmlForNoticeEnableStatistics($url_query, $html)
//we should put notice above database list
$html = $notice . $html;
$html .= '<ul><li id="li_switch_dbstats"><strong>' . "\n";
$html .= '<a href="server_databases.php?' . $url_query . '&amp;dbstats=1"'
$html .= '<a href="server_databases.php' . $url_query . '&amp;dbstats=1"'
. ' title="' . __('Enable Statistics') . '">' . "\n"
. ' ' . __('Enable Statistics');
$html .= '</a></strong><br />' . "\n";

46
libraries/structure.lib.php
View File

@ -36,7 +36,7 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
$may_have_rows = false;
}
$browse_table = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">';
$browse_table = '<a href="sql.php' . $tbl_url_query . '&amp;pos=0">';
if ($may_have_rows) {
$browse_table .= $titles['Browse'];
} else {
@ -44,7 +44,7 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
}
$browse_table .= '</a>';
$search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">';
$search_table = '<a href="tbl_select.php' . $tbl_url_query . '">';
if ($may_have_rows) {
$search_table .= $titles['Search'];
} else {
@ -52,14 +52,14 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
}
$search_table .= '</a>';
$browse_table_label = '<a href="sql.php?' . $tbl_url_query
$browse_table_label = '<a href="sql.php' . $tbl_url_query
. '&amp;pos=0" title="'
. htmlspecialchars($current_table['TABLE_COMMENT']) . '">'
. $truename . '</a>';
if (!$db_is_system_schema) {
$empty_table = '<a class="truncate_table_anchor ajax"';
$empty_table .= ' href="sql.php?' . $tbl_url_query
$empty_table .= ' href="sql.php' . $tbl_url_query
. '&amp;sql_query=';
$empty_table .= urlencode(
'TRUNCATE ' . PMA_Util::backquote($current_table['TABLE_NAME'])
@ -87,14 +87,14 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
$tracking_icon = '';
if (PMA_Tracker::isActive()) {
if (PMA_Tracker::isTracked($GLOBALS["db"], $truename)) {
$tracking_icon = '<a href="tbl_tracking.php?' . $url_query
$tracking_icon = '<a href="tbl_tracking.php' . $url_query
. '&amp;table=' . $truename . '">'
. PMA_Util::getImage(
'eye.png', __('Tracking is active.')
)
. '</a>';
} elseif (PMA_Tracker::getVersion($GLOBALS["db"], $truename) > 0) {
$tracking_icon = '<a href="tbl_tracking.php?' . $url_query
$tracking_icon = '<a href="tbl_tracking.php' . $url_query
. '&amp;table=' . $truename . '">'
. PMA_Util::getImage(
'eye_grey.png', __('Tracking is not active.')
@ -381,7 +381,7 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check)
function PMA_getHtmlForTablePrintViewLink($url_query)
{
return '<p>'
. '<a href="db_printview.php?' . $url_query . '" target="print_view">'
. '<a href="db_printview.php' . $url_query . '" target="print_view">'
. PMA_Util::getIcon(
'b_print.png',
__('Print view'),
@ -398,7 +398,7 @@ function PMA_getHtmlForTablePrintViewLink($url_query)
*/
function PMA_getHtmlForDataDictionaryLink($url_query)
{
return '<a href="db_datadict.php?' . $url_query . '" target="print_view">'
return '<a href="db_datadict.php' . $url_query . '" target="print_view">'
. PMA_Util::getIcon(
'b_tblanalyse.png',
__('Data Dictionary'),
@ -509,7 +509,7 @@ function PMA_getHtmlForStructureTableRow(
$html_output .= '<td class="center">' . $browse_table . '</td>';
$html_output .= '<td class="center">'
. '<a href="tbl_structure.php?' . $tbl_url_query . '">'
. '<a href="tbl_structure.php' . $tbl_url_query . '">'
. $titles['Structure'] . '</a></td>';
$html_output .= '<td class="center">' . $search_table . '</td>';
@ -566,7 +566,7 @@ function PMA_getHtmlForInsertEmptyDropActionLinks($tbl_url_query, $table_is_view
$titles, $empty_table, $current_table, $drop_query, $drop_message
) {
$html_output = '<td class="insert_table center">'
. '<a href="tbl_change.php?' . $tbl_url_query . '">'
. '<a href="tbl_change.php' . $tbl_url_query . '">'
. $titles['Insert']
. '</a></td>';
$html_output .= '<td class="center">' . $empty_table . '</td>';
@ -579,7 +579,7 @@ function PMA_getHtmlForInsertEmptyDropActionLinks($tbl_url_query, $table_is_view
$html_output .= ' view';
}
$html_output .= '" ';
$html_output .= 'href="sql.php?' . $tbl_url_query
$html_output .= 'href="sql.php' . $tbl_url_query
. '&amp;reload=1&amp;purge=1&amp;sql_query='
. urlencode($drop_query) . '&amp;message_to_show='
. urlencode($drop_message) . '" >'
@ -602,7 +602,7 @@ function PMA_getHtmlForShowStats($tbl_url_query, $formatted_size,
$unit, $overhead
) {
$html_output = '<td class="value tbl_size"><a '
. 'href="tbl_structure.php?' . $tbl_url_query . '#showusage" >'
. 'href="tbl_structure.php' . $tbl_url_query . '#showusage" >'
. '<span>' . $formatted_size . '</span> '
. '<span class="unit">' . $unit . '</span>'
. '</a></td>';
@ -1410,13 +1410,13 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_system_schema,
if (! $tbl_is_view && ! $db_is_system_schema) {
$html_output .= '<td class="edit center">'
. '<a class="change_column_anchor ajax"'
. ' href="tbl_structure.php?'
. ' href="tbl_structure.php'
. $url_query . '&amp;field=' . $field_encoded
. '&amp;change_column=1">'
. $titles['Change'] . '</a>' . '</td>';
$html_output .= '<td class="drop center">'
. '<a class="drop_column_anchor ajax"'
. ' href="sql.php?' . $url_query . '&amp;sql_query='
. ' href="sql.php' . $url_query . '&amp;sql_query='
. urlencode(
'ALTER TABLE ' . PMA_Util::backquote($table)
. ' DROP ' . PMA_Util::backquote($row['Field']) . ';'
@ -1602,7 +1602,7 @@ function PMA_getHtmlForEditView($url_params)
function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
$db_is_system_schema, $tbl_storage_engine, $cfgRelation
) {
$html_output = '<a href="tbl_printview.php?' . $url_query
$html_output = '<a href="tbl_printview.php' . $url_query
. '" target="print_view">'
. PMA_Util::getIcon('b_print.png', __('Print view'), true)
. '</a>';
@ -1614,14 +1614,14 @@ function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
if ($cfgRelation['relwork']
|| PMA_Util::isForeignKeySupported($tbl_storage_engine)
) {
$html_output .= '<a href="tbl_relation.php?' . $url_query . '">'
$html_output .= '<a href="tbl_relation.php' . $url_query . '">'
. PMA_Util::getIcon(
'b_relations.png', __('Relation view'), true
)
. '</a>';
}
if (!PMA_DRIZZLE) {
$html_output .= '<a href="sql.php?' . $url_query
$html_output .= '<a href="sql.php' . $url_query
. '&amp;session_max_rows=all&amp;sql_query=' . urlencode(
'SELECT * FROM ' . PMA_Util::backquote($GLOBALS['table'])
. ' PROCEDURE ANALYSE()'
@ -1635,14 +1635,14 @@ function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
$html_output .= PMA_Util::showMySQLDocu('procedure_analyse') . "\n";
}
if (PMA_Tracker::isActive()) {
$html_output .= '<a href="tbl_tracking.php?' . $url_query . '">'
$html_output .= '<a href="tbl_tracking.php' . $url_query . '">'
. PMA_Util::getIcon('eye.png', __('Track table'), true)
. '</a>';
}
$html_output .= '<a href="#" id="move_columns_anchor">'
. PMA_Util::getIcon('b_move.png', __('Move columns'), true)
. '</a>';
$html_output .= '<a href="normalization.php?' . $url_query . '">'
$html_output .= '<a href="normalization.php' . $url_query . '">'
. PMA_Util::getIcon('normalize.png', __('Improve table structure'), true)
. '</a>';
}
@ -1745,7 +1745,7 @@ function PMA_getHtmlForOptimizeLink($url_query)
{
$html_output = '<tr class="tblFooters">';
$html_output .= '<td colspan="3" class="center">';
$html_output .= '<a href="sql.php?' . $url_query
$html_output .= '<a href="sql.php' . $url_query
. '&pos=0&amp;sql_query=' . urlencode(
'OPTIMIZE TABLE ' . PMA_Util::backquote($GLOBALS['table'])
)
@ -1945,7 +1945,7 @@ function PMA_getHtmlForActionRowInStructureTable($type, $tbl_storage_engine,
($action=='Unique' ? 'class="ajax add_unique_anchor"' : ' ')
)
)
. ' href="sql.php?' . $url_query . '&amp;sql_query='
. ' href="sql.php' . $url_query . '&amp;sql_query='
. urlencode(
'ALTER TABLE ' . PMA_Util::backquote($GLOBALS['table'])
. ($isPrimary ? ($primary ? ' DROP PRIMARY KEY,' : '') : '')
@ -1991,7 +1991,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
&& ($pmaString->strpos($type, 'text') !== false
|| $pmaString->strpos($type, 'char') !== false)
) {
$html_output .= '<a rel="samepage" href="sql.php?' . $url_query
$html_output .= '<a rel="samepage" href="sql.php' . $url_query
. '&amp;sql_query='
. urlencode(
'ALTER TABLE ' . PMA_Util::backquote($GLOBALS['table'])
@ -2026,7 +2026,7 @@ function PMA_getHtmlForFullTextAction($tbl_storage_engine, $type, $url_query,
function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles)
{
$html_output = '<li class="browse nowrap">';
$html_output .= '<a href="sql.php?' . $url_query . '&amp;sql_query='
$html_output .= '<a href="sql.php' . $url_query . '&amp;sql_query='
. urlencode(
'SELECT COUNT(*) AS ' . PMA_Util::backquote(__('Rows'))
. ', ' . PMA_Util::backquote($row['Field'])

2
libraries/tbl_common.inc.php
View File

@ -49,7 +49,7 @@ if (PMA_Tracker::isActive()
&& PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
&& ! isset($_REQUEST['submit_deactivate_now'])
) {
$temp_msg = '<a href="tbl_tracking.php?' . $url_query . '">';
$temp_msg = '<a href="tbl_tracking.php' . $url_query . '">';
$temp_msg .= sprintf(
__('Tracking of %s is activated.'),
htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])

10
libraries/tracking.lib.php
View File

@ -55,7 +55,7 @@ function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query,
$pmaString = $GLOBALS['PMA_String'];
$html = '<div id="div_create_version">';
$html .= '<form method="post" action="tbl_tracking.php?' . $url_query . '">';
$html .= '<form method="post" action="tbl_tracking.php' . $url_query . '">';
$html .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
$html .= '<fieldset>';
$html .= '<legend>';
@ -157,7 +157,7 @@ function PMA_getHtmlForActivateDeactivateTracking(
$action, $url_query, $last_version
) {
$html = '<div>';
$html .= '<form method="post" action="tbl_tracking.php?' . $url_query . '">';
$html .= '<form method="post" action="tbl_tracking.php' . $url_query . '">';
$html .= '<fieldset>';
$html .= '<legend>';
@ -340,7 +340,7 @@ function PMA_getSQLResultForSelectableTables()
*/
function PMA_getHtmlForSelectableTables($selectable_tables_sql_result, $url_query)
{
$html = '<form method="post" action="tbl_tracking.php?' . $url_query . '">';
$html = '<form method="post" action="tbl_tracking.php' . $url_query . '">';
$html .= '<select name="table">';
while ($entries = $GLOBALS['dbi']->fetchArray($selectable_tables_sql_result)) {
if (PMA_Tracker::isTracked($entries['db_name'], $entries['table_name'])) {
@ -386,7 +386,7 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
$filter_ts_from, $filter_users
) {
$html = '<h3>' . __('Tracking report')
. ' [<a href="tbl_tracking.php?' . $url_query . '">' . __('Close')
. ' [<a href="tbl_tracking.php' . $url_query . '">' . __('Close')
. '</a>]</h3>';
$html .= '<small>' . __('Tracking statements') . ' '
@ -793,7 +793,7 @@ function PMA_getHtmlForDataDefinitionStatement($entry, $filter_users,
function PMA_getHtmlForSchemaSnapshot($url_query)
{
$html = '<h3>' . __('Structure snapshot')
. ' [<a href="tbl_tracking.php?' . $url_query . '">' . __('Close')
. ' [<a href="tbl_tracking.php' . $url_query . '">' . __('Close')
. '</a>]</h3>';
$data = PMA_Tracker::getTrackedData(
$_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']

2
prefs_forms.php
View File

@ -45,7 +45,7 @@ if (isset($_POST['revert'])) {
$url_params = array('form' => $form_param);
PMA_sendHeaderLocation(
$cfg['PmaAbsoluteUri'] . 'prefs_forms.php'
. PMA_URL_getCommon($url_params, 'text', '&')
. PMA_URL_getCommon($url_params, 'text')
);
exit;
}