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

Remove unused param from PMA_Util::showMySQLDocu

Browse Source
This commit is contained in:
Michal Čihař 2013-08-07 08:48:50 +02:00
parent d7c3b58337
commit d1bb142e87
23 changed files with 201 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.php
View File

@ -174,10 +174,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
. ' '. PMA_Util::getImage('s_asci.png') . " "
. __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_Util::showMySQLDocu(
'MySQL_Database_Administration',
'Charset-connection'
)
. PMA_Util::showMySQLDocu('Charset-connection')
. ': ' . "\n"
. ' </label>' . "\n"
@ -640,7 +637,7 @@ function PMA_printListItem($name, $id = null, $url = null,
echo '</a>' . "\n";
}
if (null !== $mysql_help_page) {
echo PMA_Util::showMySQLDocu('', $mysql_help_page);
echo PMA_Util::showMySQLDocu($mysql_help_page);
}
echo '</li>';
}

2
libraries/DbSearch.class.php
View File

@ -405,7 +405,7 @@ class PMA_DbSearch
),
'3' => __('the exact phrase'),
'4' => __('as regular expression') . ' '
. PMA_Util::showMySQLDocu('Regexp', 'Regexp')
. PMA_Util::showMySQLDocu('Regexp')
);
// 4th parameter set to true to add line breaks
// 5th parameter set to false to avoid htmlspecialchars() escaping

4
libraries/Index.class.php
View File

@ -534,9 +534,7 @@ class PMA_Index
if (! $print_mode) {
$r = '<fieldset class="index_info">';
$r .= '<legend id="index_header">' . __('Indexes');
$r .= PMA_Util::showMySQLDocu(
'optimization', 'optimizing-database-structure'
);
$r .= PMA_Util::showMySQLDocu('optimizing-database-structure');
$r .= '</legend>';
$r .= $no_indexes;

4
libraries/TableSearch.class.php
View File

@ -789,9 +789,7 @@ EOT;
$html_output .= '<fieldset id="fieldset_search_conditions">'
. '<legend>' . '<em>' . __('Or') . '</em> '
. __('Add search conditions (body of the "where" clause):') . '</legend>';
$html_output .= PMA_Util::showMySQLDocu(
'SQL-Syntax', 'Functions'
);
$html_output .= PMA_Util::showMySQLDocu('Functions');
$html_output .= '<input type="text" name="customWhereClause"'
. ' class="textfield" size="64" />';
$html_output .= '</fieldset>';

11
libraries/Util.class.php
View File

@ -440,11 +440,10 @@ class PMA_Util
*
* @access public
*/
public static function getMySQLDocuURL($chapter, $link, $anchor = '') {
public static function getMySQLDocuURL($link, $anchor = '') {
global $cfg;
// Fixup for newly used names:
$chapter = str_replace('_', '-', strtolower($chapter));
$link = str_replace('_', '-', strtolower($link));
if (empty($link)) {
@ -486,9 +485,9 @@ class PMA_Util
* @access public
*/
public static function showMySQLDocu(
$chapter, $link, $big_icon = false, $anchor = '', $just_open = false
$link, $big_icon = false, $anchor = '', $just_open = false
) {
$url = self::getMySQLDocuURL($chapter, $link, $anchor);
$url = self::getMySQLDocuURL($link, $anchor);
$open_link = '<a href="' . $url . '" target="mysql_doc">';
if ($just_open) {
return $open_link;
@ -643,7 +642,7 @@ class PMA_Util
$error_msg .= '<p><strong>' . __('SQL query:') . '</strong>' . "\n";
if (strstr(strtolower($formatted_sql), 'select')) {
// please show me help to the error on select
$error_msg .= self::showMySQLDocu('SQL-Syntax', 'SELECT');
$error_msg .= self::showMySQLDocu('SELECT');
}
if ($is_modify_link) {
$_url_params = array(
@ -685,7 +684,7 @@ class PMA_Util
// (now error-messages-server)
$error_msg .= '<p>' . "\n"
. ' <strong>' . __('MySQL said: ') . '</strong>'
. self::showMySQLDocu('Error-messages-server', 'Error-messages-server')
. self::showMySQLDocu('Error-messages-server')
. "\n"
. '</p>' . "\n";

26
libraries/display_create_database.lib.php
View File

@ -16,26 +16,26 @@ require_once './libraries/check_user_privileges.lib.php';
if ($is_create_db_priv) {
// The user is allowed to create a db
$html .= '<form method="post" action="db_create.php"'
$html .= '<form method="post" action="db_create.php"'
. ' id="create_database_form" class="ajax"><strong>';
$html .= '<label for="text_create_db">'
. PMA_Util::getImage('b_newdb.png')
. " " . __('Create database')
. '</label>&nbsp;'
. PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE');
. PMA_Util::showMySQLDocu('CREATE_DATABASE');
$html .= '</strong><br />';
$html .= PMA_generate_common_hidden_inputs('', '', 5);
$html .= '<input type="hidden" name="reload" value="1" />';
$html .= '<input type="text" name="new_db" value="' . $db_to_create
$html .= '<input type="text" name="new_db" value="' . $db_to_create
. '" maxlength="64" class="textfield" id="text_create_db"/>';
include_once './libraries/mysql_charsets.inc.php';
$html .= PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION,
'db_collation',
null,
null,
true,
PMA_CSDROPDOWN_COLLATION,
'db_collation',
null,
null,
true,
5
);
@ -47,14 +47,14 @@ if ($is_create_db_priv) {
$html .= '</form>';
} else {
$html .= '<!-- db creation no privileges message -->';
$html .= '<strong>' . __('Create database:') . '&nbsp;'
. PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE')
$html .= '<strong>' . __('Create database:') . '&nbsp;'
. PMA_Util::showMySQLDocu('CREATE_DATABASE')
. '</strong><br />';
$html .= '<span class="noPrivileges">'
. PMA_Util::getImage(
's_error2.png',
'',
's_error2.png',
'',
array('hspace' => 2, 'border' => 0, 'align' => 'middle')
)
. '' . __('No Privileges') .'</span>';

2
libraries/display_indexes.lib.php
View File

@ -97,7 +97,7 @@ $html .= '<div>'
. '<strong>'
. '<label for="select_index_type">'
. __('Index type:')
. PMA_Util::showMySQLDocu('SQL-Syntax', 'ALTER_TABLE')
. PMA_Util::showMySQLDocu('ALTER_TABLE')
. '</label>'
. '</strong>'
. '</div>'

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

@ -172,8 +172,8 @@ class PMA_NavigationHeader
private function _links()
{
// always iconic
$showIcon = true;
$showText = false;
$showIcon = true;
$showText = false;
$retval = '<!-- LINKS START -->';
$retval .= '<div id="leftframelinks">';
@ -224,7 +224,7 @@ class PMA_NavigationHeader
'documentation'
);
if ($showIcon) {
$retval .= PMA_Util::showMySQLDocu('', '', true);
$retval .= PMA_Util::showMySQLDocu('', true);
}
if ($showText) {
// PMA_showMySQLDocu always spits out an icon,
@ -232,7 +232,7 @@ class PMA_NavigationHeader
$link = preg_replace(
'/<img[^>]+>/i',
__('Documentation'),
PMA_Util::showMySQLDocu('', '', true)
PMA_Util::showMySQLDocu('', true)
);
$retval .= $link;
$retval .= '<br />';

20
libraries/operations.lib.php
View File

@ -801,9 +801,7 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
//Storage engine
$html_output .= '<tr><td>' . __('Storage Engine')
. PMA_Util::showMySQLDocu(
'Storage_engines', 'Storage_engines'
)
. PMA_Util::showMySQLDocu('Storage_engines')
. '</td>'
. '<td>'
. PMA_StorageEngine::getHtmlSelect(
@ -1212,20 +1210,17 @@ function PMA_getListofMaintainActionLink($is_myisam_or_aria,
* @param array $params url parameters array
* @param array $url_params
* @param string $link contains name of page/anchor that is being linked
* @param string $chapter chapter of "HTML, one page per chapter" documentation
*
* @return string $html_output
*/
function PMA_getMaintainActionlink($action, $params, $url_params, $link,
$chapter = 'MySQL_Database_Administration'
) {
function PMA_getMaintainActionlink($action, $params, $url_params, $link) {
return '<li>'
. '<a class="maintain_action ajax" '
. 'href="sql.php'
. PMA_generate_common_url(array_merge($url_params, $params)) .'">'
. $action
. '</a>'
. PMA_Util::showMySQLDocu($chapter, $link)
. PMA_Util::showMySQLDocu($link)
. '</li>';
}
@ -1284,9 +1279,7 @@ function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $id)
. 'href="sql.php' . PMA_generate_common_url($url_params) . '"'
. ' id="' . $id . '" class="ajax">'
. $link . '</a>'
. PMA_Util::showMySQLDocu(
'SQL-Syntax', $syntax
)
. PMA_Util::showMySQLDocu($syntax)
. '</li>';
}
@ -1326,10 +1319,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
$html_output .= PMA_Util::getRadioFields(
'partition_operation', $choices, '', false
);
$html_output .= PMA_Util::showMySQLDocu(
'partitioning_maintenance',
'partitioning_maintenance'
);
$html_output .= PMA_Util::showMySQLDocu('partitioning_maintenance');
$this_url_params = array_merge(
$url_params,
array(

2
libraries/plugin_interface.lib.php
View File

@ -422,7 +422,6 @@ function PMA_pluginGetOneOption(
if ($doc != null) {
if (count($doc) == 3) {
$ret .= PMA_Util::showMySQLDocu(
$doc[0],
$doc[1],
false,
$doc[2]
@ -431,7 +430,6 @@ function PMA_pluginGetOneOption(
$ret .= PMA_Util::showDocu('faq', $doc[0]);
} else {
$ret .= PMA_Util::showMySQLDocu(
$doc[0],
$doc[1]
);
}

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

@ -38,7 +38,7 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
$retval .= " " . PMA_Util::getIcon($icon);
$retval .= PMA_RTE_getWord('no_create') . "\n";
}
$retval .= " " . PMA_Util::showMySQLDocu('SQL-Syntax', $docu) . "\n";
$retval .= " " . PMA_Util::showMySQLDocu($docu) . "\n";
$retval .= " </div>\n";
$retval .= "</fieldset>\n";
$retval .= "<!-- ADD " . $name . " FORM END -->\n\n";

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

@ -38,7 +38,7 @@ function PMA_RTE_getList($type, $items)
$retval .= "<fieldset>\n";
$retval .= " <legend>\n";
$retval .= " " . PMA_RTE_getWord('title') . "\n";
$retval .= " " . PMA_Util::showMySQLDocu('SQL-Syntax', PMA_RTE_getWord('docu')) . "\n";
$retval .= " " . PMA_Util::showMySQLDocu(PMA_RTE_getWord('docu')) . "\n";
$retval .= " </legend>\n";
$retval .= " <div class='$class1' id='nothing2display'>\n";
$retval .= " " . PMA_RTE_getWord('nothing') . "\n";

12
libraries/server_engines.lib.php
View File

@ -5,7 +5,7 @@
* functions for displaying server engines
*
* @usedby server_engines.php
*
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -30,7 +30,7 @@ function PMA_getHtmlForServerEngines()
} else {
$html .= PMA_getHtmlForSpecifiedServerEngines();
}
return $html;
}
@ -75,7 +75,7 @@ function PMA_getHtmlForAllServerEngines()
unset($odd_row, $engine, $details);
$html .= '</tbody>' . "\n"
. '</table>' . "\n";
return $html;
}
@ -89,12 +89,12 @@ function PMA_getHtmlForSpecifiedServerEngines()
/**
* Displays details about a given Storage Engine
*/
$html = '';
$html = '';
$engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
$html .= '<h2>' . "\n"
. PMA_Util::getImage('b_engine.png')
. ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"
. ' ' . PMA_Util::showMySQLDocu('', $engine_plugin->getMysqlHelpPage())
. ' ' . PMA_Util::showMySQLDocu($engine_plugin->getMysqlHelpPage())
. "\n" . '</h2>' . "\n\n";
$html .= '<p>' . "\n"
. ' <em>' . "\n"
@ -139,7 +139,7 @@ function PMA_getHtmlForSpecifiedServerEngines()
. '</p>' . "\n"
. $engine_plugin->getHtmlVariables();
}
return $html;
}

96
libraries/server_status_monitor.lib.php
View File

@ -5,7 +5,7 @@
* functions for displaying server status sub item: monitor
*
* @usedby server_status_monitor.php
*
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -22,9 +22,9 @@ if (! defined('PHPMYADMIN')) {
function PMA_getHtmlForMonitor($ServerStatusData)
{
$retval = PMA_getHtmlForTabLinks();
$retval .= PMA_getHtmlForSettingsDialog();
$retval .= PMA_getHtmlForInstructionsDialog();
$retval .= PMA_getHtmlForAddChartDialog();
@ -120,7 +120,7 @@ function PMA_getHtmlForAnalyseDialog()
$retval .= '<p></p>';
$retval .= '<div class="placeHolder"></div>';
$retval .= '</div>';
return $retval;
}
@ -193,7 +193,7 @@ function PMA_getHtmlForInstructionsDialog()
$retval .= '</div>';
}
$retval .= '</div>';
return $retval;
}
@ -210,7 +210,7 @@ function PMA_getHtmlForAddChartDialog()
$retval .= '<input type="radio" name="chartType" value="preset" id="chartPreset" />';
$retval .= '<label for="chartPreset">' . __('Preset chart') . '</label>';
$retval .= '<select name="presetCharts"></select><br/>';
$retval .= '<input type="radio" name="chartType" value="variable" '
$retval .= '<input type="radio" name="chartType" value="variable" '
. 'id="chartStatusVar" checked="checked" />';
$retval .= '<label for="chartStatusVar">';
$retval .= __('Status variable(s)');
@ -271,7 +271,7 @@ function PMA_getHtmlForAddChartDialog()
$retval .= '</div>';
$retval .= '</div>';
$retval .= '</div>';
return $retval;
}
@ -303,7 +303,7 @@ function PMA_getHtmlForTabLinks()
}
/**
* Returns html with Settings dialog
* Returns html with Settings dialog
*
* @return string
*/
@ -392,10 +392,10 @@ function PMA_getHtmlForClientSideDataAndLinks($ServerStatusData)
* Define some links used on client side
*/
$links = '<div id="profiling_docu" class="hide">';
$links .= PMA_Util::showMySQLDocu('general-thread-states', 'general-thread-states');
$links .= PMA_Util::showMySQLDocu('general-thread-states');
$links .= '</div>';
$links .= '<div id="explain_docu" class="hide">';
$links .= PMA_Util::showMySQLDocu('explain-output', 'explain-output');
$links .= PMA_Util::showMySQLDocu('explain-output');
$links .= '</div>';
return $form . $links;
@ -415,7 +415,7 @@ function PMA_getJsonForChartingData()
$serverVars = array();
$sysinfo = $cpuload = $memory = 0;
$pName = '';
/* Accumulate all required variables and data */
// For each chart
foreach ($ret as $chart_id => $chartNodes) {
@ -424,7 +424,7 @@ function PMA_getJsonForChartingData()
// For each data point in the series (usually just 1)
foreach ($nodeDataPoints as $point_id => $dataPoint) {
$pName = $dataPoint['name'];
switch ($dataPoint['type']) {
/* We only collect the status and server variables here to
* read them all in one query,
@ -436,19 +436,19 @@ function PMA_getJsonForChartingData()
$serverVars[] = $pName;
}
break;
case 'statusvar':
if (! preg_match('/[^a-zA-Z_]+/', $pName)) {
$statusVars[] = $pName;
}
break;
case 'proc':
$result = $GLOBALS['dbi']->query('SHOW PROCESSLIST');
$ret[$chart_id][$node_id][$point_id]['value']
= $GLOBALS['dbi']->numRows($result);
break;
case 'cpu':
if (!$sysinfo) {
include_once 'libraries/sysinfo.lib.php';
@ -457,7 +457,7 @@ function PMA_getJsonForChartingData()
if (!$cpuload) {
$cpuload = $sysinfo->loadavg();
}
if (PMA_getSysInfoOs() == 'Linux') {
$ret[$chart_id][$node_id][$point_id]['idle']
= $cpuload['idle'];
@ -467,9 +467,9 @@ function PMA_getJsonForChartingData()
$ret[$chart_id][$node_id][$point_id]['value']
= $cpuload['loadavg'];
}
break;
case 'memory':
if (!$sysinfo) {
include_once 'libraries/sysinfo.lib.php';
@ -478,7 +478,7 @@ function PMA_getJsonForChartingData()
if (!$memory) {
$memory = $sysinfo->memory();
}
$ret[$chart_id][$node_id][$point_id]['value']
= $memory[$pName];
break;
@ -486,7 +486,7 @@ function PMA_getJsonForChartingData()
} /* foreach */
} /* foreach */
} /* foreach */
// Retrieve all required status variables
if (count($statusVars)) {
$statusVarValues = $GLOBALS['dbi']->fetchResult(
@ -498,7 +498,7 @@ function PMA_getJsonForChartingData()
} else {
$statusVarValues = array();
}
// Retrieve all required server variables
if (count($serverVars)) {
$serverVarValues = $GLOBALS['dbi']->fetchResult(
@ -510,7 +510,7 @@ function PMA_getJsonForChartingData()
} else {
$serverVarValues = array();
}
// ...and now assign them
foreach ($ret as $chart_id => $chartNodes) {
foreach ($chartNodes as $node_id => $nodeDataPoints) {
@ -528,7 +528,7 @@ function PMA_getJsonForChartingData()
}
}
}
$ret['x'] = microtime(true) * 1000;
return $ret;
}
@ -611,7 +611,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
$limitTypes
= 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ';
}
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, ';
$q .= 'server_id, argument, count(argument) as \'#\' ';
$q .= 'FROM `mysql`.`general_log` ';
@ -619,9 +619,9 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
$q .= 'AND event_time > FROM_UNIXTIME(' . $start . ') ';
$q .= 'AND event_time < FROM_UNIXTIME(' . $end . ') ';
$q .= $limitTypes . 'GROUP by argument'; // HAVING count > 1';
$result = $GLOBALS['dbi']->tryQuery($q);
$return = array('rows' => array(), 'sum' => array());
$type = '';
$insertTables = array();
@ -629,16 +629,16 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
$i = 0;
$removeVars = isset($_REQUEST['removeVariables'])
&& $_REQUEST['removeVariables'];
while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
preg_match('/^(\w+)\s/', $row['argument'], $match);
$type = strtolower($match[1]);
if (! isset($return['sum'][$type])) {
$return['sum'][$type] = 0;
}
$return['sum'][$type] += $row['#'];
switch($type) {
case 'insert':
// Group inserts if selected
@ -652,7 +652,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
if ($insertTables[$matches[2]] > 1) {
$return['rows'][$insertTablesFirst]['#']
= $insertTables[$matches[2]];
// Add a ... to the end of this query to indicate that
// there's been other queries
$temp = $return['rows'][$insertTablesFirst]['argument'];
@ -660,7 +660,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
$return['rows'][$insertTablesFirst]['argument']
.= '<br/>...';
}
// Group this value, thus do not add to the result list
continue 2;
} else {
@ -669,7 +669,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
}
}
// No break here
case 'update':
// Cut off big inserts and updates,
// but append byte count therefor
@ -687,20 +687,20 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
. ']';
}
break;
default:
break;
}
$return['rows'][] = $row;
$i++;
}
$return['sum']['TOTAL'] = array_sum($return['sum']);
$return['numRows'] = count($return['rows']);
$GLOBALS['dbi']->freeResult($result);
return $return;
}
/**
@ -715,15 +715,15 @@ function PMA_getJsonForLoggingVars()
if (! is_numeric($value)) {
$value="'" . $value . "'";
}
if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) {
$GLOBALS['dbi']->query(
'SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value
);
}
}
$loggingVars = $GLOBALS['dbi']->fetchResult(
'SHOW GLOBAL VARIABLES WHERE Variable_name IN'
. ' ("general_log","slow_query_log","long_query_time","log_output")',
@ -741,35 +741,35 @@ function PMA_getJsonForLoggingVars()
function PMA_getJsonForQueryAnalyzer()
{
$return = array();
if (strlen($_REQUEST['database'])) {
$GLOBALS['dbi']->selectDb($_REQUEST['database']);
}
if ($profiling = PMA_Util::profilingSupported()) {
$GLOBALS['dbi']->query('SET PROFILING=1;');
}
// Do not cache query
$query = preg_replace(
'/^(\s*SELECT)/i',
'\\1 SQL_NO_CACHE',
$_REQUEST['query']
);
$result = $GLOBALS['dbi']->tryQuery($query);
$return['affectedRows'] = $GLOBALS['cached_affected_rows'];
$result = $GLOBALS['dbi']->tryQuery('EXPLAIN ' . $query);
while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
$return['explain'][] = $row;
}
// In case an error happened
$return['error'] = $GLOBALS['dbi']->getError();
$GLOBALS['dbi']->freeResult($result);
if ($profiling) {
$return['profiling'] = array();
$result = $GLOBALS['dbi']->tryQuery(

13
libraries/server_status_queries.lib.php
View File

@ -5,7 +5,7 @@
* functions for displaying query statistics for the server
*
* @usedby server_status_queries.php
*
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -35,7 +35,6 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
);
$retval .= ' ';
$retval .= PMA_Util::showMySQLDocu(
'server-status-variables',
'server-status-variables',
false,
'statvar_Questions'
@ -47,14 +46,14 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
$retval .= '<br />';
$retval .= '&oslash; ' . __('per minute:') . ' ';
$retval .= PMA_Util::formatNumber(
$total_queries * 60 / $ServerStatusData->status['Uptime'],
$total_queries * 60 / $ServerStatusData->status['Uptime'],
0
);
$retval .= '<br />';
if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
$retval .= '&oslash; ' . __('per second:') . ' ';
$retval .= PMA_Util::formatNumber(
$total_queries / $ServerStatusData->status['Uptime'],
$total_queries / $ServerStatusData->status['Uptime'],
0
);
}
@ -82,11 +81,11 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
arsort($used_queries);
$odd_row = true;
//(- $ServerStatusData->status['Connections']);
$perc_factor = 100 / $total_queries;
$retval = '<table id="serverstatusqueriesdetails" '
$retval = '<table id="serverstatusqueriesdetails" '
. 'class="data sortable noclick">';
$retval .= '<col class="namecol" />';
$retval .= '<col class="valuecol" span="3" />';
@ -147,7 +146,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
}
$retval .= htmlspecialchars(json_encode($chart_json));
$retval .= '</div>';
return $retval;
}

29
libraries/server_status_variables.lib.php
View File

@ -5,7 +5,7 @@
* functions for displaying server status variables
*
* @usedby server_status_variables.php
*
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -37,7 +37,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
$retval = '';
$retval .= '<fieldset id="tableFilter">';
$retval .= '<legend>' . __('Filters') . '</legend>';
$retval .= '<form action="server_status_variables.php?'
$retval .= '<form action="server_status_variables.php?'
. PMA_generate_common_url() . '">';
$retval .= '<input type="submit" value="' . __('Refresh') . '" />';
$retval .= '<div class="formelement">';
@ -46,7 +46,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
. 'style="vertical-align: baseline;" value="' . $filterText . '" />';
$retval .= '</div>';
$retval .= '<div class="formelement">';
$retval .= '<input' . $filterAlert . ' type="checkbox" '
$retval .= '<input' . $filterAlert . ' type="checkbox" '
. 'name="filterAlert" id="filterAlert" />';
$retval .= '<label for="filterAlert">';
$retval .= __('Show only alert values');
@ -72,7 +72,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
$retval .= '</select>';
$retval .= '</div>';
$retval .= '<div class="formelement">';
$retval .= '<input' . $dontFormat . ' type="checkbox" '
$retval .= '<input' . $dontFormat . ' type="checkbox" '
. 'name="dontFormat" id="dontFormat" />';
$retval .= '<label for="dontFormat">';
$retval .= __('Show unformatted values');
@ -93,7 +93,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
*/
function PMA_getHtmlForLinkSuggestions($ServerStatusData)
{
$retval = '<div id="linkSuggestions" class="defaultLinks" '
$retval = '<div id="linkSuggestions" class="defaultLinks" '
. 'style="display:none">';
$retval .= '<p class="notice">' . __('Related links:');
foreach ($ServerStatusData->links as $section_name => $section_links) {
@ -104,7 +104,7 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData)
$retval .= ', ';
}
if ('doc' == $link_name) {
$retval .= PMA_Util::showMySQLDocu($link_url, $link_url);
$retval .= PMA_Util::showMySQLDocu($link_url);
} else {
$retval .= '<a href="' . $link_url . '">' . $link_name . '</a>';
}
@ -164,9 +164,9 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
'Table_locks_waited' => 0,
'Qcache_lowmem_prunes' => 0,
'Qcache_free_blocks' =>
'Qcache_free_blocks' =>
isset($ServerStatusData->server_status['Qcache_total_blocks'])
? $ServerStatusData->server_status['Qcache_total_blocks'] / 5
? $ServerStatusData->server_status['Qcache_total_blocks'] / 5
: 0,
'Slow_launch_threads' => 0,
@ -191,8 +191,8 @@ function PMA_getHtmlForVariablesList($ServerStatusData)
);
$retval .= PMA_getHtmlForRenderVariables(
$ServerStatusData,
$alerts,
$ServerStatusData,
$alerts,
$strShowStatus
);
@ -228,17 +228,16 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
$odd_row = !$odd_row;
$retval .= '<tr class="' . ($odd_row ? 'odd' : 'even')
. (isset($ServerStatusData->allocationMap[$name])
?' s_' . $ServerStatusData->allocationMap[$name]
?' s_' . $ServerStatusData->allocationMap[$name]
: '')
. '">';
$retval .= '<th class="name">';
$retval .= htmlspecialchars(str_replace('_', ' ', $name));
// Fields containing % are calculated,
// Fields containing % are calculated,
// they can not be described in MySQL documentation
if (strpos($name, '%') === false) {
$retval .= PMA_Util::showMySQLDocu(
'server-status-variables',
'server-status-variables',
false,
'statvar_' . $name
@ -289,7 +288,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
if (isset($ServerStatusData->links[$name])) {
foreach ($ServerStatusData->links[$name] as $link_name => $link_url) {
if ('doc' == $link_name) {
$retval .= PMA_Util::showMySQLDocu($link_url, $link_url);
$retval .= PMA_Util::showMySQLDocu($link_url);
} else {
$retval .= ' <a href="' . $link_url . '">' . $link_name . '</a>';
}
@ -301,7 +300,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
}
$retval .= '</tbody>';
$retval .= '</table>';
return $retval;
}

9
libraries/server_variables.lib.php
View File

@ -102,8 +102,8 @@ function PMA_getAjaxReturnForSetVal($variable_doc_links)
$response->addJSON(
'variable',
PMA_formatVariable(
$_REQUEST['varName'],
$varValue[1],
$_REQUEST['varName'],
$varValue[1],
$variable_doc_links
)
);
@ -239,7 +239,6 @@ function PMA_getHtmlForServerVariablesItems($variable_doc_links)
$output .= '<span title="'
. htmlspecialchars(str_replace('_', ' ', $name)) . '">';
$output .= PMA_Util::showMySQLDocu(
$variable_doc_links[$name][1],
$variable_doc_links[$name][1],
false,
$variable_doc_links[$name][2] . '_' . $variable_doc_links[$name][0],
@ -264,8 +263,8 @@ function PMA_getHtmlForServerVariablesItems($variable_doc_links)
. '<div class="var-name session">(' . __('Session value') . ')</div>'
. '<div class="var-value value">&nbsp;'
. PMA_formatVariable(
$name,
$serverVarsSession[$name],
$name,
$serverVarsSession[$name],
$variable_doc_links
) . '</div>'
. '<div style="clear:both"></div>'

164
libraries/sql.lib.php
View File

@ -186,7 +186,7 @@ function PMA_getTableHtmlForMultipleQueries(
$displayResultsObject->setProperties(
$unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func,
$is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage,
$GLOBALS['text_dir'], $is_maint, $is_explain, $is_show,
$GLOBALS['text_dir'], $is_maint, $is_explain, $is_show,
$showtable, $printview, $url_query, $editable
);
}
@ -399,7 +399,7 @@ function PMA_getHtmlForPrintViewHeader($db, $sql_query, $num_rows)
$response = PMA_Response::getInstance();
$header = $response->getHeader();
if (isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
PMA_Util::checkParameters(array('db', 'full_sql_query'));
PMA_Util::checkParameters(array('db', 'full_sql_query'));
$header->enablePrintView();
$hostname = '';
if ( $GLOBALS['cfg']['Server']['verbose']) {
@ -424,7 +424,7 @@ function PMA_getHtmlForPrintViewHeader($db, $sql_query, $num_rows)
. htmlspecialchars($db) . "<br />";
$print_view_header .= "<strong>" . __('Generation Time:') . "</strong> "
. PMA_Util::localisedDate() . "<br />";
$print_view_header .= "<strong>" . __('Generated by:')
$print_view_header .= "<strong>" . __('Generated by:')
. "</strong> $versions<br />";
$print_view_header .= "<strong>" . __('SQL query:') . "</strong> "
. htmlspecialchars($sql_query) . ";";
@ -436,7 +436,7 @@ function PMA_getHtmlForPrintViewHeader($db, $sql_query, $num_rows)
} else {
$print_view_header = null;
}
return $print_view_header;
}
@ -455,7 +455,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
if (isset($profiling_results)) {
$pma_token = $_SESSION[' PMA_token '];
$url_query = (isset($url_query) ? $url_query : PMA_generate_common_url($db));
$profiling_table = '';
$profiling_table .= '<fieldset><legend>' . __('Profiling')
. '</legend>' . "\n";
@ -466,15 +466,13 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
$profiling_table .= ' <th>' . __('Order')
. '<div class="sorticon"></div></th>' . "\n";
$profiling_table .= ' <th>' . __('State')
. PMA_Util::showMySQLDocu(
'general-thread-states', 'general-thread-states'
)
. PMA_Util::showMySQLDocu('general-thread-states')
. '<div class="sorticon"></div></th>' . "\n";
$profiling_table .= ' <th>' . __('Time')
. '<div class="sorticon"></div></th>' . "\n";
$profiling_table .= ' </tr></thead><tbody>' . "\n";
list($detailed_table, $chart_json, $profiling_stats)
= PMA_analyzeAndGetTableHtmlForProfilingResults($profiling_results);
= PMA_analyzeAndGetTableHtmlForProfilingResults($profiling_results);
$profiling_table .= $detailed_table;
$profiling_table .= '</tbody></table>' . "\n";
$profiling_table .= '</div>';
@ -484,9 +482,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
$profiling_table .= '<table id="profilesummarytable"><thead>' . "\n";
$profiling_table .= ' <tr>' . "\n";
$profiling_table .= ' <th>' . __('State')
. PMA_Util::showMySQLDocu(
'general-thread-states', 'general-thread-states'
)
. PMA_Util::showMySQLDocu('general-thread-states')
. '<div class="sorticon"></div></th>' . "\n";
$profiling_table .= ' <th>' . __('Total Time')
. '<div class="sorticon"></div></th>' . "\n";
@ -522,7 +518,7 @@ EOT;
$profiling_table .= '</script>';
$profiling_table .= '</fieldset>' . "\n";
} else {
$profiling_table = null;
$profiling_table = null;
}
return $profiling_table;
}
@ -530,9 +526,9 @@ EOT;
/**
* Function to get HTML for detailed profiling results table, profiling stats, and
* $chart_json for displaying the chart.
*
*
* @param array $profiling_results profiling results
*
*
* @return mixed
*/
function PMA_analyzeAndGetTableHtmlForProfilingResults(
@ -580,9 +576,9 @@ function PMA_analyzeAndGetTableHtmlForProfilingResults(
/**
* Function to get HTML for summary by state table
*
*
* @param array $profiling_stats profiling stats
*
*
* @return string $table html for the table
*/
function PMA_getTableHtmlForProfilingSummaryByState($profiling_stats)
@ -714,15 +710,15 @@ function PMA_getHtmlForOptionsList($values, $selected_values)
/**
* Function to get html for bookmark support if bookmarks are enabled. Else will
* return null
*
*
* @param string $disp_mode display mode
* @param bool $cfgBookmark configuration setting for bookmarking
* @param bool $cfgBookmark configuration setting for bookmarking
* @param string $sql_query sql query
* @param string $db current database
* @param string $table current table
* @param string $complete_query complete query
* @param string $bkm_user bookmarking user
*
*
* @return string $html
*/
function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $table,
@ -779,12 +775,12 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl
$html .= '<input type="submit"'
. ' value="' . __('Bookmark this SQL query') . '" />';
$html .= '</fieldset>';
$html .= '</form>';
$html .= '</form>';
} else {
$html = null;
}
return $html;
}
@ -1029,7 +1025,7 @@ function PMA_addBookmark($pmaAbsoluteUri, $goto)
} else {
// go back to sql.php to redisplay query; do not use &amp; in this case:
/**
* @todo In which scenario does this happen?
* @todo In which scenario does this happen?
*/
PMA_sendHeaderLocation(
$pmaAbsoluteUri . $goto
@ -1332,7 +1328,7 @@ function PMA_hasCurrentDbChanged($db)
* @param String $dropped_column dropped column if any
* @param bool $purge whether purge set or not
* @param array $extra_data extra data
*
*
* @return array $extra_data
*/
function PMA_cleanupRelations($db, $table, $dropped_column, $purge, $extra_data)
@ -1471,7 +1467,7 @@ function PMA_countQueryResults(
/**
* Function to handle all aspects relating to executing the query
*
*
* @param array $analyzed_sql_results analyzed sql results
* @param String $full_sql_query full sql query
* @param boolean $is_gotofile whether to go to a file
@ -1480,7 +1476,7 @@ function PMA_countQueryResults(
* @param boolean $find_real_end whether to find the real end
* @param String $import_text sql command
* @param array $extra_data extra data
*
*
* @return mixed
*/
function PMA_executeTheQuery($analyzed_sql_results, $full_sql_query, $is_gotofile,
@ -1738,9 +1734,9 @@ function PMA_sendQueryResponseForNoResultsReturned($analyzed_sql_results, $db,
/**
* Function to send response for ajax grid edit
*
*
* @param object $result result of the executed query
*
*
* @return void
*/
function PMA_sendResponseForGridEdit($result)
@ -1753,7 +1749,7 @@ function PMA_sendResponseForGridEdit($result)
/**
* Function to get html for the sql query results div
*
*
* @param string $previous_update_query_html html for the previously executed query
* @param string $profiling_chart_html html for profiling
* @param object $missing_unique_column_msg message for the missing unique column
@ -1763,7 +1759,7 @@ function PMA_sendResponseForGridEdit($result)
* @param string $indexes_problems_html html for displaying errors in indexes
* @param string $bookmark_support_html html for displaying bookmark form
* @param string $print_button_html html for the print button in printview
*
*
* @return string $html_output
*/
function PMA_getHtmlForSqlQueryResults($previous_update_query_html,
@ -1784,14 +1780,14 @@ function PMA_getHtmlForSqlQueryResults($previous_update_query_html,
$html_output .= isset($bookmark_support_html) ? $bookmark_support_html : '';
$html_output .= isset($print_button_html) ? $print_button_html : '';
$html_output .= '</div>'; // end sqlqueryresults div
return $html_output;
}
/**
* Returns a message for successful creation of a bookmark or null if a bookmark
* was not created
*
*
* @return object $bookmark_created_msg
*/
function PMA_getBookmarkCreatedMessage()
@ -1802,13 +1798,13 @@ function PMA_getBookmarkCreatedMessage()
} else {
$bookmark_created_msg = null;
}
return $bookmark_created_msg;
}
/**
* Function to get html for the sql query results table
*
*
* @param array $sql_data sql data
* @param object $displayResultsObject instance of DisplayResult.class
* @param string $db current database
@ -1823,7 +1819,7 @@ function PMA_getBookmarkCreatedMessage()
* @param bool $showtable whether to show table or not
* @param object $result result of the executed query
* @param array $analyzed_sql_results analyzed sql results
*
*
* @return type
*/
function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $db,
@ -1832,7 +1828,7 @@ function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $d
$analyzed_sql_results
) {
$printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1)
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1)
|| $analyzed_sql_results['is_procedure']
) {
$_SESSION['is_multi_query'] = true;
@ -1862,19 +1858,19 @@ function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $d
);
$GLOBALS['dbi']->freeResult($result);
}
return $table_html;
}
/**
* Function to get html for the previous query if there is such. If not will return
* null
*
*
* @param string $disp_query display query
* @param bool $showSql whether to show sql
* @param array $sql_data sql data
* @param string $disp_message display message
*
*
* @return string $previous_update_query_html
*/
function PMA_getHtmlForPreviousUpdateQuery($disp_query, $showSql, $sql_data,
@ -1888,18 +1884,18 @@ function PMA_getHtmlForPreviousUpdateQuery($disp_query, $showSql, $sql_data,
} else {
$previous_update_query_html = null;
}
return $previous_update_query_html;
}
/**
* To get the message if a column index is missing. If not will return null
*
*
* @param string $table current table
* @param string $db current database
* @param boolean $editable whether the results table can be editable or not
* @param string $disp_mode display mode
*
*
* @return object $message
*/
function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $disp_mode)
@ -1916,20 +1912,20 @@ function PMA_getMessageIfMissingColumnIndex($table, $db, $editable, $disp_mode)
} else {
$missing_unique_column_msg = null;
}
return $missing_unique_column_msg;
}
/**
* Function to get html to display problems in indexes
*
*
* @param string $query_type query type
* @param bool $selected whether check table, optimize table, analyze
* table or repair table has been selected with
* respect to the selected tables from the
* respect to the selected tables from the
* database structure page.
* @param string $db current database
*
*
* @return void
*/
function PMA_getHtmlForIndexesProblems($query_type, $selected, $db)
@ -1953,13 +1949,13 @@ function PMA_getHtmlForIndexesProblems($query_type, $selected, $db)
} else {
$indexes_problems_html = null;
}
return $indexes_problems_html;
}
/**
* Function to get the html for the print button in printview
*
*
* @return string $print_button_html html for the print button
*/
function PMA_getHtmlForPrintButton()
@ -1970,13 +1966,13 @@ function PMA_getHtmlForPrintButton()
} else {
$print_button_html = null;
}
return $print_button_html;
}
/**
* Function to display results when the executed query returns non empty results
*
*
* @param array $result executed query results
* @param bool $justBrowsing whether just browsing or not
* @param array $analyzed_sql_results analysed sql results
@ -1998,11 +1994,11 @@ function PMA_getHtmlForPrintButton()
* @param string $query_type query type
* @param bool $selected whether check table, optimize table, analyze
* table or repair table has been selected with
* respect to the selected tables from the
* respect to the selected tables from the
* database structure page.
* @param string $sql_query sql query
* @param string $complete_query complete sql query
*
*
* @return void
*/
function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
@ -2023,45 +2019,45 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
if (isset($result) && $result) {
$fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
}
// Should be initialized these parameters before parsing
$showtable = isset($showtable) ? $showtable : null;
$url_query = isset($url_query) ? $url_query : null;
$response = PMA_Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
// hide edit and delete links:
// - for information_schema
// - if the result set does not contain all the columns of a unique key
// and we are not just browing all the columns of an updatable view
$sele_exp_cls = $analyzed_sql_results['analyzed_sql'][0]['select_expr_clause'];
$updatableView
= $justBrowsing
&& trim($sele_exp_cls) == '*'
&& PMA_Table::isUpdatableView($db, $table);
$has_unique = PMA_resultSetContainsUniqueKey(
$db, $table, $fields_meta
);
$editable = $has_unique || $updatableView;
// Displays the results in a table
if (empty($disp_mode)) {
// see the "PMA_setDisplayMode()" function in
// libraries/DisplayResults.class.php
$disp_mode = 'urdr111101';
}
}
if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
$disp_mode = 'nnnn110111';
}
if ( isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
$disp_mode = 'nnnn000000';
}
if (isset($_REQUEST['table_maintenance'])) {
$scripts->addFile('makegrid.js');
$scripts->addFile('sql.js');
@ -2079,23 +2075,23 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
);
if (empty($sql_data) || ($sql_data['valid_queries'] = 1)) {
$response->addHTML($table_maintenance_html);
exit();
exit();
}
}
if (!isset($_REQUEST['printview']) || $_REQUEST['printview'] != '1') {
$scripts->addFile('makegrid.js');
$scripts->addFile('sql.js');
unset($GLOBALS['message']);
unset($GLOBALS['message']);
//we don't need to buffer the output in getMessage here.
//set a global variable and check against it in the function
$GLOBALS['buffer_message'] = false;
}
$print_view_header_html = PMA_getHtmlForPrintViewHeader(
$db, $full_sql_query, $num_rows
);
$previous_update_query_html = PMA_getHtmlForPreviousUpdateQuery(
isset($disp_query) ? $disp_query : null,
$GLOBALS['cfg']['ShowSQL'], isset($sql_data) ? $sql_data : null,
@ -2105,11 +2101,11 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
$profiling_chart_html = PMA_getHtmlForProfilingChart(
$disp_mode, $db, isset($profiling_results) ? $profiling_results : null
);
$missing_unique_column_msg = PMA_getMessageIfMissingColumnIndex(
$table, $db, $editable, $disp_mode
);
$bookmark_created_msg = PMA_getBookmarkCreatedMessage();
$table_html = PMA_getHtmlForSqlQueryResultsTable(
@ -2118,12 +2114,12 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
$editable, $unlim_num_rows, $num_rows, $showtable, $result,
$analyzed_sql_results
);
$indexes_problems_html = PMA_getHtmlForIndexesProblems(
isset($query_type) ? $query_type : null,
isset($selected) ? $selected : null, $db
);
$bookmark_support_html = PMA_getHtmlForBookmark(
$disp_mode,
isset($GLOBALS['cfg']['Bookmark']) ? $GLOBALS['cfg']['Bookmark'] : '',
@ -2133,26 +2129,26 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
);
$print_button_html = PMA_getHtmlForPrintButton();
$html_output = isset($table_maintenance_html) ? $table_maintenance_html : '';
$html_output .= isset($print_view_header_html) ? $print_view_header_html : '';
$html_output .= PMA_getHtmlForSqlQueryResults(
$previous_update_query_html, $profiling_chart_html,
$missing_unique_column_msg, $bookmark_created_msg,
$table_html, $indexes_problems_html, $bookmark_support_html,
$print_button_html
);
$response->addHTML($html_output);
$response->addHTML($html_output);
exit();
}
/**
* Function to send response for both empty results and non empty results
*
*
* @param int $num_rows number of rows returned by the executed query
* @param int $unlim_num_rows unlimited number of rows
* @param bool $is_affected is affected
@ -2177,11 +2173,11 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
* @param string $query_type query type
* @param bool $selected whether check table, optimize table, analyze
* table or repair table has been selected with
* respect to the selected tables from the
* respect to the selected tables from the
* database structure page.
* @param string $sql_query sql query
* @param string $complete_query complete query
*
*
* @return void
*/
function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
@ -2200,7 +2196,7 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
);
} else {
// At least one row is returned -> displays a table with results
// At least one row is returned -> displays a table with results
PMA_sendQueryResponseForResultsReturned(
isset($result) ? $result : null, $justBrowsing, $analyzed_sql_results,
$db, $table, isset($disp_mode) ? $disp_mode : null,
@ -2219,7 +2215,7 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
/**
* Function to execute the query and send the response
*
*
* @param array $analyzed_sql_results analysed sql results
* @param bool $is_gotofile whether goto file or not
* @param string $db current database
@ -2240,10 +2236,10 @@ function PMA_sendQueryResponse($num_rows, $unlim_num_rows, $is_affected,
* @param string $sql_query sql query
* @param bool $selected whether check table, optimize table, analyze
* table or repair table has been selected with
* respect to the selected tables from the
* respect to the selected tables from the
* database structure page.
* @param string $complete_query complete query
*
*
* @return void
*/
function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
@ -2262,7 +2258,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
);
$displayResultsObject->setConfigParamsForDisplayTable();
// assign default full_sql_query
$full_sql_query = $sql_query;
@ -2284,7 +2280,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
}
$reload = PMA_hasCurrentDbChanged($db);
// Execute the query
list($result, $num_rows, $unlim_num_rows, $profiling_results,
$justBrowsing, $extra_data

2
libraries/sql_query_form.lib.php
View File

@ -238,7 +238,7 @@ function PMA_sqlQueryFormInsert(
);
}
}
$legend .= ': ' . PMA_Util::showMySQLDocu('SQL-Syntax', 'SELECT');
$legend .= ': ' . PMA_Util::showMySQLDocu('SELECT');
if (count($fields_list)) {
$sqlquerycontainer_id = 'sqlquerycontainer';

4
libraries/structure.lib.php
View File

@ -1522,9 +1522,7 @@ function PMA_getHtmlForOptionalActionLinks($url_query, $tbl_is_view,
true
)
. '</a>';
$html_output .= PMA_Util::showMySQLDocu(
'Extending_MySQL', 'procedure_analyse'
) . "\n";
$html_output .= PMA_Util::showMySQLDocu('procedure_analyse') . "\n";
}
if (PMA_Tracker::isActive()) {
$html_output .= '<a href="tbl_tracking.php?' . $url_query . '">'

8
libraries/tbl_columns_definition_form.lib.php
View File

@ -70,7 +70,7 @@ function PMA_getHtmlForTableConfigurations()
. '<th>' . __('Table comments:') . '</th>'
. '<td width="25">&nbsp;</td>'
. '<th>' . __('Storage Engine:')
. PMA_Util::showMySQLDocu('Storage_engines', 'Storage_engines')
. PMA_Util::showMySQLDocu('Storage_engines')
. '</th>'
. '<td width="25">&nbsp;</td>'
. '<th>' . __('Collation:') . '</th>'
@ -108,7 +108,7 @@ function PMA_getHtmlForTableConfigurations()
if (PMA_Partition::havePartitioning()) {
$html .= '<tr class="vtop">'
. '<th>' . __('PARTITION definition:') . '&nbsp;'
. PMA_Util::showMySQLDocu('Partitioning', 'Partitioning')
. PMA_Util::showMySQLDocu('Partitioning')
. '</th>'
. '</tr>'
. '<tr>'
@ -197,7 +197,7 @@ function PMA_getHtmlForTableFieldDefinitions($header_cells, $content_cells)
{
$html = '<table id="table_columns" class="noclick">';
$html .= '<caption class="tblHeaders">' . __('Structure')
. PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>';
. PMA_Util::showMySQLDocu('CREATE_TABLE') . '</caption>';
$html .= '<tr>';
foreach ($header_cells as $header_val) {
@ -274,7 +274,7 @@ function PMA_getHeaderCells($is_backup, $fields_meta, $mimework, $db, $table)
$header_cells = array();
$header_cells[] = __('Name');
$header_cells[] = __('Type')
. PMA_Util::showMySQLDocu('SQL-Syntax', 'data-types');
. PMA_Util::showMySQLDocu('data-types');
$header_cells[] = __('Length/Values')
. PMA_Util::showHint(
__(

4
server_variables.php
View File

@ -42,9 +42,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
/**
* Displays the sub-page heading
*/
$doc_link = PMA_Util::showMySQLDocu(
'server_system_variables', 'server_system_variables'
);
$doc_link = PMA_Util::showMySQLDocu('server_system_variables');
$response->addHtml(PMA_getHtmlForSubPageHeader('variables', $doc_link));
/**

2
tbl_relation.php
View File

@ -286,7 +286,7 @@ if (isset($destination_foreign_db)) {
);
}
$html_output .= PMA_Util::showMySQLDocu(
'manual_Table_types', 'InnoDB_foreign_key_constraints'
'InnoDB_foreign_key_constraints'
) . "\n";
}