From e359af017f7daf6c6b20bed843e1722084fa998b Mon Sep 17 00:00:00 2001 From: Davide Franco Date: Wed, 6 Jul 2011 21:03:34 +0200 Subject: [PATCH] bacula-web: Improved and fixed small bugs in php code --- gui/bacula-web/backupjob-report.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gui/bacula-web/backupjob-report.php b/gui/bacula-web/backupjob-report.php index 1a2b561c58..06a8882423 100644 --- a/gui/bacula-web/backupjob-report.php +++ b/gui/bacula-web/backupjob-report.php @@ -39,24 +39,26 @@ // Get the last 7 days interval (start and end) for( $c = 6 ; $c >= 0 ; $c-- ) { - $today = ( mktime() - ($c * LAST_DAY) ); - array_push( $days, array( 'start' => date( "Y-m-d 00:00:00", $today ), 'end' => date( "Y-m-d 23:59:00", $today ) ) ); + $today = NOW - ($c * DAY); + $days[] = CTimeUtils::get_Day_Intervals($today); } // Generate Backup Job report period string - $backupjob_period = "From " . date( "Y-m-d", mktime()-LAST_WEEK ) . " to " . date( "Y-m-d", mktime() ); + $backupjob_period = "From " . date( "Y-m-d", (NOW-WEEK) ) . " to " . date( "Y-m-d", NOW ); // =============================================================== // Last 7 days stored Bytes graph // =============================================================== $graph = new CGraph( "graph2.png" ); - foreach( $days as $day ) - array_push( $days_stored_bytes, $dbSql->GetStoredBytesByJob( $backupjob_name, $day['start'], $day['end'] ) ); + foreach( $days as $day ) { + $stored_bytes = CUtils::Get_Human_Size( $dbSql->getStoredBytes( $day['start'], $day['end'], $backupjob_name), 1, 'GB', false ); + $days_stored_bytes[] = array( date("m-d", $day['start']), $stored_bytes ); + } // Calculate total bytes for this period - foreach( $days_stored_bytes as $day ) - $backupjob_bytes += $day[1]; + $backupjob_bytes = $dbSql->getStoredBytes( LAST_WEEK, NOW, $backupjob_name ); + $backupjob_bytes = CUtils::Get_Human_Size( $backupjob_bytes ); $graph->SetData( $days_stored_bytes, 'bars', 'text-data' ); $graph->SetGraphSize( 400, 230 ); -- 2.39.5