diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 09a5f25efc..8c81dfd8d3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,5 +1,9 @@ 2009-10-20 Sancho Lerena + * include/fgraph.php, + include/functions_fsgraph.php: Solves a small problem with Flash graphs + when pandora fms console install dir is "/". + * include/functions_db.php: Fixed bug #2859919 (Transaction lock timeout). * include/error*: Fixed a formatting error and added better error diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php index c719e48e54..e359b4c2e6 100644 --- a/pandora_console/include/fgraph.php +++ b/pandora_console/include/fgraph.php @@ -1677,8 +1677,15 @@ if ($graphic_type) { graphic_error (); } } + +// For / url has problems rendering http://xxxx//include/FusionCharts/fussionCharts.js +// just make a substitution in / case +if ($config["homeurl"] == "/") + $pre_url = ""; +else + $pre_url = $config["homeurl"]; ?> - + diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php index eebaaafe80..a60ce05096 100644 --- a/pandora_console/include/functions_fsgraph.php +++ b/pandora_console/include/functions_fsgraph.php @@ -182,7 +182,13 @@ function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $ti $div_id = 'chart_div_' . $random_number; $chart_id = 'chart_' . $random_number; $output = '
'; - $output .= ''; + + if ($config["homeurl"] == "/") + $pre_url = ""; + else + $pre_url = $config["homeurl"]; + + $output .= ''; $output .= '