Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/sites/backup_stats.php

@@ -17,13 +17,23 @@

   public function prepareDataRow($rec)
   {
      global $app;
      $app->uses('functions');

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

      $rec['active'] = "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>";
      if ($rec['backup_interval'] === 'none') {
         $rec['active'] = "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>";
         $rec['active']        = "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>";
         $rec['backup_copies'] = 0;
      }

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