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

Dominik

2015-01-11 01e0759fa0c84fa61fa94ab4ef71e835e6d9ee04

 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;
         }
      }