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

rename the function to a meaningful name

Browse Source
This commit is contained in:
xmujay 2013-06-13 14:49:25 +08:00
parent 438c84178f
commit 6acdec1aef
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/server_status_monitor.lib.php
View File

@ -19,11 +19,11 @@ if (! defined('PHPMYADMIN')) {
*
* @return string
*/
function PMA_getMonitorHtml($ServerStatusData)
function PMA_getHtmlForMonitor($ServerStatusData)
{
$retval = PMA_getTabLinksHtml();
$retval = PMA_getHtmlForTabLinks();
$retval .= PMA_getPopContentHtml();
$retval .= PMA_getHtmlForPopContent();
$retval .= PMA_getHtmlForInstructionsDialog();
@ -64,7 +64,7 @@ function PMA_getMonitorHtml($ServerStatusData)
*
* @return string
*/
function PMA_getRefreshList($name,
function PMA_getHtmlForRefreshList($name,
$defaultRate = 5,
$refreshRates = Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)
) {
@ -279,7 +279,7 @@ function PMA_getHtmlForAddChartDialog()
*
* @return string
*/
function PMA_getTabLinksHtml()
function PMA_getHtmlForTabLinks()
{
$retval = '<div class="tabLinks">';
$retval .= '<a href="#pauseCharts">';
@ -306,7 +306,7 @@ function PMA_getTabLinksHtml()
*
* @return string
*/
function PMA_getPopContentHtml()
function PMA_getHtmlForPopContent()
{
$retval = '<div class="popupContent settingsPopup">';
$retval .= '<a href="#addNewChart">';
@ -318,7 +318,7 @@ function PMA_getPopContentHtml()
$retval .= '<div class="clearfloat paddingtop"></div>';
$retval .= '<div class="floatleft">';
$retval .= __('Refresh rate') . '<br />';
$retval .= PMA_getRefreshList(
$retval .= PMA_getHtmlForRefreshList(
'gridChartRefresh',
5,
Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
@ -375,7 +375,7 @@ function PMA_getPopContentHtml()
*
* @return string
*/
function PMA_getClientSideDataAndLinksHtml($ServerStatusData)
function PMA_getHtmlForClientSideDataAndLinks($ServerStatusData)
{
/**
* Define some data needed on the client side

4
server_status_monitor.php
View File

@ -433,8 +433,8 @@ $ServerStatusData = new PMA_ServerStatusData();
*/
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(PMA_getMonitorHtml($ServerStatusData));
$response->addHTML(PMA_getClientSideDataAndLinksHtml($ServerStatusData));
$response->addHTML(PMA_getHtmlForMonitor($ServerStatusData));
$response->addHTML(PMA_getHtmlForClientSideDataAndLinks($ServerStatusData));
$response->addHTML('</div>');
exit;