From bc97eaeb2dbe7c1a57d2172ecccc80fd3e8cf007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 21 Jan 2010 13:48:40 +0000
Subject: [PATCH] + rfe #1954161 [interface] Do not display long numbers in
 server status.

---
 ChangeLog         |  1 +
 server_status.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 424512ad8..6275ee68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + rfe #2393597 [core] phpMyAdmin honors https in PmaAbsoluteUri.
 + rfe #1778337 [core] Try moving tables by RENAME and fail to CREATE/INSERT if that fails.
 + rfe #1721189 [core] Force reload js on code change.
++ rfe #1954161 [interface] Do not display long numbers in server status.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/server_status.php b/server_status.php
index 64048b311..82ec52da9 100644
--- a/server_status.php
+++ b/server_status.php
@@ -391,34 +391,34 @@ foreach ($sections as $section_name => $section) {
     <th class="name"><?php echo $strReceived; ?></th>
     <td class="value"><?php echo
         implode(' ',
-            PMA_formatByteDown($server_status['Bytes_received'], 4)); ?></td>
+            PMA_formatByteDown($server_status['Bytes_received'], 2, 1)); ?></td>
     <td class="value"><?php echo
         implode(' ',
             PMA_formatByteDown(
-                $server_status['Bytes_received'] * $hour_factor, 4)); ?></td>
+                $server_status['Bytes_received'] * $hour_factor, 2, 1)); ?></td>
 </tr>
 <tr class="even">
     <th class="name"><?php echo $strSent; ?></th>
     <td class="value"><?php echo
         implode(' ',
-            PMA_formatByteDown($server_status['Bytes_sent'], 4)); ?></td>
+            PMA_formatByteDown($server_status['Bytes_sent'], 2, 1)); ?></td>
     <td class="value"><?php echo
         implode(' ',
             PMA_formatByteDown(
-                $server_status['Bytes_sent'] * $hour_factor, 4)); ?></td>
+                $server_status['Bytes_sent'] * $hour_factor, 2, 1)); ?></td>
 </tr>
 <tr class="odd">
     <th class="name"><?php echo $strTotalUC; ?></th>
     <td class="value"><?php echo
         implode(' ',
             PMA_formatByteDown(
-                $server_status['Bytes_received'] + $server_status['Bytes_sent'], 4)
+                $server_status['Bytes_received'] + $server_status['Bytes_sent'], 2, 1)
         ); ?></td>
     <td class="value"><?php echo
         implode(' ',
             PMA_formatByteDown(
                 ($server_status['Bytes_received'] + $server_status['Bytes_sent'])
-                * $hour_factor, 4)
+                * $hour_factor, 2, 1)
         ); ?></td>
 </tr>
 </tbody>
@@ -666,9 +666,9 @@ if (! empty($section['title'])) {
             if ('%' === substr($name, -1, 1)) {
                 echo PMA_formatNumber($value, 0, 2) . ' %';
             } elseif (is_numeric($value) && $value == (int) $value) {
-                echo PMA_formatNumber($value, 4, 0);
+                echo PMA_formatNumber($value, 3, 1);
             } elseif (is_numeric($value)) {
-                echo PMA_formatNumber($value, 4, 2);
+                echo PMA_formatNumber($value, 3, 1);
             } else {
                 echo htmlspecialchars($value);
             }