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

Merge pull request #403 from xmujay/0602

Browse Source 
refactor server_status.php: 1. using better function name 2. split long lines
This commit is contained in:
Marc Delisle 2013-06-04 09:58:42 -07:00
commit 1c60c2ba3b
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server_status.php
View File

@ -46,31 +46,31 @@ if (! empty($_REQUEST['kill'])) {
$response = PMA_Response::getInstance();
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(PMA_getServerTrafficHtml($ServerStatusData));
$response->addHTML(PMA_getServerStatusHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
/**
* Prints server traffic information
* Prints server status information: processes, connections and traffic
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getServerTrafficHtml($ServerStatusData)
function PMA_getServerStatusHtml($ServerStatusData)
{
//display the server state General Information
$retval = PMA_getServerStateGeneralInfoHtml($ServerStatusData);
//display the server state traffic
//display the server state traffic information
$retval .= PMA_getServerStateTrafficHtml($ServerStatusData);
//display the server state connection information
$retval .= PMA_getServerStateConnectionsHtml($ServerStatusData);
//display the Table Process List information
$retval .= PMA_getTableProcesslistHtml($ServerStatusData);
//display the server Process List information
$retval .= PMA_getServerProcesslistHtml($ServerStatusData);
return $retval;
}
@ -338,13 +338,13 @@ function PMA_getServerStateConnectionsHtml($ServerStatusData)
}
/**
* Prints Table Process list
* Prints Server Process list
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function PMA_getTableProcesslistHtml($ServerStatusData)
function PMA_getServerProcesslistHtml($ServerStatusData)
{
$url_params = array();
@ -399,6 +399,8 @@ function PMA_getTableProcesslistHtml($ServerStatusData)
$sortable_columns_count = count($sortable_columns);
if (PMA_DRIZZLE) {
$left_str = 'left(p.info, '
. (int)$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] . ')';
$sql_query = "SELECT
p.id AS Id,
p.username AS User,
@ -406,14 +408,17 @@ function PMA_getTableProcesslistHtml($ServerStatusData)
p.db AS db,
p.command AS Command,
p.time AS Time,
p.state AS State,
" . ($show_full_sql ? 's.query' : 'left(p.info, ' . (int)$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] . ')') . " AS Info
FROM data_dictionary.PROCESSLIST p
" . ($show_full_sql ? 'LEFT JOIN data_dictionary.SESSIONS s ON s.session_id = p.id' : '');
p.state AS State,"
. ($show_full_sql ? 's.query' : $left_str )
. " AS Info FROM data_dictionary.PROCESSLIST p "
. ($show_full_sql
? 'LEFT JOIN data_dictionary.SESSIONS s ON s.session_id = p.id'
: '');
if (! empty($_REQUEST['order_by_field'])
&& ! empty($_REQUEST['sort_order'])
) {
$sql_query .= ' ORDER BY p.' . $_REQUEST['order_by_field'] . ' ' . $_REQUEST['sort_order'];
$sql_query .= ' ORDER BY p.' . $_REQUEST['order_by_field'] . ' '
. $_REQUEST['sort_order'];
}
} else {
$sql_query = $show_full_sql
@ -520,7 +525,9 @@ function PMA_getTableProcesslistHtml($ServerStatusData)
$retval .= '<td class="value">' . $process['Id'] . '</td>';
$retval .= '<td>' . $process['User'] . '</td>';
$retval .= '<td>' . $process['Host'] . '</td>';
$retval .= '<td>' . ((! isset($process['db']) || ! strlen($process['db'])) ? '<i>' . __('None') . '</i>' : $process['db']) . '</td>';
$retval .= '<td>' . ((! isset($process['db']) || ! strlen($process['db']))
? '<i>' . __('None') . '</i>'
: $process['db']) . '</td>';
$retval .= '<td>' . $process['Command'] . '</td>';
$retval .= '<td class="value">' . $process['Time'] . '</td>';
$retval .= '<td>' . (empty($process['State']) ? '---' : $process['State']) . '</td>';
@ -530,7 +537,8 @@ function PMA_getTableProcesslistHtml($ServerStatusData)
$retval .= '---';
} else {
if (! $show_full_sql && strlen($process['Info']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
$retval .= htmlspecialchars(substr($process['Info'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
$retval .= htmlspecialchars(substr($process['Info'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']))
. '[...]';
} else {
$retval .= '<code class="sql"><pre>'
. $process['Info']