diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 52a86e271d..787acd5414 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-06-15 Dario Rodriguez + + * include/graphs/fgraph.php: Adding homedir to radar, polar and kiviat + graphs. + 2011-06-15 Ramon Novoa * operation/events/events_list.php: Merged from trunk. Do not show diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 24d5eec057..bae9b24af6 100755 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -223,7 +223,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend, function stacked_area_graph($flash_chart, $chart_data, $width, $height, $color, $legend, $long_index, $no_data_image, $xaxisname = "", $yaxisname = "", $water_mark = "", $font = '', $font_size = '', $unit = '', $ttl = 1) { - + if (empty($chart_data)) { return ''; } @@ -316,7 +316,7 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color, $legend, } } -function kiviat_graph($graph_type, $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1) { +function kiviat_graph($graph_type, $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1, $homedir="") { if (empty($chart_data)) { return ''; } @@ -328,15 +328,15 @@ function kiviat_graph($graph_type, $flash_chart, $chart_data, $width, $height, $ $id_graph = serialize_in_temp($graph, null, $ttl); - return ""; + return ""; } -function radar_graph($flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1) { - return kiviat_graph('radar', $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl); +function radar_graph($flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1, $homedir="") { + return kiviat_graph('radar', $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl, $homedir); } -function polar_graph($flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1) { - return kiviat_graph('polar', $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl); +function polar_graph($flash_chart, $chart_data, $width, $height, $no_data_image, $ttl = 1, $homedir="") { + return kiviat_graph('polar', $flash_chart, $chart_data, $width, $height, $no_data_image, $ttl, $homedir=""); } function hbar_graph($flash_chart, $chart_data, $width, $height, $color = array(),