From 635e24fe11f014105562b446cf64b483bf79c83a Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 18 Apr 2011 15:12:48 +0000
Subject: [PATCH] 2011-04-18 Miguel de Dios  <miguel.dedios@artica.es>

	* include/functions_graph.php, include/graphs/functions_fsgraph.php,
	include/graphs/fgraph.php, operation/agentes/stat_win.php: fixed the
	relative urls for absolute urls.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4238 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                            | 6 ++++++
 pandora_console/include/functions_graph.php          | 2 +-
 pandora_console/include/graphs/fgraph.php            | 6 +++---
 pandora_console/include/graphs/functions_fsgraph.php | 4 ++--
 pandora_console/operation/agentes/stat_win.php       | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 88bfd8477f..8b54505651 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-18 Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_graph.php, include/graphs/functions_fsgraph.php,
+	include/graphs/fgraph.php, operation/agentes/stat_win.php: fixed the
+	relative urls for absolute urls.
+
 2011-04-18 Javier Lanz <javier.lanz@artica.es>
 
 	* include/functions_filemanager.php: Fixed a problem with html entities
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index fb162eca5d..6874a33185 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -30,7 +30,7 @@ function grafico_modulo_sparse2 ($agent_module_id, $period, $show_events,
 	global $config;
 	global $graphic_type;
 	
-	//include_flash_chart_script();
+	include_flash_chart_script($homeurl);
 	
 	// Set variables
 	if ($date == 0) $date = get_system_time();
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 3052893032..de32e88f1a 100755
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -143,7 +143,7 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
 	}
 	
 	if($flash_chart) {
-		return fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index);
+		return fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homedir);
 	}
 	else {
 		$graph = array();
@@ -348,8 +348,8 @@ function gantt_graph($project_name, $from, $to, $tasks, $milestones, $width, $he
 	return fs_gantt_chart ($project_name, $from, $to, $tasks, $milestones, $width, $height);
 }
 
-function include_flash_chart_script() {
-	echo '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
+function include_flash_chart_script($homeurl = '') {
+	echo '<script language="JavaScript" src="' . $homeurl . 'include/graphs/FusionCharts/FusionCharts.js"></script>';
 }
 
 ?>
diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php
index afddb39922..02a7092354 100755
--- a/pandora_console/include/graphs/functions_fsgraph.php
+++ b/pandora_console/include/graphs/functions_fsgraph.php
@@ -309,7 +309,7 @@ function fs_line_graph($chart_data, $width, $height, $color, $legend, $long_inde
 }
 
 
-function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index) {
+function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index, $homeurl = '') {
 	global $config;
 
 	$graph_type = "MSArea2D"; //MSLine is possible also
@@ -438,7 +438,7 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
-				var myChart = new FusionCharts("include/graphs/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+				var myChart = new FusionCharts("' . $homeurl . 'include/graphs/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
 				myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
 				myChart.addParam("WMode", "Transparent");
 				myChart.render("' . $div_id . '");
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 9d5d2086ea..6bab7f784b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -211,7 +211,7 @@ print_checkbox ("avg_only", 1, (bool) $avg_only);
 echo '<tr><td>'.__('Begin date').'</td><td>';
 
 print_input_text ("start_date", substr ($start_date, 0, 10),'', 10);
-print_image ("../../images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
+print_image ("images/calendar_view_day.png", false, array ("onclick" => "scwShow(scwID('text-start_date'),this);"));
 
 echo '</td></tr><tr><td>'.__('Zoom factor').'</td>';
 echo '<td>';