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

Merge pull request #297 from xmujay/refactor_procedure

Browse Source 
[Server view refactor] split the long function (getServerTrafficHtml) into three functions
This commit is contained in:
J.M. 2013-05-01 08:18:54 -07:00
commit 6b09cbae53
1 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
server_status.php
View File

@ -128,7 +128,28 @@ function getServerTrafficHtml($ServerStatusData)
}
}
$retval .= '<table id="serverstatustraffic" class="data noclick">';
//display the server state traffic
$retval .= getServerStateTrafficHtml($ServerStatusData);
//display the server state connection information
$retval .= getServerStateConnectionsHtml($ServerStatusData);
//display the Table Process List information
$retval .= getTableProcesslistHtml($ServerStatusData);
return $retval;
}
/**
* Prints server state traffic information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function getServerStateTrafficHtml($ServerStatusData)
{
$retval = '<table id="serverstatustraffic" class="data noclick">';
$retval .= '<thead>';
$retval .= '<tr>';
$retval .= '<th colspan="2">';
@ -203,9 +224,20 @@ function getServerTrafficHtml($ServerStatusData)
$retval .= '</td>';
$retval .= '</tr>';
$retval .= '</tbody>';
$retval .= '</table>';
$retval .= '</table>';
return $retval;
}
$retval .= '<table id="serverstatusconnections" class="data noclick">';
/**
* Prints server state connections information
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function getServerStateConnectionsHtml($ServerStatusData)
{
$retval = '<table id="serverstatusconnections" class="data noclick">';
$retval .= '<thead>';
$retval .= '<tr>';
$retval .= '<th colspan="2">' . __('Connections') . '</th>';
@ -291,6 +323,18 @@ function getServerTrafficHtml($ServerStatusData)
$retval .= '</tbody>';
$retval .= '</table>';
return $retval;
}
/**
* Prints Table Process list
*
* @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
*
* @return string
*/
function getTableProcesslistHtml($ServerStatusData)
{
$url_params = array();
$show_full_sql = ! empty($_REQUEST['full']);
@ -373,11 +417,8 @@ function getServerTrafficHtml($ServerStatusData)
}
$result = PMA_DBI_query($sql_query);
/**
* Displays the page
*/
$retval .= '<table id="tableprocesslist" class="data clearfloat noclick sortable">';
$retval = '<table id="tableprocesslist" class="data clearfloat noclick sortable">';
$retval .= '<thead>';
$retval .= '<tr>';
$retval .= '<th>' . __('Processes') . '</th>';