diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 0d9135cfea..ce456e40ea 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-11  Sergio Martin <sergio.martin@artica.es>
+
+	* include/graphs/functions_pchart.php
+	include/graphs/functions_fsgraph.php
+	include/graphs/fgraph.php: Merged changes from integria like increasement
+	of margins in area static graphs, clean code and minor fixes
+
 2011-04-09  Manuel Arostegui <manuel@todo-linux.com>
 
 	* pandoradb.sql: Added index to tagente_modulo. 
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index f745764df3..b02891f809 100755
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -13,20 +13,20 @@
 include_once('functions_fsgraph.php');
 include_once('functions_utils.php');
 
-function vbar_graph($flash_chart, $chart_data, $width, $height, $color, $legend) {
+function vbar_graph($flash_chart, $chart_data, $width, $height, $color = array(), $legend = array(), $xaxisname = "", $yaxisname = "") {
 	if($flash_chart) {
 		echo fs_2d_column_chart ($chart_data, $width, $height);
 	}
 	else {
-		$id_graph = uniqid();
-		
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
 		$graph['height'] = $height;
 		$graph['color'] = $color;
 		$graph['legend'] = $legend;
-		
+		$graph['xaxisname'] = $xaxisname;
+		$graph['yaxisname'] = $yaxisname;
+
 		$id_graph = serialize_in_temp($graph);
 	
 		echo "<img src='include/graphs/functions_pchart.php?graph_type=vbar&id_graph=".$id_graph."'>";
@@ -42,14 +42,13 @@ function threshold_graph($flash_chart, $chart_data, $width, $height) {
 	}
 }
 
-function area_graph($flash_chart, $chart_data, $width, $height, $color,$legend, $long_index) {
+function area_graph($flash_chart, $chart_data, $width, $height, $color, $legend, $long_index) {
 	if($flash_chart) {
 		return fs_area_graph($chart_data, $width, $height, $color, $legend, $long_index);
 	}
 	else {
 		$id_graph = uniqid();
 		
-		
 		$graph = array();
 		$graph['data'] = $chart_data;
 		$graph['width'] = $width;
@@ -58,8 +57,8 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,$legend,
 		$graph['legend'] = $legend;
 		
 		serialize_in_temp($graph, $id_graph);
-		
-		return "<img src='http://127.0.0.1/pandora_console/include/graphs/functions_pchart.php?graph_type=area&id_graph=" . $id_graph . "' />";
+
+		return "<img src='include/graphs/functions_pchart.php?graph_type=area&id_graph=" . $id_graph . "'>";
 	}	
 }
 
@@ -145,12 +144,23 @@ function line_graph($flash_chart, $chart_data, $width, $height, $color, $legend,
 	}	
 }
 
-function hbar_graph($flash_chart, $chart_data, $width, $height) {
+function hbar_graph($flash_chart, $chart_data, $width, $height, $color = array(), $legend = array(), $xaxisname = "", $yaxisname = "") {
 	if($flash_chart) {
 		echo fs_hbar_chart (array_values($chart_data), array_keys($chart_data), $width, $height);
 	}
 	else {
-		echo "<img src='include/graphs/functions_pchart.php?graph_type=hbar&data=".json_encode($chart_data)."&width=".$width."&height=".$height."'>";
+		$graph = array();
+		$graph['data'] = $chart_data;
+		$graph['width'] = $width;
+		$graph['height'] = $height;
+		$graph['color'] = $color;
+		$graph['legend'] = $legend;
+		$graph['xaxisname'] = $xaxisname;
+		$graph['yaxisname'] = $yaxisname;
+
+		$id_graph = serialize_in_temp($graph);
+	
+		echo "<img src='include/graphs/functions_pchart.php?graph_type=hbar&id_graph=".$id_graph."'>";
 	}
 }
 
@@ -181,23 +191,34 @@ function pie_graph($graph_type, $flash_chart, $chart_data, $width, $height, $oth
 		$chart_data = $chart_data_trunc;
 	}
 	
-	switch($graph_type) {
-		case "2d":
-				if($flash_chart) {
+	if($flash_chart) {
+		switch($graph_type) {
+			case "2d":
 					return fs_2d_pie_chart (array_values($chart_data), array_keys($chart_data), $width, $height);
-				}
-				else {
-					return "<img src='include/graphs/functions_pchart.php?graph_type=pie2d&data=".json_encode($chart_data)."&width=".$width."&height=".$height."&other_str=".$other_str."'>";
-				}
 				break;
-		case "3d":
-				if($flash_chart) {
+			case "3d":				
 					return fs_3d_pie_chart (array_values($chart_data), array_keys($chart_data), $width, $height);
-				}
-				else {
-					return "<img src='include/graphs/functions_pchart.php?graph_type=pie3d&data=".json_encode($chart_data)."&width=".$width."&height=".$height."&other_str=".$other_str."'>";
-				}
 				break;
+		}
+	}
+	else {
+		$graph = array();
+		$graph['data'] = $chart_data;
+		$graph['width'] = $width;
+		$graph['height'] = $height;
+		$graph['color'] = $color;
+		$graph['legend'] = $legend;
+
+		$id_graph = serialize_in_temp($graph);
+	
+		switch($graph_type) {
+			case "2d":
+					return "<img src='include/graphs/functions_pchart.php?graph_type=pie2d&id_graph=".$id_graph."'>";
+				break;
+			case "3d":				
+					return "<img src='include/graphs/functions_pchart.php?graph_type=pie3d&id_graph=".$id_graph."'>";
+				break;
+		}
 	}
 }
 
diff --git a/pandora_console/include/graphs/functions_fsgraph.php b/pandora_console/include/graphs/functions_fsgraph.php
index 04f93028db..1117605c1c 100755
--- a/pandora_console/include/graphs/functions_fsgraph.php
+++ b/pandora_console/include/graphs/functions_fsgraph.php
@@ -159,15 +159,13 @@ function fs_stacked_graph($chart_data, $width, $height, $color, $legend, $long_i
 	
 	$div_id = 'chart_div_' . $random_number;
 	$chart_id = 'chart_' . $random_number;
-	
-	$pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"];
-	
+		
 	$output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
-	$output .= '<script language="JavaScript" src="' . $pre_url . '/include/FusionCharts/FusionCharts.js"></script>';
+	$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
-				var myChart = new FusionCharts("' . $pre_url . '/include/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+				var myChart = new FusionCharts("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 . '");
@@ -314,14 +312,13 @@ function fs_line_graph($chart_data, $width, $height, $color, $legend, $long_inde
 	$div_id = 'chart_div_' . $random_number;
 	$chart_id = 'chart_' . $random_number;
 	
-	$pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"];
 	
 	$output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
-	$output .= '<script language="JavaScript" src="' . $pre_url . '/include/FusionCharts/FusionCharts.js"></script>';
+	$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
-				var myChart = new FusionCharts("' . $pre_url . '/include/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+				var myChart = new FusionCharts("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 . '");
@@ -468,14 +465,13 @@ function fs_area_graph($chart_data, $width, $height, $color, $legend, $long_inde
 	$div_id = 'chart_div_' . $random_number;
 	$chart_id = 'chart_' . $random_number;
 	
-	$pre_url = ($config["homeurl"] == "/") ? '' : $config["homeurl"];
 	
 	$output = '<div id="' . $div_id. '" style="z-index:1;"></div>';
-	$output .= '<script language="JavaScript" src="' . $pre_url . '/include/FusionCharts/FusionCharts.js"></script>';
+	$output .= '<script language="JavaScript" src="include/graphs/FusionCharts/FusionCharts.js"></script>';
 	$output .= '<script type="text/javascript">
 			<!--
 			function pie_' . $chart_id . ' () {
-				var myChart = new FusionCharts("' . $pre_url . '/include/FusionCharts/FCF_'.$graph_type.'.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+				var myChart = new FusionCharts("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 . '");
@@ -528,7 +524,7 @@ function fs_3d_pie_chart2 ($data, $names, $width, $height, $background = "EEEEEE
 
 	// Generate the XML
 	$chart = new FusionCharts("Pie3D", $width, $height);
-	$chart->setSWFPath("FusionCharts/");
+	$chart->setSWFPath("include/graphs/FusionCharts/");
   	$params="showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9;bgColor=$background;bgAlpha=100;canvasBgAlpha=100;";
   	$chart->setChartParams($params);
 
@@ -548,7 +544,7 @@ function fs_2d_pie_chart ($data, $names, $width, $height, $background = "EEEEEE"
 
 	// Generate the XML
 	$chart = new FusionCharts("Pie3D", $width, $height);
-	$chart->setSWFPath("FusionCharts/");
+	$chart->setSWFPath("include/graphs/FusionCharts/");
   	$params="showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9;bgColor=$background;bgAlpha=100;canvasBgAlpha=100;";
   	$chart->setChartParams($params);
 
@@ -568,7 +564,7 @@ function fs_hbar_chart ($data, $names, $width, $height) {
 
 	// Generate the XML
 	$chart = new FusionCharts("Bar2D", $width, $height);
-	$chart->setSWFPath("FusionCharts/");
+	$chart->setSWFPath("include/graphs/FusionCharts/");
   	$params="showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9;rotateNames=1;chartLeftMargin=0;chartRightMargin=0;chartBottomMargin=0;chartTopMargin=0;showBarShadow=1;showLimits=1";
   	$chart->setChartParams($params);
 
@@ -591,7 +587,7 @@ function fs_2d_column_chart ($data, $width, $height) {
 
 	$pixels_between_xdata = 25;
 	$max_xdata_display = round($width / $pixels_between_xdata);
-	$ndata = count($chart_data);
+	$ndata = count($data);
 	if($max_xdata_display > $ndata) {
 		$xdata_display = $ndata;
 	}
@@ -611,9 +607,8 @@ function fs_2d_column_chart ($data, $width, $height) {
 			if (($count % $step) == 0) {
 				$show_name = '1';
 			}
-				debugPrint($i, '/tmp/logo');
 
-			$chart->addCategory($i."2", //'');
+			$chart->addCategory($i, //'');
 					'hoverText=' . $i .  
 					';showName=' . $show_name);
 			
@@ -632,12 +627,11 @@ function fs_2d_column_chart ($data, $width, $height) {
     $empty = 0;
     $num_vlines = 0;
     $count = 0;
-    $step = 3;
 
 	foreach ($data as $legend_value => $values) {
 
 		foreach($values as $name => $value) {
-			if ($count++ % $step == 0) {
+			if (($count++ % $step) == 0) {
 				$show_name = '1';
 				$num_vlines++;
 			} else {
@@ -697,7 +691,7 @@ function fs_gantt_chart ($title, $from, $to, $tasks, $milestones, $width, $heigh
 	
 	// Generate the XML
 	$chart = new FusionCharts("Gantt", $width, $height, "1", "0");
-	$chart->setSWFPath("FusionCharts/");
+	$chart->setSWFPath("include/graphs/FusionCharts/");
 	$chart->setChartParams('dateFormat=dd/mm/yyyy;hoverCapBorderColor=2222ff;hoverCapBgColor=e1f5ff;ganttLineAlpha=80;canvasBorderColor=024455;canvasBorderThickness=0;gridBorderColor=2179b1;gridBorderAlpha=20;ganttWidthPercent=80');
 	$chart->setGanttProcessesParams('headerText=' . __('Task') . ';fontColor=ffffff;fontSize=9;isBold=1;isAnimated=1;bgColor=2179b1;headerbgColor=2179b1;headerFontColor=ffffff;headerFontSize=12;align=left');
 	$chart->setGanttTasksParams('');
diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php
index c32e316957..5ddeefb85f 100755
--- a/pandora_console/include/graphs/functions_pchart.php
+++ b/pandora_console/include/graphs/functions_pchart.php
@@ -432,7 +432,7 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height, $rgb_c
 		 else {
 			$point_id = $i;
 		 }
-		 
+
 		$MyData->addPoints($values,$point_id);
 		if (!empty($rgb_color)) {
 			$MyData->setPalette($point_id, 
@@ -489,11 +489,11 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height, $rgb_c
 	 
 	 if (isset($size['Height'])) {
 	 	/* Define the chart area */
-	 	$myPicture->setGraphArea(30,$size['Height'],$width,$height - 60);
+	 	$myPicture->setGraphArea(40,$size['Height'],$width,$height - 90);
 	 }
 	 else {
 	 	/* Define the chart area */
-	 	$myPicture->setGraphArea(30, 5,$width,$height - 60);
+	 	$myPicture->setGraphArea(40, 5,$width,$height - 90);
 	 }
 
 	 /* Draw the scale */
@@ -645,631 +645,4 @@ function pch_horizontal_graph ($graph_type, $index, $data, $width, $height, $xax
 	 /* Render the picture */
 	 $myPicture->stroke(); 
 }
-
-/*
-class PchartGraph extends PandoraGraphAbstract {
-	public $palette_path = false;
-	private $graph = NULL;
-	private $dataset = NULL;
-	private $x1;
-	private $x2;
-	private $y1;
-	private $y2;
-	
-	public function load_palette ($palette_path) {
-		$this->palette_path = $palette_path;
-	}
-	
-	public function pie_graph () {
-		// dataset definition
-		$this->dataset = new pData;
-		$this->dataset->AddPoint ($this->data, "Serie1", $this->legend);
-		$this->dataset->AddPoint ($this->legend, "Serie2");
-		$this->dataset->AddAllSeries ();
-		$this->dataset->SetAbsciseLabelSerie ("Serie2");
-		
-		// Initialise the graph
-		$this->graph = new pChart ($this->width, $this->height);
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		if ($this->palette_path) {
-			$this->graph->loadColorPalette ($this->palette_path);
-		}
-		$this->add_background ();
-		
-		// Draw the pie chart
-		if ($this->three_dimensions) {
-			$this->graph->drawPieGraph ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				$this->width / 2,
-				$this->height / 2 - 15, $this->zoom,
-				PIE_PERCENTAGE_LABEL, 5, 70, 20, 5);
-		} else {
-			$this->graph->drawFlatPieGraph ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				$this->width / 2,
-				$this->height / 2, $this->zoom,
-				PIE_PERCENTAGE_LABEL, 5);
-		}
-		
-		if ($this->show_legend) {
-			$this->graph->drawPieLegend (10, 10, $this->dataset->GetData (),
-				$this->dataset->GetDataDescription (), 255, 255, 255);
-		}
-		
-		$this->graph->Stroke ();
-	}
-	
-	public function horizontal_bar_graph () {
-		// dataset definition 
-		$this->dataset = new pData;
-		foreach ($this->data as $x => $y) {
-			$this->dataset->AddPoint ($y, "Serie1", $x);
-		}
-		$this->dataset->AddAllSeries ();
-		$this->dataset->SetXAxisFormat ("label");
-		$this->dataset->SetYAxisFormat ($this->yaxis_format);
-
-		// Initialise the graph
-		$this->graph = new pChart ($this->width, $this->height);
-		if ($this->palette_path) {
-			$this->graph->loadColorPalette ($this->palette_path);
-		}
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->add_background ();
-		$this->graph->drawGraphArea (255, 255, 255, true);
-		if ($this->show_grid)
-			$this->graph->drawGrid (4, true, 230, 230, 230, 50);
-		
-		// Draw the bar graph
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->graph->setFixedScale (0, max ($this->data));
-		$this->graph->drawOverlayBarGraphH ($this->dataset->GetData (),
-			$this->dataset->GetDataDescription (), 50);
-		
-		// Finish the graph
-		$this->add_legend ();
-		
-		$this->graph->Stroke ();
-	}
-	
-	public function single_graph () {
-		// Dataset definition
-		$this->dataset = new pData;
-		$this->graph = new pChart ($this->width, $this->height+2);
-		
-		foreach ($this->data as $x => $y) {
-			$this->dataset->AddPoint ($y, "Serie1", $x);
-		}
-		$color = $this->get_rgb_values ($this->graph_color[2]);
-		$this->graph->setColorPalette (0, $color['r'], $color['g'], $color['b']);
-		$this->dataset->AddAllSeries ();
-		if ($this->legend !== false)
-			$this->dataset->SetSerieName ($this->legend[0], "Serie1");
-		
-		if ($this->palette_path)
-			$this->graph->loadColorPalette ($this->palette_path);
-		
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		
-		// White background 
-		$this->graph->drawFilledRoundedRectangle(1,1,$this->width,$this->height,0,254,254,254);
-		$this->add_background ();
-		$this->dataset->SetXAxisFormat ($this->xaxis_format);
-		$this->dataset->SetYAxisFormat ($this->yaxis_format);
-		$this->graph->drawGraphArea (254, 254, 254, true);
-		
-		if ($this->max_value == 0 || $this->max_value == 1)
-			$this->graph->setFixedScale (0, 1, 1);
-		
-		$this->graph->drawScale ($this->dataset->GetData (),
-			$this->dataset->GetDataDescription (),
-			SCALE_START0, 80, 80, 80, $this->show_axis,
-			0, 0, false,
-			$this->xaxis_interval);
-		
-		if ($this->show_grid)
-			$this->graph->drawGrid (1, false, 200, 200, 200);
-		if ($this->max_value > 0) {
-			// Draw the graph
-			$this->graph->drawFilledLineGraph ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				50, true);
-		}
-		
-		// Finish the graph
-//		$this->add_legend ();
-		$this->add_events ();
-		$this->add_alert_levels ();
-		
-		$this->graph->Stroke ();
-	}
-	
-	public function sparse_graph ($period, $avg_only, $min_value, $max_value, $unit_name, $baseline = 0) {
-		// Dataset definition
-		$this->dataset = new pData;
-		$this->graph = new pChart ($this->width, $this->height+5);
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->legend = array ();
-		
-		if ($avg_only) {
-			foreach ($this->data as $data) {
-				$this->dataset->AddPoint ($data['sum'], "AVG", $data['timestamp_bottom']);
-			}
-			$color = $this->get_rgb_values ($this->graph_color[2]);
-			$this->graph->setColorPalette (0, $color['r'], $color['g'], $color['b']);
-		} else {
-			foreach ($this->data as $data) {
-				$this->dataset->AddPoint ($data['sum'], "AVG", $data['timestamp_bottom']);
-				$this->dataset->AddPoint ($data['min'], "MIN");
-				$this->dataset->AddPoint ($data['max'], "MAX");
-			}
-			$this->legend[1] = __("Min");
-			$this->legend[0] = __("Avg");
-			$this->legend[2] = __("Max");
-			$this->dataset->SetSerieName (__("Min"), "MIN");
-			$this->dataset->SetSerieName (__("Avg"), "AVG");
-			$this->dataset->SetSerieName (__("Max"), "MAX");
-			$this->set_colors ();
-		}
-		
-		// Draw baseline
-		if ($baseline == 1) {
-			foreach ($this->data as $data) {
-				$this->dataset->AddPoint ($data['baseline'], "BLINE");
-			}
-		}
-
-		$this->dataset->SetXAxisFormat ('datetime');
-		$this->graph->setDateFormat ("Y");
-		$this->dataset->SetYAxisFormat ('metric');
-		$this->dataset->AddAllSeries ();
-
-		$this->dataset->SetSerieName (__("Avg"), "AVG");
-		$this->legend[0] = __("Avg");
-		
-		if ($this->palette_path) {
-			$this->graph->loadColorPalette ($this->palette_path);
-		}
-
-		// White background 
-		$this->graph->drawFilledRoundedRectangle(1,1,$this->width,$this->height+2,0,254,254,254);
-		
-		// Graph border
-		// Now graph border is in the style image attribute
-		//$this->graph->drawRoundedRectangle(1,1,$this->width-1,$this->height+4,5,230,230,230);
-
-			
-		$this->add_background ();
-		// If graph is small remove blank spaces
-		if ($this->width < MIN_WIDTH || $this->height < MIN_HEIGHT)
-			$this->graph->setGraphArea (5,5,$this->width-5,$this->height-5);		
-		$this->graph->drawGraphArea (254, 254, 254, false);
-
-		$this->xaxis_interval = ($this->xaxis_interval / 7 >= 1) ? ($this->xaxis_interval / 7) : 10;
-		
-		// Remove axis values if graph is small 
-		if ($this->width > MIN_WIDTH && $this->height > MIN_HEIGHT){
-			$this->graph->drawScale ($this->dataset->GetData (),
-					$this->dataset->GetDataDescription (), SCALE_START0,
-					80, 80, 80, $this->show_axis, 0, 50, false,
-					$this->xaxis_interval);
-		}else{
-			$this->graph->drawScale ($this->dataset->GetData (),
-					$this->dataset->GetDataDescription (), SCALE_START0,
-					80, 80, 80, false, 0, 50, false,
-					$this->xaxis_interval);
-		}
-				
-		/// NOTICE: The final "false" is a Pandora modificaton of pChart to avoid showing vertical lines. 
-		if ($this->show_grid)
-			$this->graph->drawGrid (1, true, 225, 225, 225, 100, false);
-			
-		// Draw the graph
-		$this->graph->drawFilledLineGraph ($this->dataset->GetData(), $this->dataset->GetDataDescription(), 50, true);
-	
-		// Remove legends if graph is small 		
-		if ($this->width > MIN_WIDTH && $this->height > MIN_HEIGHT)
-			$this->add_legend ();
-		$this->add_events ("AVG");
-		$this->add_alert_levels ();
-		
-		$this->graph->Stroke ();
-	}
-	
-	public function vertical_bar_graph () {
-		// dataset definition 
-		$this->dataset = new pData;
-		foreach ($this->data as $x => $y) {
-			$this->dataset->AddPoint ($y, "Serie1", $x);
-		}
-		$this->dataset->AddAllSeries ();
-		$this->dataset->SetAbsciseLabelSerie ();
-		$this->dataset->SetXAxisFormat ($this->xaxis_format);
-		$this->dataset->SetYAxisFormat ($this->yaxis_format);
-		
-		// Initialise the graph
-		$this->graph = new pChart ($this->width, $this->height);
-		if ($this->palette_path) {
-			$this->graph->loadColorPalette ($this->palette_path);
-		}
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->add_background ();
-		$this->graph->drawGraphArea (255, 255, 255, true);
-		if ($this->show_grid)
-			$this->graph->drawGrid (4, true, 230, 230, 230, 50);
-
-		// Draw the bar graph
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->graph->drawScale ($this->dataset->GetData (),
-					$this->dataset->GetDataDescription (),
-					SCALE_START0, 80, 80, 80,
-					$this->show_axis, 0, 0, false,
-					$this->xaxis_interval);
-		$this->graph->drawOverlayBarGraph ($this->dataset->GetData (),
-						$this->dataset->GetDataDescription (),
-						50);
-		$this->add_events ("Serie1");
-		$this->add_alert_levels ();
-		
-		// Finish the graph
-		$this->graph->Stroke ();
-	}
-	
-	public function combined_graph ($values, $events, $alerts, $unit_name, $max_value, $stacked) {
-		set_time_limit (0);
-		// Dataset definition
-		$this->dataset = new pData;
-		$this->graph = new pChart ($this->width, $this->height+5);
-		
-		$graph_items = 0;		
-		// $previo stores values from last series to made the stacked graph
-		foreach ($this->data as $i => $data) {
-			$graph_items++;
-			$max = 0;
-			$min = 10000000000000;
-			$avg = 0;
-			$count = 0;
-			foreach ($data as $j => $value) {
-				$count ++;
-				$avg += $value;
-				if ($value > $max )
-					$max = $value;
-				if ($value < $min )
-					$min = $value;
-
-				// New code for stacked. Due pchart doesnt not support stacked
-				// area graph, we "made it", adding to a series the values of the
-				// previous one consecutive sum.
-				if ((($stacked == 1) OR ($stacked==3)) AND ($i >0)){
-					$this->dataset->AddPoint ($value+$previo[$j], $this->legend[$i],
-					$values[$j]['timestamp_bottom']);
-				} else {
-					$this->dataset->AddPoint ($value, $this->legend[$i],
-					$values[$j]['timestamp_bottom']);
-				}				
-				if ($i == 0)
-					$previo[$j] = $value;
-				else
-					$previo[$j] = $previo[$j] + $value;
-				
-			}
-			if ($count > 0)
-				$avgdata[$i] = $avg / $count;
-			else
-				$avgdata[$i] = 0;
-			$maxdata[$i] = format_for_graph($max);
-			$mindata[$i] = format_for_graph($min);
-			$avgdata[$i] = format_for_graph($avgdata[$i]);
-		}
-
-		$i = 0;
-		foreach ($this->legend as $name) {
-			$legend = $name . " (".__("Max"). ":$maxdata[$i], ".__("Min"). ":$mindata[$i], ". __("Avg"). ": $avgdata[$i])"; 
-			$this->dataset->setSerieName ($legend, $name);
-			$this->dataset->AddSerie ($name);
-			$i++;
-		}
-		
-		// Set different colors for combined graphs because need to be
-		// very different.
-		
-		$this->graph_color[1] = "#FF0000"; // Red
-		$this->graph_color[2] = "#00FF00"; // Green
-		$this->graph_color[3] = "#0000FF"; // Blue
-
-		// White background 
-		$this->graph->drawFilledRoundedRectangle(1,1,$this->width,$this->height,0,254,254,254);  
-			
-		$this->set_colors ();
-		$this->graph->setFontProperties ($this->fontpath, 8);
-		$this->dataset->SetXAxisFormat ('datetime');
-		$this->dataset->SetYAxisFormat ('metric');
-		$this->dataset->AddAllSeries ();
-		$this->add_background ();
-
-
-		$legend_offset = $this->height - 21 - ($graph_items*15);
-
-		$this->graph->setGraphArea (35,10,$this->width-10, $legend_offset);
-		$this->graph->drawGraphArea (254, 254, 254, false);
-		
-				
-		// Fixed missing X-labels (6Ago09)
-		$this->xaxis_interval = ($this->xaxis_interval / 7 >= 1) ? ($this->xaxis_interval / 7) : 10;
-		$this->graph->drawScale ($this->dataset->GetData (),
-		$this->dataset->GetDataDescription (), SCALE_START0,
-			80, 80, 80, $this->show_axis, 0, 50, false,
-			$this->xaxis_interval);
-		
-		$this->graph->drawGrid (1, true, 225, 225, 225, 100, false);
-		
-		// Draw the graph
-		if ($stacked == 1) { // Stacked solid
-			$this->graph->drawScale ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				SCALE_START0, 80, 80, 80, $this->show_axis, 0, 0, false,
-				$this->xaxis_interval);
-			$this->graph->drawFilledCubicCurve ($this->dataset->GetData(),
-				$this->dataset->GetDataDescription(), 1, 30, true);
-		}
-		elseif ($stacked == 3) { // Stacked wired
-			$this->graph->drawScale ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				SCALE_START0, 80, 80, 80, $this->show_axis, 0, 0, false,
-				$this->xaxis_interval);
-			$this->graph->drawFilledCubicCurve ($this->dataset->GetData(),
-				$this->dataset->GetDataDescription(), 1, 0, true);
-				
-		}
-		else if ($stacked == 2) { // Wired mode
-			$this->graph->drawScale ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				SCALE_START0, 80, 80, 80, $this->show_axis, 0, 0, false,
-				$this->xaxis_interval);
-			$this->graph->drawLineGraph ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription ());
-		}
-		else { // Non-stacked, area overlapped
-			$this->graph->drawScale ($this->dataset->GetData (),
-				$this->dataset->GetDataDescription (),
-				SCALE_START0, 80, 80, 80, $this->show_axis, 0, 0, false,
-				$this->xaxis_interval);
-			$this->graph->drawFilledCubicCurve ($this->dataset->GetData(),
-				$this->dataset->GetDataDescription(), 1, 30, true);
-		}
-
-		$this->graph->setFontProperties($this->fontpath,7);
-		$this->graph->drawLegend(15,$legend_offset+29,$this->dataset->GetDataDescription(),92,92,92,50,50,50,45,45,45,0); 
-
-// Legend line separator
-// $this->graph->drawFilledRoundedRectangle(35, $legend_offset + 30 ,$this->width-35,$legend_offset+30,0,220,220,220); 
-
-		$this->add_events ($this->legend[0]);
-		$this->add_alert_levels ();
-		
-		$this->graph->Stroke ();
-	}
-	
-	public function progress_bar ($value, $color) {
-		set_time_limit (0);
-		// Dataset definition
-		$this->graph = new pChart ($this->width, $this->height);
-		$this->graph->setFontProperties ($this->fontpath, 8);
-
-		// Round corners defined in global setup
-
-		global $config;
-		if ($config["round_corner"] != 0)
-			$radius = ($this->height > 18) ? 8 : 0;
-		else
-			$radius = 0;
-
-		$ratio = (int) $value / 100 * $this->width;
-		
-		// Color stuff 
-		$bgcolor = $this->get_rgb_values ($this->background_color);
-		$r = hexdec (substr ($this->background_color, 1, 2));
-		$g = hexdec (substr ($this->background_color, 3, 2));
-		$b = hexdec (substr ($this->background_color, 5, 2));
-		
-		// Actual percentage 
-		if (! $this->show_title || $value > 0) {
-			$color = $this->get_rgb_values ($color);
-			$this->graph->drawFilledRoundedRectangle (0, 0, $ratio, 
-				$this->height, $radius, $color['r'], $color['g'], $color['b']);
-		}
-		
-		if ($config["round_corner"]) {
-			// Under this value, the rounded rectangle is painted great 
-			if ($ratio <= 16) {
-				// Clean a bit of pixels 
-				for ($i = 0; $i < 7; $i++) {
-					$this->graph->drawLine (0, $i, 6 - $i, $i, 255, 255, 255);
-				}
-				$end = $this->height - 1;
-				for ($i = 0; $i < 7; $i++) {
-					$this->graph->drawLine (0, $end - $i, 5 - $i, $end - $i, 255, 255, 255);
-				}
-			}
-		}
-		
-		if ($ratio <= 60) {
-			if ($this->show_title) {
-				$this->graph->drawTextBox (0, 0, $this->width, $this->height,
-					$this->title, 0, 0, 0, 0, ALIGN_CENTER, false);
-			}
-		} else {
-			if ($this->show_title) {
-				$this->graph->drawTextBox (0, 0, $this->width, $this->height,
-					$this->title, 0, 255, 255, 255, ALIGN_CENTER, false);
-			}
-		}
-				
-		if ($this->border) {
-			$this->graph->drawRoundedRectangle (0, 0, $this->width - 1,
-				$this->height - 1,
-				$radius, 157, 157, 157);
-		}
-		
-		$this->graph->Stroke ();
-	}
-	
-	// Gets an array with each the components of a RGB string 
-	private static function get_rgb_values ($rgb_string) {
-		$color = array ('r' => 0, 'g' => 0, 'b' => 0);
-		$offset = 0;
-		if ($rgb_string[0] == '#')
-			$offset = 1;
-		$color['r'] = hexdec (substr ($rgb_string, $offset, 2));
-		$color['g'] = hexdec (substr ($rgb_string, $offset + 2, 2));
-		$color['b'] = hexdec (substr ($rgb_string, $offset + 4, 2));
-		return $color;
-	}
-	
-	private function add_alert_levels () {
-		if ($this->alert_top !== false) {
-			$this->graph->drawTreshold ($this->alert_top, 57,
-				96, 255, true, true, 4,
-				"Alert top");
-		}
-		if ($this->alert_bottom !== false) {
-			$this->graph->drawTreshold ($this->alert_bottom, 7,
-				96, 255, true, true, 4,
-				"Alert bottom");
-		}
-	}
-	
-	private function add_events ($serie = "Serie1") {
-		if (! $this->events)
-			return;
-		
-		// Unfortunatelly, the events must be draw manually 
-		
-		$first = $this->dataset->Data[0]["Name"];
-		$len = count ($this->dataset->Data) - 1;
-		
-		$last = $this->dataset->Data[$len]["Name"];
-		$ylen = $this->y2 - $this->y1;
-		
-		foreach ($this->data as $i => $data) {
-			// Finally, check if there were events 
-			if (! $data['events'])
-				continue;
-			
-			if (!isset($this->dataset->Data[$i]))
-				continue;
-				
-			$x1 = (int) ($this->x1 + $i * $this->graph->DivisionWidth);
-			$y1 = (int) ($this->y2 - ($this->dataset->Data[$i][$serie] * $this->graph->DivisionRatio));
-			$this->graph->drawFilledCircle ($x1, $y1, 1.5, 255, 0, 0);
-			if ($y1 == $this->y2)
-				// Lines in the same dot fails 
-				continue;
-			
-			$this->graph->drawDottedLine ($x1 - 1, $y1,
-				$x1 - 1, $this->y2,
-				5, 255, 150, 150);
-		}
-	}
-	
-	private function add_background () {
-		if ($this->graph == NULL)
-			return;
-		
-		$this->graph->setDateFormat ($this->date_format);
-		
-		$this->x1 = ($this->width > 300) ? 30 : 35;
-//		$this->y1 = ($this->height > 200) ? 25 : 10;
-		$this->x2 = ($this->width > 300) ? $this->width - 15 : $this->width - 15;
-		$this->y2 = ($this->height > 200) ? $this->height - 25 : $this->height - 25;
-		
-		if ($this->max_value > 10000 && $this->show_axis)
-			$this->x1 += 20;
-
-		$this->graph->drawGraphArea (255, 255, 255, true);
-				
-		$this->graph->setFontProperties ($this->fontpath, 7);
-		$size = $this->graph->getLegendBoxSize ($this->dataset->GetDataDescription ());
-		
-		// Old resize code for graph area, discard, we need all area in pure mode
-		//if (is_array ($size)) {
-		//	while ($size[1] > $this->y1)
-		//		$this->y1 += (int) $size[1] / 2;
-		//	if ($this->y1 > $this->y2)
-		//		$this->y1 = $this->y2;
-		//}
-		
-
-		if ($this->show_title == 1){
-			$this->y1=40;
-		} else {
-			$this->y1=10;
-		}
-
-		// No title for combined
-		if ($this->stacked !== false){
-			$this->y1=10;
-		}
-		
-		
-		$this->graph->setGraphArea ($this->x1, $this->y1, $this->x2, $this->y2);
-		
-		if ($this->show_title) {
-			$this->graph->setFontProperties ($this->fontpath, 12);
-			$this->graph->drawTextBox (2, 7, $this->width, 20, $this->title, 0, 0, 0, 0, ALIGN_LEFT, false);
-			$this->graph->setFontProperties ($this->fontpath, 9);
-			$this->graph->drawTextBox (0, 10, $this->width, 20, $this->subtitle,
-				0, 0, 0, 0, ALIGN_CENTER, false);
-
-			$this->graph->setFontProperties ($this->fontpath, 6);
-		}
-		
-		// This is a tiny watermark 
-		if ($this->watermark) {
-			if ($this->show_title){
-				$this->graph->setFontProperties ($this->fontpath, 7);
-				$this->graph->drawTextBox ($this->width - 8, 40,
-					$this->width - 240, 90, 'PANDORA FMS', 90,
-					174, 214, 174, ALIGN_BOTTOM_LEFT, false);
-			}
-			else {
-				$this->graph->setFontProperties ($this->fontpath, 7);
-				$this->graph->drawTextBox ($this->width - 8, 50,
-					$this->width - 240, 60, 'PANDORA FMS', 90,
-					174, 214, 174, ALIGN_BOTTOM_LEFT, false);
-		 	}
-		}
-	}
-	
-	private function add_legend () {
-		if ((! $this->show_title || $this->legend === false) && ($this->stacked === false)) {
-			return;
-		}
-
-		// Add legend 
-		$this->graph->setFontProperties ($this->fontpath, 6);
-		$size = $this->graph->getLegendBoxSize ($this->dataset->GetDataDescription ());
-		
-		// No title for combined, so legends goes up
-		if ($this->stacked !== false)
-			$this->graph->drawLegend ( 35, 12,
-			$this->dataset->GetDataDescription (),
-			245, 245, 245);
-		else
-			$this->graph->drawLegend ( 35, 52,
-			$this->dataset->GetDataDescription (),
-			245, 245, 245);
-	}
-	
-	private function set_colors () {
-		if ($this->graph == NULL)
-			return;
-		
-		for ($a = 0; $a<9; $a++){
-			$color = $this->get_rgb_values ($this->graph_color[$a+1]);
-			$this->graph->setColorPalette ($a, $color['r'], $color['g'], $color['b']);
-		}
-	}
-}
-*/
 ?>