tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-06-15 Dario Rodriguez <dario.rodriguez@artica.es> 

* include/graphs/fgraph.php: Adding homedir to radar, polar and kiviat
	graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4455 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2011-06-15 14:39:30 +00:00
parent e324ecd7e6
commit 3c56f7cd2f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-15 Dario Rodriguez <dario.rodriguez@artica.es>
* include/graphs/fgraph.php: Adding homedir to radar, polar and kiviat
graphs.
2011-06-15 Ramon Novoa <rnovoa@artica.es>
* operation/events/events_list.php: Merged from trunk. Do not show

14
pandora_console/include/graphs/fgraph.php
View File

@ -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 '<img src="' . $no_data_image . '" />';
}
@ -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 '<img src="' . $no_data_image . '" />';
}
@ -328,15 +328,15 @@ function kiviat_graph($graph_type, $flash_chart, $chart_data, $width, $height, $
$id_graph = serialize_in_temp($graph, null, $ttl);
return "<img src='include/graphs/functions_pchart.php?graph_type=".$graph_type."&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
return "<img src='".$homedir."include/graphs/functions_pchart.php?graph_type=".$graph_type."&ttl=".$ttl."&id_graph=" . $id_graph . "' />";
}
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(),