From 0ebf0a13246244cb1dbfd6f6779084e85a2fcb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 10 May 2013 09:42:17 +0200
Subject: [PATCH] Consistent function naming and corrected documentation

---
 server_status_advisor.php | 10 ++++------
 server_status_monitor.php | 18 +++++++-----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/server_status_advisor.php b/server_status_advisor.php
index 292c37d288..c2948e3fa5 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -28,19 +28,17 @@ $scripts->addFile('server_status_advisor.js');
  */
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getPrintAdvisorHtml($ServerStatusData));
+$response->addHTML(PMA_getAdvisorHtml($ServerStatusData));
 $response->addHTML('</div>');
 exit;
 
 
 /**
- * Prints html with Advisor
- *
- * @param null
+ * Returns html with Advisor
  *
  * @return string
  */
-function getPrintAdvisorHtml()
+function PMA_getAdvisorHtml()
 {
 	$output  = '<a href="#openAdvisorInstructions">';
 	$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
@@ -84,7 +82,7 @@ function getPrintAdvisorHtml()
 	    )
 	);
 	$output .= '</div>';
- 
+
 	return $output;
 }
 
diff --git a/server_status_monitor.php b/server_status_monitor.php
index 567ac75c40..ec676d64a2 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -452,7 +452,7 @@ $links .= '</div>';
  */
 $response->addHTML('<div>');
 $response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(getPrintMonitorHtml($ServerStatusData));
+$response->addHTML(PMA_getMonitorHtml($ServerStatusData));
 $response->addHTML($form);
 $response->addHTML($links);
 $response->addHTML('</div>');
@@ -465,9 +465,9 @@ exit;
  *
  * @return string
  */
-function getPrintMonitorHtml($ServerStatusData)
+function PMA_getMonitorHtml($ServerStatusData)
 {
-    $retval = getTabLinksHtml();
+    $retval = PMA_getTabLinksHtml();
     $retval .= getPopContentHtml();
 
     $retval .= '<div id="monitorInstructionsDialog" title="';
@@ -684,13 +684,11 @@ function PMA_getRefreshList($name,
 }
 
 /**
- * Prints html with Tab Links
- *
- * @param null
+ * Returns html with Tab Links
  *
  * @return string
  */
-function getTabLinksHtml()
+function PMA_getTabLinksHtml()
 {
     $retval  = '<div class="tabLinks">';
     $retval .= '<a href="#pauseCharts">';
@@ -708,14 +706,12 @@ function getTabLinksHtml()
     $retval .= __('Done rearranging/editing charts');
     $retval .= '</a>';
     $retval .= '</div>';
-    
+
     return $retval;
 }
 
 /**
- * Prints html with Pop Content
- *
- * @param null
+ * Returns html with Pop Content
  *
  * @return string
  */