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
---
/dev/null | 2 --
install/sql/incremental/upd_dev_collection.sql | 2 ++
interface/lib/classes/plugin_backuplist_mail.inc.php | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/install/sql/incremental/upd_0081.sql b/install/sql/incremental/upd_0081.sql
deleted file mode 100644
index 2bd852a..0000000
--- a/install/sql/incremental/upd_0081.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `mail_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
-ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 87eaa09..aa23b17 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -32,3 +32,5 @@
MX|{DOMAIN}.|mail.{DOMAIN}.|10|3600
TXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600' WHERE `dns_template`.`template_id` = 1;
+ALTER TABLE `mail_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
+ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';
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