From e57e6089c7796944445005a5ed502a72b835520b Mon Sep 17 00:00:00 2001 From: xmujay Date: Tue, 25 Jun 2013 23:16:10 +0800 Subject: [PATCH] refactor function names --- libraries/server_status_variables.lib.php | 22 +++++++++++++++++++--- server_status_variables.php | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php index 96162caf86..e0559d8096 100644 --- a/libraries/server_status_variables.lib.php +++ b/libraries/server_status_variables.lib.php @@ -122,7 +122,7 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData) * * @return string */ -function PMA_getHtmlForVariablesTable($ServerStatusData) +function PMA_getHtmlForVariablesList($ServerStatusData) { $retval = ''; $strShowStatus = PMA_getStatusVariablesDescriptions(); @@ -184,7 +184,23 @@ function PMA_getHtmlForVariablesTable($ServerStatusData) //'Handler read key' => '> ', ); - $retval .= ''; + $retval .= PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus); + + return $retval; +} + +/** + * Returns HTML for render variables list + * + * @param Object $ServerStatusData An instance of the PMA_ServerStatusData class + * @param Array $alerts Alert Array + * @param Array $strShowStatus Status Array + * + * @return string + */ +function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatus) +{ + $retval = '
'; $retval .= ''; $retval .= ''; $retval .= ''; @@ -272,7 +288,7 @@ function PMA_getHtmlForVariablesTable($ServerStatusData) } $retval .= ''; $retval .= '
'; - + return $retval; } diff --git a/server_status_variables.php b/server_status_variables.php index 6f83e02b20..fe93501e1c 100644 --- a/server_status_variables.php +++ b/server_status_variables.php @@ -48,7 +48,7 @@ $response->addHTML('
'); $response->addHTML($ServerStatusData->getMenuHtml()); $response->addHTML(PMA_getHtmlForFilter($ServerStatusData)); $response->addHTML(PMA_getHtmlForLinkSuggestions($ServerStatusData)); -$response->addHTML(PMA_getHtmlForVariablesTable($ServerStatusData)); +$response->addHTML(PMA_getHtmlForVariablesList($ServerStatusData)); $response->addHTML('
'); exit;