Merge branch 'master' into DBI_naming_cleanUp2

Conflicts:
	sql.php

1 files changed, 25 insertions, 10 deletions

diff --git a/server_status.php b/server_status.php
index 22a2558e28..6ff1ae0127 100644
--- a/server_status.php
+++ b/server_status.php
@@ -60,6 +60,30 @@ exit;
  */
 function getServerTrafficHtml($ServerStatusData)
 {
+    //display the server state General Information
+    $retval  = getServerStateGeneralInfoHtml($ServerStatusData);
+
+    //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 General information
+ *
+ * @param Object $ServerStatusData An instance of the PMA_ServerStatusData class
+ *
+ * @return string
+ */
+function getServerStateGeneralInfoHtml($ServerStatusData)
+{ 
     $hour_factor    = 3600 / $ServerStatusData->status['Uptime'];
     $start_time = PMA_DBI_fetchValue(
         'SELECT UNIX_TIMESTAMP() - ' . $ServerStatusData->status['Uptime']
@@ -127,16 +151,7 @@ function getServerTrafficHtml($ServerStatusData)
             }
         }
     }
-
-    //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;
 }