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

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 interface/web/sites/backup_stats.php

@@ -18,6 +18,7 @@
   public function prepareDataRow($rec)
   {
      global $app;
      $app->uses('functions');

      $rec = parent::prepareDataRow($rec);

@@ -29,6 +30,9 @@

      $recBackup = $app->db->queryOneRecord('SELECT COUNT(backup_id) AS backup_count FROM web_backup WHERE parent_domain_id = ?', $rec['domain_id']);
      $rec['backup_copies_exists'] = $recBackup['backup_count'];
      unset($recBackup);
      $recBackup = $app->db->queryOneRecord('SELECT SUM(filesize) AS backup_size FROM web_backup WHERE parent_domain_id = ?', $rec['domain_id']);
      $rec['backup_size'] = $app->functions->formatBytes($recBackup['backup_size']);

      return $rec;
   }