bacula-web: Improved code for last n days timestamp intervals generation

diff --git a/gui/bacula-web/backupjob-report.php b/gui/bacula-web/backupjob-report.php
index fc58c915af121f50b4b0fc83dbf31bda701a8e9d..9b7d5fc6daf7ec1a0372ed123b9c9410a81348f6 100644 (file)
--- a/gui/bacula-web/backupjob-report.php
+++ b/gui/bacula-web/backupjob-report.php
@@ -47,10 +47,7 @@
   $backupjob_files = $dbSql->getStoredFiles( LAST_WEEK, NOW, $backupjob_name );
   
   // Get the last 7 days interval (start and end)\r
-  for( $c = 6 ; $c >= 0 ; $c-- ) {\r
-         $today  = NOW - ($c * DAY);
-         $days[] = CTimeUtils::get_Day_Intervals($today);
-  }\r
+  $days = CTimeUtils::getLastDaysIntervals( 7 );
   
   // ===============================================================
   // Last 7 days stored Bytes graph\r

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 9b3ab978ff522dcf41bec26017d939cbaba879f1..63e464d1d900c877c350b2749e221579f938cc5e 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -81,13 +81,7 @@ $graph->Render();
 $dbSql->tpl->assign('graph_pools', $graph->Get_Image_file() );
 
 // Last 7 days stored Bytes graph
-$days  = array();
-
-for( $c = 6 ; $c >= 0 ; $c-- ) {
-       $today  = NOW - ($c * DAY);
-       $days[] = CTimeUtils::get_Day_Intervals($today);
-}
-
+$days = CTimeUtils::getLastDaysIntervals( 7 );
 foreach( $days as $day ) {
        $stored_bytes            = $dbSql->getStoredBytes( $day['start'], $day['end']);
        $stored_bytes            = CUtils::Get_Human_Size( $stored_bytes, 1, 'GB', false );