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

refactor function naming on server view files

Browse Source
This commit is contained in:
xmujay 2013-05-15 23:58:50 +08:00
parent b07df01340
commit 87ec31ce5f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server_status.php
View File

@ -46,7 +46,7 @@ if (! empty($_REQUEST['kill'])) {
$response = PMA_Response::getInstance();
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(getServerTrafficHtml($ServerStatusData));
$response->addHTML(PMA_getServerTrafficHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
@ -58,19 +58,19 @@ exit;
*
* @return string
*/
function getServerTrafficHtml($ServerStatusData)
function PMA_getServerTrafficHtml($ServerStatusData)
{
//display the server state General Information
$retval = getServerStateGeneralInfoHtml($ServerStatusData);
$retval = PMA_getServerStateGeneralInfoHtml($ServerStatusData);
//display the server state traffic
$retval .= getServerStateTrafficHtml($ServerStatusData);
$retval .= PMA_getServerStateTrafficHtml($ServerStatusData);
//display the server state connection information
$retval .= getServerStateConnectionsHtml($ServerStatusData);
$retval .= PMA_getServerStateConnectionsHtml($ServerStatusData);
//display the Table Process List information
$retval .= getTableProcesslistHtml($ServerStatusData);
$retval .= PMA_getTableProcesslistHtml($ServerStatusData);
return $retval;
}
@ -82,7 +82,7 @@ function getServerTrafficHtml($ServerStatusData)
*
* @return string
*/
function getServerStateGeneralInfoHtml($ServerStatusData)
function PMA_getServerStateGeneralInfoHtml($ServerStatusData)
{
$start_time = PMA_DBI_fetchValue(
'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
@ -161,7 +161,7 @@ function getServerStateGeneralInfoHtml($ServerStatusData)
*
* @return string
*/
function getServerStateTrafficHtml($ServerStatusData)
function PMA_getServerStateTrafficHtml($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$retval = '<table id="serverstatustraffic" class="data noclick">';
@ -250,7 +250,7 @@ function getServerStateTrafficHtml($ServerStatusData)
*
* @return string
*/
function getServerStateConnectionsHtml($ServerStatusData)
function PMA_getServerStateConnectionsHtml($ServerStatusData)
{
$hour_factor = 3600 / $ServerStatusData->status['Uptime'];
$retval = '<table id="serverstatusconnections" class="data noclick">';
@ -349,7 +349,7 @@ function getServerStateConnectionsHtml($ServerStatusData)
*
* @return string
*/
function getTableProcesslistHtml($ServerStatusData)
function PMA_getTableProcesslistHtml($ServerStatusData)
{
$url_params = array();

8
server_status_queries.php
View File

@ -42,7 +42,7 @@ $scripts->addFile('server_status_sorter.js');
// Add the html content to the response
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(getQueryStatisticsHtml($ServerStatusData));
$response->addHTML(PMA_getQueryStatisticsHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
@ -53,7 +53,7 @@ exit;
*
* @return string
*/
function getQueryStatisticsHtml($ServerStatusData)
function PMA_getQueryStatisticsHtml($ServerStatusData)
{
$retval = '';
@ -89,7 +89,7 @@ function getQueryStatisticsHtml($ServerStatusData)
$retval .= '</span>';
$retval .= '</h3>';
$retval .= getServerStatusQueriesDetailsHtml($ServerStatusData);
$retval .= PMA_getServerStatusQueriesDetailsHtml($ServerStatusData);
return $retval;
}
@ -101,7 +101,7 @@ function getQueryStatisticsHtml($ServerStatusData)
*
* @return string
*/
function getServerStatusQueriesDetailsHtml($ServerStatusData)
function PMA_getServerStatusQueriesDetailsHtml($ServerStatusData)
{
$used_queries = $ServerStatusData->used_queries;
$total_queries = array_sum($used_queries);