From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.
---
interface/web/mail/user_quota_stats.php | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 5766ff7..dfc1d8a 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -50,16 +50,24 @@
$rec['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
if (!is_numeric($rec['used'])) $rec['used']=$rec['used'][1];
-
- $rec['quota'] = round($rec['quota'] / 1048576,2).' MB';
- if($rec['quota'] == "0 MB") $rec['quota'] = $app->lng('unlimited');
+
+ if($rec['quota'] == 0){
+ $rec['quota'] = $app->lng('unlimited');
+ $rec['percentage'] = '';
+ $rec['percentage_sort'] = 0;
+ } else {
+ $rec['percentage'] = round(100 * $rec['used'] / $rec['quota']) . '%';
+ $rec['percentage_sort'] = round(100 * $rec['used'] / $rec['quota']);
+ $rec['quota'] = round($rec['quota'] / 1048576,4).' MB';
+ }
+ $rec['used_sort'] = $rec['used'];
if($rec['used'] < 1544000) {
- $rec['used'] = round($rec['used'] / 1024,2).' KB';
+ $rec['used'] = round($rec['used'] / 1024,4).' KB';
} else {
- $rec['used'] = round($rec['used'] / 1048576,2).' MB';
- }
+ $rec['used'] = round($rec['used'] / 1048576,4).' MB';
+ }
//* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key];
--
Gitblit v1.9.1