summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-04-11 11:00:30 +0000
committeralecpl <alec@alec.pl>2011-04-11 11:00:30 +0000
commit1036f81edf2e23fe0052e5a8ba8002a8adcc4f9a (patch)
tree13e9891e4ddc51db4d67cb227a53c9ddaa4b78f8
parentff10f5e50ef0172d334b7ff80ed7265f4cd7ec89 (diff)
- Fix so 1024 bytes is displayed as 1KB, the same for MB and GB
-rw-r--r--program/include/rcube_shared.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 8ed56d1de..1fd6ed035 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -180,7 +180,7 @@ function parse_bytes($str)
return floatval($bytes);
}
-
+
/**
* Create a human readable string for a number of bytes
*
@@ -189,17 +189,17 @@ function parse_bytes($str)
*/
function show_bytes($bytes)
{
- if ($bytes > 1073741824)
+ if ($bytes >= 1073741824)
{
$gb = $bytes/1073741824;
$str = sprintf($gb>=10 ? "%d " : "%.1f ", $gb) . rcube_label('GB');
}
- else if ($bytes > 1048576)
+ else if ($bytes >= 1048576)
{
$mb = $bytes/1048576;
$str = sprintf($mb>=10 ? "%d " : "%.1f ", $mb) . rcube_label('MB');
}
- else if ($bytes > 1024)
+ else if ($bytes >= 1024)
$str = sprintf("%d ", round($bytes/1024)) . rcube_label('KB');
else
$str = sprintf('%d ', $bytes) . rcube_label('B');
@@ -207,7 +207,6 @@ function show_bytes($bytes)
return $str;
}
-
/**
* Convert paths like ../xxx to an absolute path using a base url
*