Merge branch 'master' of http://git.ispconfig.org/renky/ispconfig3

Author: renky

install/sql/incremental/upd_0081.sql

@@ -32,3 +32,5 @@ NS|{DOMAIN}.|{NS2}.|0|3600
 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 '';

install/sql/incremental/upd_dev_collection.sql

@@ -39,6 +39,9 @@ class plugin_backuplist_mail extends plugin_base {
 
 	function onShow() {
 		global $app;
+		
+		$app->uses('functions');
+		
 		$listTpl = new tpl;
 		$listTpl->newTemplate('templates/mail_user_backup_list.htm');
 
@@ -82,7 +85,7 @@ function onShow() {
 					"VALUES (".
 						(int)$this->form->dataRecord['server_id'] . ", " .
 						time() . ", " .
-						"'backup_restore', " .
+						"'backup_restore_mail', " .
 						"'".$backup_id."', " .
 						"'pending', " .
 						"''" .
@@ -105,6 +108,7 @@ function onShow() {
 				$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;
 			}
 		}