From: Davide Franco Date: Mon, 27 Jun 2011 16:37:59 +0000 (+0200) Subject: Revert "bacula-web: Renamed php class from BGraph to CGraph" X-Git-Tag: Release-5.2.1~253 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b5135556ff2ec8ab2a08ce63176d50727b3f2c2;p=bacula%2Fbacula Revert "bacula-web: Renamed php class from BGraph to CGraph" This reverts commit 3027365b60325cd7c1a120fc20a2d392ccee9ad1. --- diff --git a/gui/bacula-web/backupjob-report.php b/gui/bacula-web/backupjob-report.php index 35d5ad0284..8436de0490 100644 --- a/gui/bacula-web/backupjob-report.php +++ b/gui/bacula-web/backupjob-report.php @@ -49,7 +49,7 @@ // =============================================================== // Last 7 days stored Bytes graph // =============================================================== - $graph = new CGraph( "graph2.png" ); + $graph = new BGraph( "graph2.png" ); foreach( $days as $day ) array_push( $days_stored_bytes, $dbSql->GetStoredBytesByJob( $backupjob_name, $day['start'], $day['end'] ) ); @@ -68,7 +68,7 @@ // =============================================================== // Getting last 7 days stored files graph // =============================================================== - $graph = new CGraph("graph3.png" ); + $graph = new BGraph("graph3.png" ); foreach( $days as $day ) array_push( $days_stored_files, $dbSql->GetStoredFilesByJob( $backupjob_name, $day['start'], $day['end'] ) ); diff --git a/gui/bacula-web/includes/graph/cgraph.class.php b/gui/bacula-web/includes/graph/cgraph.class.php index c5ff516ef3..0957c81ee5 100644 --- a/gui/bacula-web/includes/graph/cgraph.class.php +++ b/gui/bacula-web/includes/graph/cgraph.class.php @@ -15,7 +15,7 @@ +-------------------------------------------------------------------------+ */ -class CGraph{ +class BGraph{ private $title; private $ytitle; diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php index ccfd117a36..88e6e46ba1 100644 --- a/gui/bacula-web/index.php +++ b/gui/bacula-web/index.php @@ -68,7 +68,7 @@ foreach( $status as $job_status ) { array_push( $data, $dbSql->GetJobsStatistics( $job_status ) ); } -$graph = new CGraph( "graph.png" ); +$graph = new BGraph( "graph.png" ); $graph->SetData( $data, 'pie', 'text-data-single' ); $graph->SetGraphSize( 400, 230 ); @@ -78,7 +78,7 @@ unset($graph); // Pool and volumes graph $data = array(); -$graph = new CGraph( "graph1.png" ); +$graph = new BGraph( "graph1.png" ); $pools = $dbSql->Get_Pools_List(); while( $pool = $pools->fetchRow( ) ) { @@ -93,7 +93,7 @@ $dbSql->tpl->assign('graph_pools', $graph->Get_Image_file() ); // Last 7 days stored Bytes graph $data = array(); -$graph = new CGraph( "graph2.png" ); +$graph = new BGraph( "graph2.png" ); $days = array(); // Get the last 7 days interval (start and end) diff --git a/gui/bacula-web/test.php b/gui/bacula-web/test.php index 723f940841..139031a45e 100644 --- a/gui/bacula-web/test.php +++ b/gui/bacula-web/test.php @@ -77,7 +77,7 @@ // Generate test graph $data = array( array('test', 100, 100, 200, 100), array('test1', 150, 100, 150, 100 ) ); - $graph = new CGraph( "graph3.png" ); + $graph = new BGraph( "graph3.png" ); $graph->SetColors( array('green', 'red' ) ); $graph->SetData( $data, 'pie', 'text-data-single' );