From 0d11ae2055fe36d390e55065fa846c848a04ad07 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 02 Jan 2014 08:47:04 -0500
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
---
interface/web/mail/user_quota_stats.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index d491071..88ab8f4 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -15,6 +15,8 @@
//* Check permissions for module
$app->auth->check_module_permissions('mail');
+$app->uses('functions');
+
$app->load('listform_actions');
// $tmp_rec = $app->db->queryOneRecord("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
@@ -63,11 +65,15 @@
$rec['used_sort'] = $rec['used'];
+/*
if($rec['used'] < 1544000) {
$rec['used'] = round($rec['used'] / 1024, 4).' KB';
} else {
$rec['used'] = round($rec['used'] / 1048576, 4).' MB';
}
+*/
+ $rec['used']=$app->functions->formatBytes($rec['used']);
+ if ($rec['used'] == 'NAN') $rec['used']='0 KB';
//* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key];
--
Gitblit v1.9.1