From 66190e1134676f3addf703b0424761c21cad7c52 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 14 Jan 2015 14:17:32 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/mail/backup_stats.php | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/backup_stats.php b/interface/web/mail/backup_stats.php
index 97b8b97..ec32d35 100644
--- a/interface/web/mail/backup_stats.php
+++ b/interface/web/mail/backup_stats.php
@@ -18,6 +18,7 @@
public function prepareDataRow($rec)
{
global $app;
+ $app->uses('functions');
$rec = parent::prepareDataRow($rec);
@@ -28,6 +29,9 @@
}
$recBackup = $app->db->queryOneRecord('SELECT COUNT(backup_id) AS backup_count FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
$rec['backup_copies_exists'] = $recBackup['backup_count'];
+ unset($recBackup);
+ $recBackup = $app->db->queryOneRecord('SELECT SUM(filesize) AS backup_size FROM mail_backup WHERE mailuser_id = ?', $rec['mailuser_id']);
+ $rec['backup_size'] = $app->functions->formatBytes($recBackup['backup_size']);
return $rec;
}
--
Gitblit v1.9.1