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

Remove HTML rendering inside the functions in display_tbl.lib.php file itselves

Browse Source
This commit is contained in:
Chanaka Indrajith 2012-05-11 16:05:55 +05:30
parent 61360750ca
commit bf15800089
33 changed files with 448 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_create.php
View File

@ -85,7 +85,7 @@ if (! $result) {
* @global array $GLOBALS['extra_data']
* @name $extra_data
*/
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query, 'success');
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query, 'success');
//Construct the html for the new database, so that it can be appended to
// the list of databases on server_databases.php

4
db_operations.php
View File

@ -341,7 +341,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
*/
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['newname'] = $newname;
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
};
}
@ -375,7 +375,7 @@ if (empty($is_info)) {
echo "\n";
if (isset($message)) {
PMA_showMessage($message, $sql_query);
echo PMA_getMessage($message, $sql_query);
unset($message);
}
}

2
db_tracking.php
View File

@ -225,7 +225,7 @@ if (count($data['ddlog']) > 0) {
foreach ($data['ddlog'] as $entry) {
$log .= '# ' . $entry['date'] . ' ' . $entry['username'] . "\n" . $entry['statement'] . "\n";
}
PMA_showMessage(__('Database Log'), $log);
echo PMA_getMessage(__('Database Log'), $log);
}
/**

2
js/db_operations.js
View File

@ -60,7 +60,7 @@ $(function() {
.end()
.after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
//Remove the empty notice div generated due to a NULL query passed to PMA_getMessage()
var $notice_class = $("#floating_menubar").next("div").find('.notice');
if ($notice_class.text() == '') {
$notice_class.remove();

2
js/server_privileges.js
View File

@ -188,7 +188,7 @@ $(function() {
.end()
.after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
//Remove the empty notice div generated due to a NULL query passed to PMA_getMessage()
var $notice_class = $("#floating_menubar").next("div").find('.notice');
if ($notice_class.text() == '') {
$notice_class.remove();

2
js/tbl_change.js
View File

@ -345,7 +345,7 @@ $(function() {
.end()
.after(data.sql_query);
//Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
//Remove the empty notice div generated due to a NULL query passed to PMA_getMessage()
var $notice_class = $("#floating_menubar").next("div").find('.notice');
if ($notice_class.text() == '') {
$notice_class.remove();

2
libraries/Menu.class.php
View File

@ -89,7 +89,7 @@ class PMA_Menu
echo $this->_getBreadcrumbs();
echo $this->_getMenu();
if (! empty($GLOBALS['message'])) {
PMA_showMessage($GLOBALS['message']);
echo PMA_getMessage($GLOBALS['message']);
unset($GLOBALS['message']);
}
}

6
libraries/common.lib.php
View File

@ -965,7 +965,7 @@ if (typeof(window.parent) != 'undefined'
}
/**
* displays the message and the query
* Prepare the message and the query
* usually the message is the result of the query executed
*
* @param string $message the message to display
@ -977,7 +977,7 @@ if (typeof(window.parent) != 'undefined'
*
* @access public
*/
function PMA_showMessage(
function PMA_getMessage(
$message,
$sql_query = null,
$type = 'notice',
@ -1337,7 +1337,7 @@ function PMA_showMessage(
return $retval;
} // end of the 'PMA_showMessage()' function
} // end of the 'PMA_getMessage()' function
/**
* Verifies if current MySQL server supports profiling

728
libraries/display_tbl.lib.php
View File

File diff suppressed because it is too large Load Diff

2
libraries/rte/rte_events.lib.php
View File

@ -146,7 +146,7 @@ function PMA_EVN_handleEditor()
$message->addString('</ul>');
}
$output = PMA_showMessage($message, $sql_query);
$output = PMA_getMessage($message, $sql_query);
if ($GLOBALS['is_ajax_request']) {
$extra_data = array();
if ($message->isSuccess()) {

2
libraries/rte/rte_routines.lib.php
View File

@ -299,7 +299,7 @@ function PMA_RTN_handleEditor()
$message->addString('</ul>');
}
$output = PMA_showMessage($message, $sql_query);
$output = PMA_getMessage($message, $sql_query);
if ($GLOBALS['is_ajax_request']) {
$extra_data = array();
if ($message->isSuccess()) {

2
libraries/rte/rte_triggers.lib.php
View File

@ -119,7 +119,7 @@ function PMA_TRI_handleEditor()
$message->addString('</ul>');
}
$output = PMA_showMessage($message, $sql_query);
$output = PMA_getMessage($message, $sql_query);
if ($GLOBALS['is_ajax_request']) {
$extra_data = array();
if ($message->isSuccess()) {

2
main.php
View File

@ -30,7 +30,7 @@ require_once 'libraries/header.inc.php';
// Any message to display?
if (! empty($message)) {
PMA_showMessage($message);
echo PMA_getMessage($message);
unset($message);
}

2
server_binlog.php
View File

@ -106,7 +106,7 @@ if (count($binary_logs) > 1) {
echo '</form>';
}
PMA_showMessage(PMA_Message::success());
echo PMA_getMessage(PMA_Message::success());
/**
* Displays the page

2
server_databases.php
View File

@ -293,7 +293,7 @@ if ($databases_count > 0) {
. '<a href="server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
. ' ' . __('Uncheck All') . '</a>' . "\n"
. '<i>' . __('With selected:') . '</i>' . "\n";
PMA_buttonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
echo PMA_getButtonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
}
if (empty($dbstats)) {

12
server_privileges.php
View File

@ -1580,7 +1580,7 @@ $link_export_all = '<a class="export_user_anchor ' . $conditional_class . '" hre
if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export') && (! isset($_REQUEST['adduser']) || $_add_user_error) && (! isset($_REQUEST['initial']) || empty($_REQUEST['initial'])) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {
if (isset($sql_query)) {
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
}
if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
@ -1657,7 +1657,7 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
echo "\n";
} else {
if (! empty($GLOBALS['message'])) {
PMA_showMessage($GLOBALS['message']);
echo PMA_getMessage($GLOBALS['message']);
unset($GLOBALS['message']);
}
}
@ -1927,10 +1927,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
. __('Uncheck All') . '</a>' . "\n"
.'<i>' . __('With selected:') . '</i>' . "\n";
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_export',
__('Export'), 'b_tblexport.png', 'export'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_export',
__('Export'), 'b_tblexport.png', 'export'
);
echo '<input type="hidden" name="initial" value="' . (isset($initial) ? $initial : '') . '" />';
echo '</div>'
. '<div class="clear_both" style="clear:both"></div>'

14
sql.php
View File

@ -293,7 +293,7 @@ if (! defined('PMA_CHK_DROP')
} // end if
require_once 'libraries/display_tbl.lib.php';
PMA_displayTable_checkConfigParams();
PMA_setConfigParamsForDisplayTable();
/**
* Need to find the real end of rows?
@ -817,7 +817,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
if ($GLOBALS['is_ajax_request'] == true) {
if ($cfg['ShowSQL']) {
$extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
$extra_data['sql_query'] = PMA_getMessage($message, $GLOBALS['sql_query'], 'success');
}
if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) {
$extra_data['reload'] = 1;
@ -898,9 +898,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
if (isset($message)) {
$message = PMA_Message::success($message);
echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
echo PMA_getMessage($message, $GLOBALS['sql_query'], 'success');
}
PMA_displayTable($result, $disp_mode, $analyzed_sql);
echo PMA_getTable($result, $disp_mode, $analyzed_sql);
exit();
}
@ -931,7 +931,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
}
} else {
include_once 'libraries/header.inc.php';
//we don't need to buffer the output in PMA_showMessage here.
//we don't need to buffer the output in PMA_getMessage here.
//set a global variable and check against it in the function
$GLOBALS['buffer_message'] = false;
}
@ -958,7 +958,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
// Display previous update query (from tbl_replace)
if (isset($disp_query) && $cfg['ShowSQL'] == true) {
PMA_showMessage($disp_message, $disp_query, 'success');
echo PMA_getMessage($disp_message, $disp_query, 'success');
}
if (isset($profiling_results)) {
@ -1018,7 +1018,7 @@ $(makeProfilingChart);
$message->display();
}
PMA_displayTable($result, $disp_mode, $analyzed_sql);
echo PMA_getTable($result, $disp_mode, $analyzed_sql);
PMA_DBI_free_result($result);
// BEGIN INDEX CHECK See if indexes should be checked.

2
tbl_addfield.php
View File

@ -191,7 +191,7 @@ if (isset($_REQUEST['do_save_data'])) {
$message->addParam($table);
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}

2
tbl_alter.php
View File

@ -254,7 +254,7 @@ if (isset($_REQUEST['do_save_data'])) {
}
if ( $_REQUEST['ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}

4
tbl_change.php
View File

@ -133,7 +133,7 @@ if (! empty($disp_message)) {
if (! isset($disp_query)) {
$disp_query = null;
}
PMA_showMessage($disp_message, $disp_query);
echo PMA_getMessage($disp_message, $disp_query);
}
/**
@ -176,7 +176,7 @@ if (isset($where_clause)) {
// No row returned
if (! $rows[$key_id]) {
unset($rows[$key_id], $where_clause_array[$key_id]);
PMA_showMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query);
echo PMA_getMessage(__('MySQL returned an empty result set (i.e. zero rows).'), $local_query);
echo "\n";
include 'libraries/footer.inc.php';
} else { // end if (no row returned)

2
tbl_export.php
View File

@ -76,7 +76,7 @@ if (! empty($sql_query)) {
// Just crop LIMIT clause
$sql_query = $analyzed_sql[0]['section_before_limit'] . $analyzed_sql[0]['section_after_limit'];
}
PMA_showMessage(PMA_Message::success());
echo PMA_getMessage(PMA_Message::success());
}
$export_type = 'table';

2
tbl_indexes.php
View File

@ -107,7 +107,7 @@ if (isset($_REQUEST['do_save_data'])) {
if ( $GLOBALS['is_ajax_request'] == true) {
$extra_data['index_table'] = PMA_Index::getView($table, $db);
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}

2
tbl_move_copy.php
View File

@ -69,7 +69,7 @@ if (PMA_isValid($_REQUEST['new_name'])) {
}
if ( $_REQUEST['ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
$extra_data['db'] = $GLOBALS['db'];
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}

6
tbl_operations.php
View File

@ -232,7 +232,7 @@ if (isset($result) && empty($message_to_show)) {
// $result should exist, regardless of $_message
$_type = $result ? 'success' : 'error';
if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$extra_data['sql_query'] = PMA_showMessage(null, $sql_query);
$extra_data['sql_query'] = PMA_getMessage(null, $sql_query);
PMA_ajaxResponse($_message, $_message->isSuccess(), $extra_data);
}
}
@ -246,7 +246,7 @@ if (isset($result) && empty($message_to_show)) {
unset($warning_messages);
}
PMA_showMessage($_message, $sql_query, $_type);
echo PMA_getMessage($_message, $sql_query, $_type);
unset($_message, $_type);
}
@ -520,7 +520,7 @@ if (isset($possible_row_formats[$tbl_storage_engine])) {
$current_row_format = strtoupper($showtable['Row_format']);
echo '<tr><td><label for="new_row_format">ROW_FORMAT</label></td>';
echo '<td>';
echo PMA_generate_html_dropdown('new_row_format', $possible_row_formats[$tbl_storage_engine], $current_row_format, 'new_row_format');
echo PMA_getDropdown('new_row_format', $possible_row_formats[$tbl_storage_engine], $current_row_format, 'new_row_format');
unset($possible_row_formats, $current_row_format);
echo '</td>';
echo '</tr>';

6
tbl_relation.php
View File

@ -181,7 +181,7 @@ if (isset($destination) && $cfgRelation['relwork']) {
// (for now, one index name only; we keep the definitions if the
// foreign db is not the same)
// I use $sql_query to be able to display directly the query via
// PMA_showMessage()
// PMA_getMessage()
if (isset($_REQUEST['destination_foreign'])) {
$display_query = '';
@ -285,9 +285,9 @@ if (isset($_REQUEST['destination_foreign'])) {
} // end foreach
if (!empty($display_query)) {
if ($seen_error) {
PMA_showMessage(__('Error'), null, 'error');
echo PMA_getMessage(__('Error'), null, 'error');
} else {
PMA_showMessage(__('Your SQL query has been executed successfully'), null, 'success');
echo PMA_getMessage(__('Your SQL query has been executed successfully'), null, 'success');
}
}
} // end if isset($destination_foreign)

2
tbl_replace.php
View File

@ -544,7 +544,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
/**Get the total row count of the table*/
$extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'], $_REQUEST['table']);
$extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['display_query']);
$extra_data['sql_query'] = PMA_getMessage($message, $GLOBALS['display_query']);
PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
}

58
tbl_structure.php
View File

@ -568,37 +568,37 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
<i><?php echo __('With selected:'); ?></i>
<?php
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_browse',
__('Browse'), 'b_browse.png', 'browse'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_browse',
__('Browse'), 'b_browse.png', 'browse'
);
if (! $tbl_is_view && ! $db_is_information_schema) {
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_change',
__('Change'), 'b_edit.png', 'change'
);
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_drop',
__('Drop'), 'b_drop.png', 'drop'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_change',
__('Change'), 'b_edit.png', 'change'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_drop',
__('Drop'), 'b_drop.png', 'drop'
);
if ('ARCHIVE' != $tbl_storage_engine) {
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_primary',
__('Primary'), 'b_primary.png', 'primary'
);
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_unique',
__('Unique'), 'b_unique.png', 'unique'
);
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_index',
__('Index'), 'b_index.png', 'index'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_primary',
__('Primary'), 'b_primary.png', 'primary'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_unique',
__('Unique'), 'b_unique.png', 'unique'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_index',
__('Index'), 'b_index.png', 'index'
);
}
if (! empty($tbl_storage_engine) && $tbl_storage_engine == 'MYISAM') {
PMA_buttonOrImage(
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_spatial',
__('Spatial'), 'b_spatial.png', 'spatial'
);
@ -608,10 +608,10 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
|| $tbl_storage_engine == 'ARIA'
|| $tbl_storage_engine == 'MARIA')
) {
PMA_buttonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_fulltext',
__('Fulltext'), 'b_ftext.png', 'ftext'
);
echo PMA_getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_fulltext',
__('Fulltext'), 'b_ftext.png', 'ftext'
);
}
}
?>

2
tbl_tracking.php
View File

@ -289,7 +289,7 @@ if (isset($_REQUEST['snapshot'])) {
$drop_create_statements .= $data['ddlog'][1]['statement'];
}
// Print SQL code
PMA_showMessage(sprintf(__('Version %s snapshot (SQL code)'), htmlspecialchars($_REQUEST['version'])), $drop_create_statements);
echo PMA_getMessage(sprintf(__('Version %s snapshot (SQL code)'), htmlspecialchars($_REQUEST['version'])), $drop_create_statements);
// Unserialize snapshot
$temp = unserialize($data['schema_snapshot']);

6
test/libraries/common/PMA_generate_html_dropdown_test.php
View File

@ -23,7 +23,7 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
$result = '<select name="' . htmlspecialchars($name) . '" id="' . htmlspecialchars($id) . '"></select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
$this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id));
}
function testGenerateHtmlDropdown()
@ -43,7 +43,7 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
}
$result .= '</select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
$this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id));
}
function testGenerateHtmlDropdownWithActive()
@ -63,6 +63,6 @@ class PMA_generate_html_dropdown_test extends PHPUnit_Framework_TestCase
}
$result .= '</select>';
$this->assertEquals($result, PMA_generate_html_dropdown($name, $choices, $active_choice, $id));
$this->assertEquals($result, PMA_getDropdown($name, $choices, $active_choice, $id));
}
}

6
test/libraries/common/PMA_showMessage_test_disabled.php
View File

@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Test for PMA_showMessage from common.lib
* Test for PMA_getMessage from common.lib
*
* @package PhpMyAdmin-test
* @group common.lib-tests
@ -60,9 +60,9 @@ class PMA_showMessage_test extends PHPUnit_Framework_TestCase
]</div></div>"
);
echo PMA_showMessage("msg");
echo PMA_getMessage("msg");
//$this->assertEquals("",PMA_showMessage("msg"));
//$this->assertEquals("",PMA_getMessage("msg"));
$this->assertTrue(true);
}
}

4
user_password.php
View File

@ -82,7 +82,7 @@ function PMA_getChangePassMessage($change_password_message, $sql_query = '')
if ($change_password_message['error']) {
PMA_ajaxResponse($change_password_message['msg'], false);
} else {
$extra_data['sql_query'] = PMA_showMessage($change_password_message['msg'], $sql_query, 'success');
$extra_data['sql_query'] = PMA_getMessage($change_password_message['msg'], $sql_query, 'success');
PMA_ajaxResponse($change_password_message['msg'], true, $extra_data);
}
}
@ -205,7 +205,7 @@ function PMA_changePassDisplayPage($message, $sql_query, $_url_params)
{
include_once './libraries/header.inc.php';
echo '<h1>' . __('Change password') . '</h1>' . "\n\n";
PMA_showMessage($message, $sql_query, 'success');
echo PMA_getMessage($message, $sql_query, 'success');
echo '<a href="index.php'.PMA_generate_common_url($_url_params).' target="_parent">'. "\n"
.'<strong>'.__('Back').'</strong></a>';
include './libraries/footer.inc.php';

2
view_create.php
View File

@ -68,7 +68,7 @@ if (isset($_REQUEST['createview'])) {
include './' . $cfg['DefaultTabDatabase'];
exit();
} else {
PMA_ajaxResponse(PMA_showMessage(PMA_Message::success(), $sql_query), 1);
PMA_ajaxResponse(PMA_getMessage(PMA_Message::success(), $sql_query), 1);
}
} else {
if ($GLOBALS['is_ajax_request'] != true) {

2
view_operations.php
View File

@ -62,7 +62,7 @@ if (isset($result)) {
$_message->isError(true);
unset($warning_messages);
}
PMA_showMessage($_message, $sql_query, $_type, $is_view = true);
echo PMA_getMessage($_message, $sql_query, $_type, $is_view = true);
unset($_message, $_type);
}