From 06bd2d22ebfa48364d7a52c810eb86d5f331ee5f Mon Sep 17 00:00:00 2001 From: xmujay Date: Tue, 16 Jul 2013 21:48:32 +0800 Subject: [PATCH] fix the code style --- libraries/server_status.lib.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php index 859013120a..ab3eb3d217 100644 --- a/libraries/server_status.lib.php +++ b/libraries/server_status.lib.php @@ -50,12 +50,14 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData) ); $retval = '

'; + $bytes_received = $ServerStatusData->status['Bytes_received']; + $bytes_sent = $ServerStatusData->status['Bytes_sent']; $retval .= sprintf( __('Network traffic since startup: %s'), implode( ' ', PMA_Util::formatByteDown( - $ServerStatusData->status['Bytes_received'] + $ServerStatusData->status['Bytes_sent'], + $bytes_received + $bytes_sent, 3, 1 ) @@ -177,19 +179,22 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData) $retval .= ''; $retval .= '' . __('Total') . ''; $retval .= ''; + $bytes_received = $ServerStatusData->status['Bytes_received']; + $bytes_sent = $ServerStatusData->status['Bytes_sent']; $retval .= implode( ' ', PMA_Util::formatByteDown( - $ServerStatusData->status['Bytes_received'] + $ServerStatusData->status['Bytes_sent'], 3, 1 + $bytes_received + $bytes_sent, 3, 1 ) ); $retval .= ''; $retval .= ''; + $bytes_received = $ServerStatusData->status['Bytes_received']; + $bytes_sent = $ServerStatusData->status['Bytes_sent']; $retval .= implode( ' ', PMA_Util::formatByteDown( - ($ServerStatusData->status['Bytes_received'] + $ServerStatusData->status['Bytes_sent']) - * $hour_factor, 3, 1 + ($bytes_received + $bytes_sent) * $hour_factor, 3, 1 ) ); $retval .= ''; @@ -242,8 +247,11 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData) $retval .= ''; $retval .= ''; if ($ServerStatusData->status['Connections'] > 0) { + $abortNum = $ServerStatusData->status['Aborted_connects']; + $connectNum = $ServerStatusData->status['Connections']; + $retval .= PMA_Util::formatNumber( - $ServerStatusData->status['Aborted_connects'] * 100 / $ServerStatusData->status['Connections'], + $abortNum * 100 / $connectNum, 0, 2, true ); $retval .= '%'; @@ -266,8 +274,11 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData) $retval .= ''; $retval .= ''; if ($ServerStatusData->status['Connections'] > 0) { + $abortNum = $ServerStatusData->status['Aborted_clients']; + $connectNum = $ServerStatusData->status['Connections']; + $retval .= PMA_Util::formatNumber( - $ServerStatusData->status['Aborted_clients'] * 100 / $ServerStatusData->status['Connections'], + $abortNum * 100 / $connectNum, 0, 2, true ); $retval .= '%';