From 01e0759fa0c84fa61fa94ab4ef71e835e6d9ee04 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Sun, 11 Jan 2015 14:02:27 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/renky/ispconfig3
---
interface/lib/classes/plugin_backuplist_mail.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/plugin_backuplist_mail.inc.php b/interface/lib/classes/plugin_backuplist_mail.inc.php
index 24de722..8474283 100644
--- a/interface/lib/classes/plugin_backuplist_mail.inc.php
+++ b/interface/lib/classes/plugin_backuplist_mail.inc.php
@@ -39,6 +39,9 @@
function onShow() {
global $app;
+
+ $app->uses('functions');
+
$listTpl = new tpl;
$listTpl->newTemplate('templates/mail_user_backup_list.htm');
@@ -82,7 +85,7 @@
"VALUES (".
(int)$this->form->dataRecord['server_id'] . ", " .
time() . ", " .
- "'backup_restore', " .
+ "'backup_restore_mail', " .
"'".$backup_id."', " .
"'pending', " .
"''" .
@@ -105,6 +108,7 @@
$rec["bgcolor"] = $bgcolor;
$rec['date'] = date($app->lng('conf_format_datetime'),$rec['tstamp']);
$rec['backup_type'] = $wb[('backup_type_'.$rec['backup_type'])];
+ $rec['filesize'] = $app->functions->formatBytes($rec['filesize']);
$records_new[] = $rec;
}
}
--
Gitblit v1.9.1