+ rfe #1954161 [interface] Do not display long numbers in server status.

This commit is contained in:
Michal Čihař
2010-01-21 13:48:40 +00:00
parent 67ae2130e7
commit bc97eaeb2d
2 changed files with 9 additions and 8 deletions

View File

@@ -19,6 +19,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ rfe #2393597 [core] phpMyAdmin honors https in PmaAbsoluteUri. + 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 #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 #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) 3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields, + rfe #2308632 [edit] Use hex for (var)binary fields,

View File

@@ -391,34 +391,34 @@ foreach ($sections as $section_name => $section) {
<th class="name"><?php echo $strReceived; ?></th> <th class="name"><?php echo $strReceived; ?></th>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown($server_status['Bytes_received'], 4)); ?></td> PMA_formatByteDown($server_status['Bytes_received'], 2, 1)); ?></td>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown( PMA_formatByteDown(
$server_status['Bytes_received'] * $hour_factor, 4)); ?></td> $server_status['Bytes_received'] * $hour_factor, 2, 1)); ?></td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th class="name"><?php echo $strSent; ?></th> <th class="name"><?php echo $strSent; ?></th>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown($server_status['Bytes_sent'], 4)); ?></td> PMA_formatByteDown($server_status['Bytes_sent'], 2, 1)); ?></td>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown( PMA_formatByteDown(
$server_status['Bytes_sent'] * $hour_factor, 4)); ?></td> $server_status['Bytes_sent'] * $hour_factor, 2, 1)); ?></td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th class="name"><?php echo $strTotalUC; ?></th> <th class="name"><?php echo $strTotalUC; ?></th>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown( PMA_formatByteDown(
$server_status['Bytes_received'] + $server_status['Bytes_sent'], 4) $server_status['Bytes_received'] + $server_status['Bytes_sent'], 2, 1)
); ?></td> ); ?></td>
<td class="value"><?php echo <td class="value"><?php echo
implode(' ', implode(' ',
PMA_formatByteDown( PMA_formatByteDown(
($server_status['Bytes_received'] + $server_status['Bytes_sent']) ($server_status['Bytes_received'] + $server_status['Bytes_sent'])
* $hour_factor, 4) * $hour_factor, 2, 1)
); ?></td> ); ?></td>
</tr> </tr>
</tbody> </tbody>
@@ -666,9 +666,9 @@ if (! empty($section['title'])) {
if ('%' === substr($name, -1, 1)) { if ('%' === substr($name, -1, 1)) {
echo PMA_formatNumber($value, 0, 2) . ' %'; echo PMA_formatNumber($value, 0, 2) . ' %';
} elseif (is_numeric($value) && $value == (int) $value) { } elseif (is_numeric($value) && $value == (int) $value) {
echo PMA_formatNumber($value, 4, 0); echo PMA_formatNumber($value, 3, 1);
} elseif (is_numeric($value)) { } elseif (is_numeric($value)) {
echo PMA_formatNumber($value, 4, 2); echo PMA_formatNumber($value, 3, 1);
} else { } else {
echo htmlspecialchars($value); echo htmlspecialchars($value);
} }