From 6504b3cd54cf0353a48fb9c01c003defb9db2dee Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Wed, 20 Jan 2010 13:31:14 +0000
Subject: [PATCH] 2010-01-20  Ramon Novoa  <rnovoa@artica.es>

	* include/functions_fsgraph.php: Fixed paths for Fusion Charts.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  4 ++++
 pandora_console/include/functions_fsgraph.php | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 7f23c3e203..8958bc7839 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/functions_fsgraph.php: Fixed paths for Fusion Charts.
+
 2010-01-18 Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/functions_gis.php, operation/gis_maps/ajax.php: code for GIS maps,
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
index a60ce05096..026e046a22 100644
--- a/pandora_console/include/functions_fsgraph.php
+++ b/pandora_console/include/functions_fsgraph.php
@@ -33,7 +33,7 @@ function get_chart_code ($chart, $width, $height, $swf) {
     $output .= '<script type="text/javascript">
     			<!--
         			$(document).ready(function pie_' . $chart_id . ' () {
-        				var myChart = new FusionCharts("' . $config['homeurl'] . $swf . '", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+        				var myChart = new FusionCharts("' . $swf . '", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
         				myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
 						myChart.addParam("WMode", "Transparent");
         				myChart.render("' . $div_id . '");
@@ -182,17 +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 = '<div id="' . $div_id. '" style="z-index:1;"></div>'; 
-   
-	if ($config["homeurl"] == "/")
-		$pre_url = "";
-	else
-		$pre_url = $config["homeurl"];
+	$pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"];
 
 	$output .= '<script language="JavaScript" src="' . $pre_url . '/include/FusionCharts/FusionCharts.js"></script>';
     $output .= '<script type="text/javascript">
     			<!--
         			function pie_' . $chart_id . ' () {
-        				var myChart = new FusionCharts("' . $config['homeurl'] . '/include/FusionCharts/FCF_MSArea2D.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+        				var myChart = new FusionCharts("' . $pre_url . '/include/FusionCharts/FCF_MSArea2D.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
         				myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
 						myChart.addParam("WMode", "Transparent");
         				myChart.render("' . $div_id . '");