diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index ba77543be9..239ce6220a 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,48 @@
+2009-06-30  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/FusionCharts,
+	  include/FusionCharts/FCF_Column3D.swf,
+	  include/FusionCharts/FCF_Pie3D.swf,
+	  include/FusionCharts/FusionCharts.js,
+	  include/FusionCharts/FCF_MSLine.swf,
+	  include/FusionCharts/FusionCharts_Gen.php,
+	  include/FusionCharts/FCF_StackedArea2D.swf,
+	  include/FusionCharts/FCF_Area2D.swf,
+	  include/FusionCharts/FCF_MSArea2D.swf,
+	  include/FusionCharts/FusionCharts.php: Added to repository. Fusion
+	  Charts Free.
+
+	* include/functions_fsgraph.php: Added to repository. Fusion Charts
+	  chart generation functions for Pandora FMS.
+	
+	* include/pchart_graph.php, include/pandora_graph.php,
+	  include/fgraph2.php, include/pChart, include/Image,
+	  include/fgraph.php: Moved from reporting to include.
+
+	* operation/agentes/stat_win.php: Moved from reporting to
+	  operation/agentes.
+
+	* reporting: Deleted from repository.
+
+	* general/logon_ok.php, godmode/setup/setup.php,
+	  godmode/admin_access_logs.php, godmode/db/db_main.php,
+	  godmode/db/db_info.php, godmode/db/db_purge.php,
+	  godmode/reporting/graph_builder.php,
+	  operation/reporting/reporting_xml.php,
+	  operation/reporting/reporting_viewer.php,
+	  operation/servers/view_server.php,
+	  operation/servers/view_server_detail.php,
+	  operation/incidents/incident_statistics.php
+	  operation/users/user_statistics.php,
+	  operation/events/event_statistics.php, operation/events/events.php,
+	  operation/agentes/estado_ultimopaquete.php,
+	  operation/agentes/estado_generalagente.php,
+	  operation/agentes/tactical.php, include/functions_config.php,
+	  include/functions_custom_graphs.php,
+	  include/functions_visual_map.php,
+	  include/functions_reporting.php: Added flash charts.
+
+
 2009-06-29  Jorge Gonzalez  <jorgegonz@artica.es>
 
 	* include/languages/index.pot: Updated po template.
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 27aacd41e4..18ddb231cc 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -64,7 +64,7 @@ $table->head = array ();
 $table->data = array ();
 $table->width = "100%";
 
-$img = "reporting/fgraph.php?tipo=progress&height=20&width=280&mode=0&percent=";
+$img = "include/fgraph.php?tipo=progress&height=20&width=280&mode=0&percent=";
 
 $table->data[0][0] ='<b>'.__('Monitor health').'</b>';
 $table->data[1][0] = print_image ($img.$data["monitor_health"], true, array ("title" => $data["monitor_health"].'% '.__('of monitors up')));
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index 56b912ac13..47e9407168 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -15,6 +15,9 @@
 
 
 require_once ("include/config.php");
+if ($config['flash_charts']) {
+	require_once ("include/fgraph.php");
+}
 
 check_login ();
 
@@ -52,7 +55,11 @@ echo '<br /><noscript><input name="uptbutton" type="submit" class="sub" value="'
 echo '</form></div>';
 
 echo '<div style="width:300px; height:140px; float:left;">';
-echo '<img src="reporting/fgraph.php?tipo=user_activity&width=300&height=140" />';
+if ($config['flash_charts']) {
+	echo graphic_user_activity (300, 140);
+} else {
+	echo '<img src="include/fgraph.php?tipo=user_activity&width=300&height=140" />';
+}
 echo '</div>';
 
 $filter = '';
@@ -106,4 +113,4 @@ foreach ($result as $row) {
 
 print_table ($table);
 
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php
index 8571f18ad3..b81a62c4fe 100644
--- a/pandora_console/godmode/db/db_info.php
+++ b/pandora_console/godmode/db/db_info.php
@@ -17,6 +17,9 @@
 
 // Load global vars
 require_once ("include/config.php");
+if ($config['flash_charts']) {
+	require('include/fgraph.php');
+}
 
 check_login ();
 	
@@ -42,11 +45,19 @@ echo '<div id="db_info_graph">';
 echo '<table border=0>';
 echo '<tr><td>';
 echo '<h3>'.__('Modules per agent').'</h3>';
-echo '<img src="reporting/fgraph.php?tipo=db_agente_modulo&width=600&height=200"><br />';
+if ($config['flash_charts']) {
+	echo graph_db_agentes_modulos ($width, $height);
+} else {
+	echo '<img src="include/fgraph.php?tipo=db_agente_modulo&width=600&height=200"><br />';
+}
 echo '</td></tr><tr><td><br /></tr></td>';
 echo '<tr><td>';
 echo '<h3>'.__('Packets per agent').'</h3>';
-echo '<img src="reporting/fgraph.php?tipo=db_agente_paquetes&width=600&height=200"><br />';
+if ($config['flash_charts']) {
+	echo grafico_db_agentes_paquetes ($width, $height);
+} else {
+	echo '<img src="include/fgraph.php?tipo=db_agente_paquetes&width=600&height=200"><br />';
+}
 echo '</table>';
 echo '<a href="#" onClick="toggleDiv(\'db_info_data\'); toggleDiv(\'db_info_graph\'); return false;">'.__('Press here to get database information as text').'</a></div>';
 echo '<div id="db_info_data" style="display:none">';
diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php
index ee9f77b442..33af0d6966 100644
--- a/pandora_console/godmode/db/db_main.php
+++ b/pandora_console/godmode/db/db_main.php
@@ -16,6 +16,9 @@
 
 // Load global vars
 require_once ("include/config.php");
+if ($config['flash_charts']) {
+	require_once ("include/fgraph.php");
+}
 
 check_login ();
 
@@ -44,8 +47,12 @@ echo '<h2>'.__('Database maintenance').' &raquo; '.__('Current database maintena
 <tr><td>
 <div align="justify">
 '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora').'
-</div><br />
-<img src="reporting/fgraph.php?tipo=db_agente_purge&id=-1&height=250&width=490">
-</td></tr>
+</div><br />';
+if ($config['flash_charts']) {
+	echo grafico_db_agentes_purge ($id_agente, $width, $height);
+} else {
+	echo '<img src="include/fgraph.php?tipo=db_agente_purge&id=-1&height=250&width=490">';
+}
+echo '</td></tr>
 </table>';
 ?>
diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php
index 4480f5ccf9..ac6be07f87 100644
--- a/pandora_console/godmode/db/db_purge.php
+++ b/pandora_console/godmode/db/db_purge.php
@@ -17,6 +17,9 @@
 
 // Load global vars
 require("include/config.php");
+if ($config['flash_charts']) {
+	require('include/fgraph.php');
+}
 
 check_login ();
 
@@ -30,10 +33,14 @@ if (! give_acl ($config['id_user'], 0, "DM")) {
 //id_agent = -1: None selected; id_agent = 0: All
 $id_agent = (int) get_parameter_post ("agent", -1);
 
-echo '<h2>'.__('Database maintenance').' &raquo; '.__('Database purge').'</h2>
-	<img src="reporting/fgraph.php?tipo=db_agente_purge&id='.$id_agent.'" />
-	<br /><br />
-	<h3>'.__('Get data from agent').'</h3>';
+echo '<h2>'.__('Database maintenance').' &raquo; '.__('Database purge').'</h2>';
+if ($config['flash_charts']) {
+	echo grafico_db_agentes_purge ($id_agent, $width, $height);
+} else {
+	echo '<img src="include/fgraph.php?tipo=db_agente_purge&id='.$id_agent.'" />';
+}
+echo '<br /><br />';
+echo '<h3>'.__('Get data from agent').'</h3>';
 
 // All data (now)
 $time["all"] = get_system_time ();
diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php
index 8bdc7b228d..0d73293827 100644
--- a/pandora_console/godmode/reporting/graph_builder.php
+++ b/pandora_console/godmode/reporting/graph_builder.php
@@ -16,6 +16,9 @@
 
 // Login check
 require_once ("include/config.php");
+if ($config['flash_charts']) {
+	require_once ('include/fgraph.php');
+}
 
 check_login ();
 
@@ -249,7 +252,12 @@ if (($render == 1) && (isset($modules))) {
 	echo "<h3>".__('Combined image render')."</h3>";
 	echo "<table class='databox'>";
 	echo "<tr><td>";
-	echo "<img src='reporting/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&stacked=$stacked&period=$period' border=1 alt=''>";
+	if ($config['flash_charts']) {
+		echo graphic_combined_module (split (',', $modules), split (',', $weights), $period, $width, $height,
+				'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked);
+	} else {
+		echo "<img src='include/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&stacked=$stacked&period=$period' border=1 alt=''>";
+	}
 	echo "</td></tr></table>";
 
 }
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 6a97b509ff..c2f4fb8aff 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -114,6 +114,10 @@ $table->data[18][0] = __('Use agent access graph');
 $table->data[18][1] = __('Yes').'&nbsp;'.print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'&nbsp;&nbsp;';
 $table->data[18][1] .= __('No').'&nbsp;'.print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true);
 
+$table->data[19][0] = __('Flash charts');
+$table->data[19][1] = __('Yes').'&nbsp;'.print_radio_button ('flash_charts', 1, '', $config["flash_charts"], true).'&nbsp;&nbsp;';
+$table->data[19][1] .= __('No').'&nbsp;'.print_radio_button ('flash_charts', 0, '', $config["flash_charts"], true);
+
 echo '<form id="form_setup" method="post">';
 print_input_hidden ('update_config', 1);
 print_table ($table);
diff --git a/pandora_console/include/FusionCharts/FCF_Area2D.swf b/pandora_console/include/FusionCharts/FCF_Area2D.swf
new file mode 100644
index 0000000000..224fb17ebf
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_Area2D.swf differ
diff --git a/pandora_console/include/FusionCharts/FCF_Column3D.swf b/pandora_console/include/FusionCharts/FCF_Column3D.swf
new file mode 100644
index 0000000000..a023642920
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_Column3D.swf differ
diff --git a/pandora_console/include/FusionCharts/FCF_MSArea2D.swf b/pandora_console/include/FusionCharts/FCF_MSArea2D.swf
new file mode 100644
index 0000000000..bff3774ae9
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_MSArea2D.swf differ
diff --git a/pandora_console/include/FusionCharts/FCF_MSLine.swf b/pandora_console/include/FusionCharts/FCF_MSLine.swf
new file mode 100644
index 0000000000..26329e644d
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_MSLine.swf differ
diff --git a/pandora_console/include/FusionCharts/FCF_Pie3D.swf b/pandora_console/include/FusionCharts/FCF_Pie3D.swf
new file mode 100644
index 0000000000..1d78f79b03
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_Pie3D.swf differ
diff --git a/pandora_console/include/FusionCharts/FCF_StackedArea2D.swf b/pandora_console/include/FusionCharts/FCF_StackedArea2D.swf
new file mode 100644
index 0000000000..5f8d3e7a11
Binary files /dev/null and b/pandora_console/include/FusionCharts/FCF_StackedArea2D.swf differ
diff --git a/pandora_console/include/FusionCharts/FusionCharts.js b/pandora_console/include/FusionCharts/FusionCharts.js
new file mode 100644
index 0000000000..42f8e4a149
--- /dev/null
+++ b/pandora_console/include/FusionCharts/FusionCharts.js
@@ -0,0 +1,361 @@
+/**
+ * FusionCharts: Flash Player detection and Chart embedding.
+ * Version 1.2.3F ( 22 November 2008) - Specialized for FusionChartsFREE 
+ * 					Checking Flash Version >=6 and added updateChartXML() for FREE Charts.
+ * Version: 1.2.3 (1st September, 2008) - Added Fix for % and & characters, scaled dimensions, fixes in to properly handling of double quotes and single quotes in setDataXML() function.
+ * Version: 1.2.2 (10th July, 2008) - Added Fix for % scaled dimensions, fixes in setDataXML() and setDataURL() functions
+ * Version: 1.2.1 (21st December, 2007) - Added setting up Transparent/opaque mode: setTransparent() function 
+ * Version: 1.2 (1st November, 2007) - Added FORM fixes for IE 
+ * Version: 1.1 (29th June, 2007) - Added Player detection, New conditional fixes for IE
+ *
+ * Morphed from SWFObject (http://blog.deconcept.com/swfobject/) under MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+if(typeof infosoftglobal == "undefined") var infosoftglobal = new Object();
+if(typeof infosoftglobal.FusionChartsUtil == "undefined") infosoftglobal.FusionChartsUtil = new Object();
+infosoftglobal.FusionCharts = function(swf, id, w, h, debugMode, registerWithJS, c, scaleMode, lang, detectFlashVersion, autoInstallRedirect){
+	if (!document.getElementById) { return; }
+	
+	//Flag to see whether data has been set initially
+	this.initialDataSet = false;
+	
+	//Create container objects
+	this.params = new Object();
+	this.variables = new Object();
+	this.attributes = new Array();
+	
+	//Set attributes for the SWF
+	if(swf) { this.setAttribute('swf', swf); }
+	if(id) { this.setAttribute('id', id); }
+
+	w=w.toString().replace(/\%$/,"%25");
+	if(w) { this.setAttribute('width', w); }
+	h=h.toString().replace(/\%$/,"%25");
+	if(h) { this.setAttribute('height', h); }
+
+	
+	//Set background color
+	if(c) { this.addParam('bgcolor', c); }
+	
+	//Set Quality	
+	this.addParam('quality', 'high');
+	
+	//Add scripting access parameter
+	this.addParam('allowScriptAccess', 'always');
+	
+	//Pass width and height to be appended as chartWidth and chartHeight
+	this.addVariable('chartWidth', w);
+	this.addVariable('chartHeight', h);
+
+	//Whether in debug mode
+	debugMode = debugMode ? debugMode : 0;
+	this.addVariable('debugMode', debugMode);
+	//Pass DOM ID to Chart
+	this.addVariable('DOMId', id);
+	//Whether to registed with JavaScript
+	registerWithJS = registerWithJS ? registerWithJS : 0;
+	this.addVariable('registerWithJS', registerWithJS);
+	
+	//Scale Mode of chart
+	scaleMode = scaleMode ? scaleMode : 'noScale';
+	this.addVariable('scaleMode', scaleMode);
+	
+	//Application Message Language
+	lang = lang ? lang : 'EN';
+	this.addVariable('lang', lang);
+	
+	//Whether to auto detect and re-direct to Flash Player installation
+	this.detectFlashVersion = detectFlashVersion?detectFlashVersion:1;
+	this.autoInstallRedirect = autoInstallRedirect?autoInstallRedirect:1;
+	
+	//Ger Flash Player version 
+	this.installedVer = infosoftglobal.FusionChartsUtil.getPlayerVersion();
+	
+	if (!window.opera && document.all && this.installedVer.major > 7) {
+		// Only add the onunload cleanup if the Flash Player version supports External Interface and we are in IE
+		infosoftglobal.FusionCharts.doPrepUnload = true;
+	}
+}
+
+infosoftglobal.FusionCharts.prototype = {
+	setAttribute: function(name, value){
+		this.attributes[name] = value;
+	},
+	getAttribute: function(name){
+		return this.attributes[name];
+	},
+	addParam: function(name, value){
+		this.params[name] = value;
+	},
+	getParams: function(){
+		return this.params;
+	},
+	addVariable: function(name, value){
+		this.variables[name] = value;
+	},
+	getVariable: function(name){
+		return this.variables[name];
+	},
+	getVariables: function(){
+		return this.variables;
+	},
+	getVariablePairs: function(){
+		var variablePairs = new Array();
+		var key;
+		var variables = this.getVariables();
+		for(key in variables){
+			variablePairs.push(key +"="+ variables[key]);
+		}
+		return variablePairs;
+	},
+	getSWFHTML: function() {
+		var swfNode = "";
+		if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) { 
+			// netscape plugin architecture			
+			swfNode = '<embed type="application/x-shockwave-flash" src="'+ this.getAttribute('swf') +'" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'"  ';
+			swfNode += ' id="'+ this.getAttribute('id') +'" name="'+ this.getAttribute('id') +'" ';
+			var params = this.getParams();
+			 for(var key in params){ swfNode += [key] +'="'+ params[key] +'" '; }
+			var pairs = this.getVariablePairs().join("&");
+			 if (pairs.length > 0){ swfNode += 'flashvars="'+ pairs +'"'; }
+			swfNode += '/>';
+		} else { // PC IE			
+			swfNode = '<object id="'+ this.getAttribute('id') +'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'">';
+			swfNode += '<param name="movie" value="'+ this.getAttribute('swf') +'" />';
+			var params = this.getParams();
+			for(var key in params) {
+			 swfNode += '<param name="'+ key +'" value="'+ params[key] +'" />';
+			}
+			var pairs = this.getVariablePairs().join("&");			
+			if(pairs.length > 0) {swfNode += '<param name="flashvars" value="'+ pairs +'" />';}
+			swfNode += "</object>";
+		}
+		return swfNode;
+	},
+	setDataURL: function(strDataURL){
+		//This method sets the data URL for the chart.
+		//If being set initially
+		if (this.initialDataSet==false){
+			this.addVariable('dataURL',strDataURL);
+			//Update flag
+			this.initialDataSet = true;
+		}else{
+			//Else, we update the chart data using External Interface
+			//Get reference to chart object
+			var chartObj = infosoftglobal.FusionChartsUtil.getChartObject(this.getAttribute('id'));
+			
+			if (!chartObj.setDataURL)
+			{
+				__flash__addCallback(chartObj, "setDataURL");
+			}
+			
+			chartObj.setDataURL(strDataURL);
+		}
+	},
+	//This function :
+	//fixes the double quoted attributes to single quotes
+	//Encodes all quotes inside attribute values
+	//Encodes % to %25 and & to %26;
+	encodeDataXML: function(strDataXML){
+		
+			var regExpReservedCharacters=["\\$","\\+"];
+			var arrDQAtt=strDataXML.match(/=\s*\".*?\"/g);
+			if (arrDQAtt){
+				for(var i=0;i<arrDQAtt.length;i++){
+					var repStr=arrDQAtt[i].replace(/^=\s*\"|\"$/g,"");
+					repStr=repStr.replace(/\'/g,"%26apos;");
+					var strTo=strDataXML.indexOf(arrDQAtt[i]);
+					var repStrr="='"+repStr+"'";
+					var strStart=strDataXML.substring(0,strTo);
+					var strEnd=strDataXML.substring(strTo+arrDQAtt[i].length);
+					var strDataXML=strStart+repStrr+strEnd;
+				}
+			}
+			
+			strDataXML=strDataXML.replace(/\"/g,"%26quot;");
+			strDataXML=strDataXML.replace(/%(?![\da-f]{2}|[\da-f]{4})/ig,"%25");
+			strDataXML=strDataXML.replace(/\&/g,"%26");
+
+			return strDataXML;
+
+	},
+	setDataXML: function(strDataXML){
+		//If being set initially
+		if (this.initialDataSet==false){
+			//This method sets the data XML for the chart INITIALLY.
+			this.addVariable('dataXML',this.encodeDataXML(strDataXML));
+			//Update flag
+			this.initialDataSet = true;
+		}else{
+			//Else, we update the chart data using External Interface
+			//Get reference to chart object
+			var chartObj = infosoftglobal.FusionChartsUtil.getChartObject(this.getAttribute('id'));
+			chartObj.setDataXML(strDataXML);
+		}
+	},
+	setTransparent: function(isTransparent){
+		//Sets chart to transparent mode when isTransparent is true (default)
+		//When no parameter is passed, we assume transparent to be true.
+		if(typeof isTransparent=="undefined") {
+			isTransparent=true;
+		}			
+		//Set the property
+		if(isTransparent)
+			this.addParam('WMode', 'transparent');
+		else
+			this.addParam('WMode', 'Opaque');
+	},
+	
+	render: function(elementId){
+		//First check for installed version of Flash Player - we need a minimum of 6
+		if((this.detectFlashVersion==1) && (this.installedVer.major < 6)){
+			if (this.autoInstallRedirect==1){
+				//If we can auto redirect to install the player?
+				var installationConfirm = window.confirm("You need Adobe Flash Player 6 (or above) to view the charts. It is a free and lightweight installation from Adobe.com. Please click on Ok to install the same.");
+				if (installationConfirm){
+					window.location = "http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash";
+				}else{
+					return false;
+				}
+			}else{
+				//Else, do not take an action. It means the developer has specified a message in the DIV (and probably a link).
+				//So, expect the developers to provide a course of way to their end users.
+				//window.alert("You need Adobe Flash Player 8 (or above) to view the charts. It is a free and lightweight installation from Adobe.com. ");
+				return false;
+			}			
+		}else{
+			//Render the chart
+			var n = (typeof elementId == 'string') ? document.getElementById(elementId) : elementId;
+			n.innerHTML = this.getSWFHTML();
+			
+			//Added <FORM> compatibility
+			//Check if it's added in Mozilla embed array or if already exits 
+			if(!document.embeds[this.getAttribute('id')] && !window[this.getAttribute('id')])
+		      	window[this.getAttribute('id')]=document.getElementById(this.getAttribute('id')); 
+				//or else document.forms[formName/formIndex][chartId]			
+			return true;		
+		}
+	}
+}
+
+/* ---- detection functions ---- */
+infosoftglobal.FusionChartsUtil.getPlayerVersion = function(){
+	var PlayerVersion = new infosoftglobal.PlayerVersion([0,0,0]);
+	if(navigator.plugins && navigator.mimeTypes.length){
+		var x = navigator.plugins["Shockwave Flash"];
+		if(x && x.description) {
+			PlayerVersion = new infosoftglobal.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/, "").replace(/(\s+r|\s+b[0-9]+)/, ".").split("."));
+		}
+	}else if (navigator.userAgent && navigator.userAgent.indexOf("Windows CE") >= 0){ 
+		//If Windows CE
+		var axo = 1;
+		var counter = 3;
+		while(axo) {
+			try {
+				counter++;
+				axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+ counter);
+				PlayerVersion = new infosoftglobal.PlayerVersion([counter,0,0]);
+			} catch (e) {
+				axo = null;
+			}
+		}
+	} else { 
+		// Win IE (non mobile)
+		// Do minor version lookup in IE, but avoid Flash Player 6 crashing issues
+		try{
+			var axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		}catch(e){
+			try {
+				var axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+				PlayerVersion = new infosoftglobal.PlayerVersion([6,0,21]);
+				axo.AllowScriptAccess = "always"; // error if player version < 6.0.47 (thanks to Michael Williams @ Adobe for this code)
+			} catch(e) {
+				if (PlayerVersion.major == 6) {
+					return PlayerVersion;
+				}
+			}
+			try {
+				axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			} catch(e) {}
+		}
+		if (axo != null) {
+			PlayerVersion = new infosoftglobal.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));
+		}
+	}
+	return PlayerVersion;
+}
+infosoftglobal.PlayerVersion = function(arrVersion){
+	this.major = arrVersion[0] != null ? parseInt(arrVersion[0]) : 0;
+	this.minor = arrVersion[1] != null ? parseInt(arrVersion[1]) : 0;
+	this.rev = arrVersion[2] != null ? parseInt(arrVersion[2]) : 0;
+}
+// ------------ Fix for Out of Memory Bug in IE in FP9 ---------------//
+/* Fix for video streaming bug */
+infosoftglobal.FusionChartsUtil.cleanupSWFs = function() {
+	var objects = document.getElementsByTagName("OBJECT");
+	for (var i = objects.length - 1; i >= 0; i--) {
+		objects[i].style.display = 'none';
+		for (var x in objects[i]) {
+			if (typeof objects[i][x] == 'function') {
+				objects[i][x] = function(){};
+			}
+		}
+	}
+}
+// Fixes bug in fp9
+if (infosoftglobal.FusionCharts.doPrepUnload) {
+	if (!infosoftglobal.unloadSet) {
+		infosoftglobal.FusionChartsUtil.prepUnload = function() {
+			__flash_unloadHandler = function(){};
+			__flash_savedUnloadHandler = function(){};
+			window.attachEvent("onunload", infosoftglobal.FusionChartsUtil.cleanupSWFs);
+		}
+		window.attachEvent("onbeforeunload", infosoftglobal.FusionChartsUtil.prepUnload);
+		infosoftglobal.unloadSet = true;
+	}
+}
+/* Add document.getElementById if needed (mobile IE < 5) */
+if (!document.getElementById && document.all) { document.getElementById = function(id) { return document.all[id]; }}
+/* Add Array.push if needed (ie5) */
+if (Array.prototype.push == null) { Array.prototype.push = function(item) { this[this.length] = item; return this.length; }}
+
+/* Function to return Flash Object from ID */
+infosoftglobal.FusionChartsUtil.getChartObject = function(id)
+{
+  var chartRef=null;
+  if (navigator.appName.indexOf("Microsoft Internet")==-1) {
+    if (document.embeds && document.embeds[id])
+      chartRef = document.embeds[id]; 
+	else
+	chartRef  = window.document[id];
+  }
+  else {
+    chartRef = window[id];
+  }
+  if (!chartRef)
+	chartRef  = document.getElementById(id);
+  
+  return chartRef;
+}
+/*
+ Function to update chart's data at client side (FOR FusionCharts vFREE and 2.x
+*/
+infosoftglobal.FusionChartsUtil.updateChartXML = function(chartId, strXML){
+	//Get reference to chart object				
+	var chartObj = infosoftglobal.FusionChartsUtil.getChartObject(chartId);		
+	//Set dataURL to null
+	chartObj.SetVariable("_root.dataURL","");
+	//Set the flag
+	chartObj.SetVariable("_root.isNewData","1");
+	//Set the actual data
+	chartObj.SetVariable("_root.newData",strXML);
+	//Go to the required frame
+	chartObj.TGotoLabel("/", "JavaScriptHandler"); 
+}
+
+
+/* Aliases for easy usage */
+var getChartFromId = infosoftglobal.FusionChartsUtil.getChartObject;
+var updateChartXML = infosoftglobal.FusionChartsUtil.updateChartXML;
+var FusionCharts = infosoftglobal.FusionCharts;
\ No newline at end of file
diff --git a/pandora_console/include/FusionCharts/FusionCharts.php b/pandora_console/include/FusionCharts/FusionCharts.php
new file mode 100644
index 0000000000..aa174c5f50
--- /dev/null
+++ b/pandora_console/include/FusionCharts/FusionCharts.php
@@ -0,0 +1,144 @@
+<?php
+// Page: FusionCharts.php
+// Author: InfoSoft Global (P) Ltd.
+// This page contains functions that can be used to render FusionCharts.
+
+
+// encodeDataURL function encodes the dataURL before it's served to FusionCharts.
+// If you've parameters in your dataURL, you necessarily need to encode it.
+// Param: $strDataURL - dataURL to be fed to chart
+// Param: $addNoCacheStr - Whether to add aditional string to URL to disable caching of data
+function encodeDataURL($strDataURL, $addNoCacheStr=false) {
+    //Add the no-cache string if required
+    if ($addNoCacheStr==true) {
+        // We add ?FCCurrTime=xxyyzz
+        // If the dataURL already contains a ?, we add &FCCurrTime=xxyyzz
+        // We replace : with _, as FusionCharts cannot handle : in URLs
+		if (strpos(strDataURL,"?")<>0)
+			$strDataURL .= "&FCCurrTime=" . Date("H_i_s");
+		else
+			$strDataURL .= "?FCCurrTime=" . Date("H_i_s");
+    }
+	// URL Encode it
+	return urlencode($strDataURL);
+}
+
+
+// datePart function converts MySQL database based on requested mask
+// Param: $mask - what part of the date to return "m' for month,"d" for day, and "y" for year
+// Param: $dateTimeStr - MySQL date/time format (yyyy-mm-dd HH:ii:ss)
+function datePart($mask, $dateTimeStr) {
+    @list($datePt, $timePt) = explode(" ", $dateTimeStr);
+    $arDatePt = explode("-", $datePt);
+    $dataStr = "";
+    // Ensure we have 3 parameters for the date
+    if (count($arDatePt) == 3) {
+        list($year, $month, $day) = $arDatePt;
+        // determine the request
+        switch ($mask) {
+        case "m": return (int)$month;
+        case "d": return (int)$day;
+        case "y": return (int)$year;
+        }
+        // default to mm/dd/yyyy
+        return (trim($month . "/" . $day . "/" . $year));
+    }
+    return $dataStr;
+}
+
+
+// renderChart renders the JavaScript + HTML code required to embed a chart.
+// This function assumes that you've already included the FusionCharts JavaScript class
+// in your page.
+
+// $chartSWF - SWF File Name (and Path) of the chart which you intend to plot
+// $strURL - If you intend to use dataURL method for this chart, pass the URL as this parameter. Else, set it to "" (in case of dataXML method)
+// $strXML - If you intend to use dataXML method for this chart, pass the XML data as this parameter. Else, set it to "" (in case of dataURL method)
+// $chartId - Id for the chart, using which it will be recognized in the HTML page. Each chart on the page needs to have a unique Id.
+// $chartWidth - Intended width for the chart (in pixels)
+// $chartHeight - Intended height for the chart (in pixels)
+function renderChart($chartSWF, $strURL, $strXML, $chartId, $chartWidth, $chartHeight) {
+	//First we create a new DIV for each chart. We specify the name of DIV as "chartId"Div.			
+	//DIV names are case-sensitive.
+
+    // The Steps in the script block below are:
+    //
+    //  1)In the DIV the text "Chart" is shown to users before the chart has started loading
+    //    (if there is a lag in relaying SWF from server). This text is also shown to users
+    //    who do not have Flash Player installed. You can configure it as per your needs.
+    //
+    //  2) The chart is rendered using FusionCharts Class. Each chart's instance (JavaScript) Id 
+    //     is named as chart_"chartId".		
+    //
+    //  3) Check whether we've to provide data using dataXML method or dataURL method
+    //     save the data for usage below 
+	if ($strXML=="")
+        $tempData = "//Set the dataURL of the chart\n\t\tchart_$chartId.setDataURL(\"$strURL\")";
+    else
+        $tempData = "//Provide entire XML data using dataXML method\n\t\tchart_$chartId.setDataXML(\"$strXML\")";
+
+    // Set up necessary variables for the RENDERCAHRT
+    $chartIdDiv = $chartId . "Div";
+
+    // create a string for outputting by the caller
+	$render_chart = <<<RENDERCHART
+	<!-- START Script Block for Chart $chartId -->
+	<div id="$chartIdDiv" align="center">
+		Chart.
+	</div>
+	<script type="text/javascript">	
+		//Instantiate the Chart	
+		var chart_$chartId = new FusionCharts("$chartSWF", "$chartId", "$chartWidth", "$chartHeight");
+		$tempData
+		//Finally, render the chart.
+		chart_$chartId.render("$chartIdDiv");
+	</script>	
+	<!-- END Script Block for Chart $chartId -->
+RENDERCHART;
+
+  return $render_chart;
+}
+
+
+//renderChartHTML function renders the HTML code for the JavaScript. This
+//method does NOT embed the chart using JavaScript class. Instead, it uses
+//direct HTML embedding. So, if you see the charts on IE 6 (or above), you'll
+//see the "Click to activate..." message on the chart.
+// $chartSWF - SWF File Name (and Path) of the chart which you intend to plot
+// $strURL - If you intend to use dataURL method for this chart, pass the URL as this parameter. Else, set it to "" (in case of dataXML method)
+// $strXML - If you intend to use dataXML method for this chart, pass the XML data as this parameter. Else, set it to "" (in case of dataURL method)
+// $chartId - Id for the chart, using which it will be recognized in the HTML page. Each chart on the page needs to have a unique Id.
+// $chartWidth - Intended width for the chart (in pixels)
+// $chartHeight - Intended height for the chart (in pixels)
+function renderChartHTML($chartSWF, $strURL, $strXML, $chartId, $chartWidth, $chartHeight) {
+    // Generate the FlashVars string based on whether dataURL has been provided
+    // or dataXML.
+    $strFlashVars = "&chartWidth=" . $chartWidth . "&chartHeight=" . $chartHeight ;
+    if ($strXML=="")
+        // DataURL Mode
+        $strFlashVars .= "&dataURL=" . $strURL;
+    else
+        //DataXML Mode
+        $strFlashVars .= "&dataXML=" . $strXML;
+
+$HTML_chart = <<<HTMLCHART
+	<!-- START Code Block for Chart $chartId -->
+	<OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase=http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"  width="$chartWidth" height="$chartHeight" id="$chartId">
+		<param name="allowScriptAccess" value="always" />
+		<param name="movie" value="$chartSWF"/>		
+		<param name="FlashVars" value="$strFlashVars" />
+		<param name="quality" value="high" />
+		<embed src="$chartSWF" FlashVars="$strFlashVars" quality="high" width="$chartWidth" height="$chartHeight" name="$chartId" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+	</object>
+	<!-- END Code Block for Chart $chartId -->
+HTMLCHART;
+
+  return $HTML_chart;
+}
+
+// boolToNum function converts boolean values to numeric (1/0)
+function boolToNum($bVal) {
+    return (($bVal==true) ? 1 : 0);
+}
+
+?>
\ No newline at end of file
diff --git a/pandora_console/include/FusionCharts/FusionCharts_Gen.php b/pandora_console/include/FusionCharts/FusionCharts_Gen.php
new file mode 100644
index 0000000000..c2ebda5cb3
--- /dev/null
+++ b/pandora_console/include/FusionCharts/FusionCharts_Gen.php
@@ -0,0 +1,2162 @@
+<?php
+/*
+   FUSIONCHARTS FREE API PHP CLASS 
+   Author  :  Infosoft Global Pvt. Ltd. 
+   version :  FREE
+   Company :  Infosoft Global Pvt. Ltd. 
+   
+   *  Version: 1.0.1 (11 December 2008) [ Fix PHP Short Tag, Function addDatasetsFromDatabase 
+   *                                    Modifiaction for Transposed ,
+   *                                    Fix Transparent setting, FusionCharts.php insight Code  
+   *                                    setInitParam Function Add, addColors Function Add,
+   *                                    encodeXMLChars Function Add ]
+   
+   FusionCharts Class easily handles All FusionCharts XML Structures like
+   graph, categories, dataset, set, Trend Lines, [vline, styles (for Future)] etc.
+   It’s easy to use, it binds data into FusionCharts XML Structures
+   
+ */
+
+class FusionCharts{
+
+	var $chartType;               # Chart Friendly Name
+	var $chartID;				  # ID of the Chart for JS interactivity(optional)
+	var $SWFFile; 				  # Name of the required FusionCharts SWF file 
+	var $SWFPath;                 # relative path of FusionCharts SWF files
+	var $width;                   # FusionCharts width
+	var $height;                  # FusionCharts height
+
+	# attribute Delimiter
+	var $del;
+
+    # Chart XML string 
+    var $strXML; 
+	
+	# Chart Series Types : 1 => single series, 2=> multi-series, 5=>Gantt (
+	# For Future Use : 3=> scatter and bubble, 4=> MSStacked
+     var $seriesType;               
+
+	# Charts Atribute array 
+	var $chartParams = array();     #List of Chart Parameters
+	var $chartParamsCounter;		#Number of Chart parameters
+	
+	var $categoriesParam;           # Categories Parameter Setting 
+	var $categoryNames = array();   # Category array for storing Category set
+	var $categoryNamesCounter;      # Category array counter
+	
+	var $dataset = array();         # dataset array
+	var $datasetParam = array();    # dataset parameter setting array
+	var $datasetCounter;            # dataset array counter
+	var $setCounter;                # set array counter 
+
+
+    # trendLines array
+    var $trendLines = array();      # trendLines array
+	var $tLineCounter;              # trendLines array counter
+
+    #chart messages
+	var $chartMSG;
+
+	var $chartSWF = array();		# Charts SWF array
+	var $arr_FCColors = array(); 	# Color Set to be applied to dataplots
+	var $UserColorON;               # User define color define true or false
+    var $userColorCounter;
+	
+	// Cache Control
+	var $noCache;
+
+    var $DataBaseType;             # DataBase Type
+	
+	var $encodeChars;               # XML for dataXML or dataURL
+	
+#############============ For Gantt Chart  ============================
+    # Gantt categories
+	var $GT_categories = array();
+	var $GT_categories_Counter;
+	var $GT_categoriesParam = array();
+	 
+	var $GT_subcategories_Counter; 
+	
+	# Gantt processes
+	var $GT_processes = array();
+	var $GT_processes_Counter;
+	var $GT_processes_Param;
+	
+	# Gantt Tasks
+	var $GT_Tasks = array();
+	var $GT_Tasks_Counter;
+	var $GT_Tasks_Param;
+	
+	# Gantt Connectors
+	var $GT_Connectors = array();
+	var $GT_Connectors_Counter;
+	var $GT_Connectors_Param;
+
+	# Gantt Milestones
+	var $GT_Milestones = array();
+	var $GT_Milestones_Counter;
+	var $GT_Milestones_Param;
+	
+	# Gantt datatable
+	var $GT_datatable = array();
+	var $GT_datatable_Counter;
+	var $GT_datatableParam;
+	var $GT_dataColumnParam = array();
+	 
+	var $GT_subdatatable_Counter; 
+	
+	#------- For Futute Use (start)----------------	
+	# Gantt legend
+	var $GT_legend = array();
+	var $GT_legend_Counter;
+	var $GT_legend_Param;
+	#------- For Futute Use (end)----------------
+	 
+	var $wMode;
+	
+	# Advanced Chart settings
+	var $JSC = array();
+	
+#############============ For Future Use (start)============================
+	# dataset for MSStackedColumn2D
+	
+	var $MSSDataset = array();       # dataset array for MSStackedColumn2D
+	var $MSSDatasetParams = array();  # MSSDataset parameter setting
+	
+	var $MSSDatasetCounter;          # MSSDataset array counter
+     var $MSSSubDatasetCounter;       # ms sub dataset array counter
+	var $MSSSetCounter;              # msset array counter
+	
+	# lineset 
+	var $lineSet = array();         # lineSet array
+	var $lineSetParam = array();    # lineSet Parameter setting array
+	  
+	var $lineCounter;               # line array counter 
+	var $lineSetCounter;            # lineset array counter
+	var $lineIDCounter;             # lineID counter;
+	
+	# vtrendLines array
+    var $vtrendLines = array();     # vtrendLines array
+	var $vtLineCounter;             # vtrendLines array counter
+
+    # style array
+    var $styles = array();           # styles array
+    var $styleDefCounter;                # define counter
+	var $styleAppCounter;                # apply counter
+	
+
+#############============ For Future Use (end)============================
+
+	 
+	 # FusionCharts Constructor, its take 4  Parameters.
+	 # when we create object of FusionCharts, then Constructor will auto run and initialize 
+	 # chats array parameter like chartType, width, height, chartsID
+	 function FusionCharts($chartType="column2d",$width="400",$height="300",$chartID="",$isTransparent=""){
+		
+		  $this->wMode=$isTransparent;
+		  # Setting All Charts Array
+		  $this->setChartArrays();
+		  
+		  #initialise colorList
+		  $this->colorInit();
+		  
+		  # Setting Chart name
+		  $this->chartType=strtolower($chartType);
+		  # Getting Charts Series Type
+		  $this->getSeriesType();		
+		  
+		  # Setting Charts Width and Height
+		  $this->width=$width;
+		  $this->height=$height;
+		  
+		  # Setting ChartID, Defult is Charts Name
+		  if ($chartID==""){
+		  	$chartCounter=@$_SESSION['chartcount'];
+			if($chartCounter<=0 || $chartCounter==NULL){
+				$chartCounter=1;
+			}
+			
+		    $this->chartID=$chartType . $chartCounter;
+			$_SESSION['chartcount']=++$chartCounter;
+			
+		  }else{
+		    $this->chartID=$chartID;
+		  }
+	       	     
+		  # Setting Defult Parameter Delimiter  to ';'
+		  $this->del=";";
+		
+		  # Setting Default SWF Path
+		  $this->SWFPath="";
+		  $this->SWFFile=$this->SWFPath . "FCF_" . $this->chartSWF[$this->chartType][0]  . ".swf";
+		  # Initialize categoriesParam 
+		  $this->categoriesParam="";
+		  $this->categoryNamesCounter=1;
+		  
+		  # Creating Category Array
+		  $this->createCategory($this->categoryNamesCounter);
+		
+		  # Initialize Dataset Variables
+	      $this->datasetCounter=0;
+          $this->setCounter= 0;
+		  if($this->seriesType>1){
+		    $this->setCounter++;
+		  }
+		
+		  # Initialize  MSSDataset Variables
+		  if($this->seriesType==4){
+		    $this->MSSDatasetCounter=0;
+		    $this->MSSSubDatasetCounter=0;
+	        $this->MSSSetCounter=0;
+			
+			$this->lineCounter=0;
+            $this->lineSetCounter=0;
+			$this->lineIDCounter=0;
+          }
+		  
+		  # vTrendLines Array inisialize
+		  if($this->seriesType==3){
+		    $this->vtLineCounter=1;
+		    $this->createvTrendLines($this->vtLineCounter);
+	      }
+		  
+		  # TrendLines Array inisialize
+		  $this->tLineCounter=1;
+		  $this->createTrendLines($this->tLineCounter);
+		
+		  # Styles Array inisialize
+		  $this->styleDefCounter=1;
+		  $this->styleAppCounter=1;
+		  $this->createStyles("definition");
+		  $this->createSubStyles("definition","style");
+		  $this->createSubStylesParam("definition","style",$this->styleDefCounter);
+        
+		  $this->GT_categories_Counter=0;
+	 	  $this->GT_subcategories_Counter=0;
+		  
+		  $this->GT_processes_Counter=0;
+		  $this->GT_processes_Param="";
+		  
+		  $this->GT_Tasks_Counter=0;
+	      $this->GT_Tasks_Param="";
+		 	
+		  # Gantt Connectors
+	      $this->GT_Connectors_Counter=0;
+	      $this->GT_Connectors_Param="";
+		  
+		  # Gantt datatable
+		  $this->GT_datatable_Counter=0;
+	      $this->GT_datatableParam="";
+	      $this->GT_subdatatable_Counter=0;
+		  
+		  # Gantt legend
+		  $this->GT_legend_Counter=0;
+	      $this->GT_legend_Param="";
+				  
+		  $this->chartMSG="";
+		  # XML store Variables 
+		  $this->strXML="";
+		  
+		  $this->UserColorON = false;
+		  $this->userColorCounter=0;
+		  
+		  $this->noCache=false;
+		  $this->DataBaseType="mysql";
+		  
+		  // JS Constructor
+		  $this->JSC["debugmode"]=false;       # debugmode default is false
+		  $this->JSC["registerwithjs"]=false;  # registerwithJS default is false
+	      $this->JSC["bgcolor"]="";            # bgcolor default not set
+	      $this->JSC["scalemode"]="noScale";   # scalemode default noScale
+	      $this->JSC["lang"]="EN";             # Language default EN
+		  
+		  // dataXML type encode
+		  $this->encodeChars=true;
+		  
+	 }
+	 
+
+##------------ PUBLIC FUNCTIONS ----------------------------------------------------------------
+     # Special Character
+     function encodeXMLChars($option=true){
+	     $this->$encodeChars=$option;
+	 } 
+	 # Setting Parameter Delimiter, Defult Parameter Separator is ";"
+	 function setParamDelimiter($strDel){
+	   $this->del=$strDel;
+	 }
+	 
+	 # Database type set like ORACLE and MYSQL
+	 function setDataBaseType($dbType){
+	    $this->DataBaseType=strtolower($dbType);
+	 }
+	 
+	 # Setting path of SWF file. file name like FCF_Column3D.swf. where FCF_ is common for all SWF file
+	 function setSWFPath($SWFPath){
+	   $this->SWFPath=$SWFPath;
+	   $this->SWFFile=$this->SWFPath . "FCF_" . $this->chartSWF[$this->chartType][0]  . ".swf";
+	 }
+	 
+	 # We can add or change single Chart parameter by setChartParam function
+	 # its take Parameter Name and its Value
+	 function setChartParam($paramName, $paramValue){
+	   $this->chartParams[$paramName]=$this->encodeSpecialChars($paramValue);
+	 }
+	 
+	 # We can add or change Chart parameter sets by setChartParams function
+	 # its take parameterset [ caption=xyz caption;subCaption=abcd abcd abcd;xAxisName=x axis;yAxisName=y's axis;bgColor=f2fec0;animation=1 ]
+	 # Defult Parameter Separator is ";"
+	 function setChartParams($strParam){
+	   $listArray=explode($this->del,$strParam);
+	   foreach ($listArray as $valueArray) {
+	       $paramValue=explode("=",$valueArray,2);
+		   if($this->validateParam($paramValue)==true){
+		    $this->chartParams[$paramValue[0]]=$this->encodeSpecialChars($paramValue[1]);
+		   }
+	   }
+	 }
+	 
+	 
+	 # Setting Categories Parameter into categoriesParam variables
+	 function setCategoriesParams($strParam){
+	   
+	   $this->categoriesParam .= $this->ConvertParamToXMLAttribute($strParam);
+	 }
+	 
+	 
+	 # Function addCategoryFromDatabase adding Category from dataset
+	 function addCategoryFromDatabase($query_result, $categoryColumn){
+		if($this->DataBaseType=="mysql"){	 
+			 # fetching recordset till eof
+			 while($row = mysql_fetch_array($query_result)){
+				# add category
+				$this->addCategory($row[$categoryColumn],"","" );
+			 } 
+		}elseif($this->DataBaseType=="oracle"){
+		     # fetching recordset till eof
+			 while(OCIFetchInto($query_result, $row, OCI_ASSOC)){
+				# add category
+				$this->addCategory($row[$categoryColumn],"","" );
+			 } 
+		
+		}	 
+	 }
+	 
+	 # Function addCategoryFromArray adding Category from Array
+	 function addCategoryFromArray($categoryArray){
+	         # convert array to category set
+			 foreach ($categoryArray as $value) {
+			  # adding category
+			  $this->addCategory($value);
+			 }
+	 }
+	 
+	 # Function for create set and catagory, dataset , set from array
+	 function addChartDataFromArray($dataArray, $dataCatArray=""){
+		if(is_array($dataArray)){
+			if ($this->seriesType==1){
+			   # Single series Array
+			   # aa[..][..]="name" aa[..][..]="value"
+			   foreach($dataArray as $arrayvalue){
+				 if(is_array($arrayvalue)){
+				   $this->addChartData($arrayvalue[1],"name=" . $arrayvalue[0] );	   
+				 }
+			   } 		
+			}else{
+			   # Multi series Array
+			   if(is_array($dataCatArray)){
+				   foreach($dataCatArray as $value){
+					   $this->addCategory($value);
+				   }
+			   }
+			   foreach($dataArray as $arrayvalue){
+			     if(is_array($arrayvalue)){
+				   $i=0;
+				   $aaa[0]="";$aaa[1]="";
+				   foreach($arrayvalue as $value){
+				     if($i>=2){
+					   	$this->addChartData($value);
+					 }else{
+					    $aaa[$i]=$value;
+					 }				 					
+				     if($i==1){
+					   $this->addDataset($aaa[0],$aaa[1]);
+					 }
+					 $i++;
+					 
+				   }
+				 } 
+			   }
+			}
+		}	
+	 }
+	 
+	 # Function addCategory adding Category and vLine element
+	 function addCategory($label="",$catParam="",$vlineParam = "" ){
+	 	 $strCatXML="";
+		 $strParam="";
+		 $label=$this->encodeSpecialChars($label);
+		 # cheking vlineParam equal blank
+		 if($vlineParam==""){
+		   # cheking catParam not blank
+		   if($catParam!=""){
+
+		       $strParam = $this->ConvertParamToXMLAttribute($catParam);
+
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<category name='" . $label . "' " . $strParam . " />";
+           
+		 }else{
+		   
+		   $strParam = $this->ConvertParamToXMLAttribute($vlineParam);
+		   
+		   # adding parameter set to vLine
+		   $strCatXML="<vLine " . $strParam . "  />"; 
+		 }
+		 # storing into categoryNames array
+		 $this->categoryNames[$this->categoryNamesCounter]=$strCatXML;
+		 # Increase Counter
+		 $this->categoryNamesCounter++;
+	 }
+	
+	 
+	 # adding dataset array element
+	 function addDataset($seriesName, $strParam=""){
+	   $this->datasetCounter++;
+       $this->createDataset($this->datasetCounter);
+	   	   
+	   $this->setCounter++;
+	   $this->createDataValues($this->datasetCounter,"_" . $this->setCounter);	
+	
+	   $seriesName=$this->encodeSpecialChars($seriesName);	
+	   # creating seriesName and dataset parameter set
+	   $tempParam="";
+	   $tempParam ="seriesName='" . $seriesName . "' ";
+	   $tempParam .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	   $colorParam="";
+	   $pos = strpos(strtolower($tempParam), " color");
+	   if ($pos === false) {
+	     $colorParam=" color='" . $this->getColor($this->datasetCounter-1) . "'";
+	   }
+
+		# setting  datasetParam array
+		$this->datasetParam[$this->datasetCounter]=$tempParam . $colorParam;
+		
+	 }
+	 
+				   
+	 # Function addChartData adding set data element
+	 function addChartData($value="",$setParam="",$vlineParam = "" ){
+	     $strSetXML="";
+		 
+		 # Choosing dataset depend on seriesType and getting XML set
+		 if($this->seriesType>=1 and $this->seriesType<=2){
+ 		   
+		   $strSetXML=$this->setSSMSDataArray($value,$setParam,$vlineParam);
+		 
+		 }elseif ($this->seriesType==3){
+		 
+		   $strSetXML=$this->setScatterBubbleDataArray($value,$setParam,$vlineParam); 
+		 
+		 }elseif (($this->seriesType==4)){
+		 
+		   $strSetXML=$this->setSSMSDataArray($value,$setParam,$vlineParam);
+		 
+		 }
+		 
+		 # Adding xml set to dataset array and Increase set counter
+		 if ($this->seriesType==1){
+		      $this->dataset[$this->setCounter]=$strSetXML;
+		      $this->setCounter++;
+		 }elseif($this->seriesType>1 and $this->seriesType<4){
+		      $this->dataset[$this->datasetCounter]["_" . $this->setCounter]=$strSetXML;
+		      $this->setCounter++;
+		 }elseif($this->seriesType==4){
+			  $this->MSSDataset[$this->MSSDatasetCounter][$this->MSSSubDatasetCounter][$this->MSSSetCounter]=$strSetXML;
+			  $this->MSSSetCounter++;
+		 }
+	 }
+	 
+	 # The addDatasetsFromDatabase() function adds dataset and set elements from -
+	 # database, by Default, from MySql recordset. You can use setDatabaseType() function -
+	 # to set the type of database to work on.
+	 function addDatasetsFromDatabase($query_result, $ctrlField, $valueField,$datsetParamArray="",$link=""){
+			
+			 # Initialize variables
+			 $paramset="";
+			 $tempContrl="";
+			 if(is_array($datsetParamArray)==false){
+			 	$datsetParamArray=array();
+			 }
+			 
+			 # Calculate total no of array elements in datsetParamArray
+			 $arrLimit=count($datsetParamArray);
+			 $i=1;
+			 $tempParam="";
+			 if($this->DataBaseType=="mysql"){ 	
+				 ##### For My SQL Connection
+				 $FieldArray=explode($this->del,$valueField);
+				 if(count($FieldArray)>1){
+   				     ### Muli Series
+					 # fetching recordset
+					 while($row = mysql_fetch_array($query_result)){
+					    # Add Category
+						$this->addCategory($row[$ctrlField]);
+					 }
+					
+					 $k=0;
+					 # Add daatset for multiple fields
+					 foreach ($FieldArray as $FieldName) {
+					   					  
+						   if($k<$arrLimit){
+							  $tempParam = $datsetParamArray[$k];  
+  						   }else{
+							  $tempParam="";
+						   }
+						   # Add Dataset with adddataset() function
+						   $this->addDataset($FieldName,$tempParam);
+						   
+						   # rewind query result
+						   mysql_data_seek($query_result,0);
+						   while($row = mysql_fetch_array($query_result)){ 
+						   
+						        # Generating URL link 
+						        if($link==""){
+							      $paramset="";
+						        }else{
+							      # Generating URL link from getLinkFromPattern
+							      $paramset="link=" . urlencode($this->getLinkFromPattern($row,$link));
+								}
+								# add value to dataset
+						        $this->addChartData($row[$FieldName], $paramset, "");
+								
+						   }
+						  $k++; 
+					 }
+					
+				  }else{			 
+				 
+					 ### Single Series
+					 # fetching recordset
+					 while($row = mysql_fetch_array($query_result)){
+						   # Creating Control break depending on ctrlField
+						   # if ctrlField value changes then dataset will be Generated
+						   if ($tempContrl!=$row[$ctrlField]){
+									if($i<=$arrLimit){
+									  $tempParam = $datsetParamArray[$i-1];  
+									}else{
+									  $tempParam="";
+									}
+									# Add Dataset with adddataset() function
+									$this->addDataset($row[$ctrlField],$tempParam);
+									$tempContrl=$row[$ctrlField];
+									$i++;
+						   }
+						# Generating URL link 
+						   if($link==""){
+							  $paramset="";
+						   }else{
+							  # Generating URL link from getLinkFromPattern
+							  $paramset="link=" . urlencode($this->getLinkFromPattern($row,$link));
+						   }
+						   # add value to dataset
+						   $this->addChartData($row[$valueField], $paramset, "");
+						   
+					}
+			    }		
+		  }elseif($this->DataBaseType=="oracle"){
+				 # For Oracle Connection
+				 # fetching recordset
+				 while(OCIFetchInto($query_result, $row, OCI_ASSOC)){
+					   # Create Control break depending on ctrlField
+					   # if ctrlField value changes then dataset will be Generated
+					   if ($tempContrl!=$row[$ctrlField]){
+								if($i<=$arrLimit){
+								  $tempParam = $datsetParamArray[$i-1];  
+								}else{
+								  $tempParam="";
+								}
+								# add Dataset 
+								$this->addDataset($row[$ctrlField],$tempParam);
+								$tempContrl=$row[$ctrlField];
+								$i++;
+					   }
+					# Generating URL link 
+					   if($link==""){
+						  $paramset="";
+					   }else{
+						  # Generating URL link from getLinkFromPattern
+						  $paramset="link=" . urlencode($this->getLinkFromPattern($row,$link));
+					   }
+					   # add value to dataset
+					   $this->addChartData($row[$valueField], $paramset, "");
+				}
+		  }	 
+	}
+	 
+	 # addDataFromDatabase funcion take 5 parameter like query_result, label field, value field 
+	 # and initialize dataset variables and link
+	 function addDataFromDatabase($query_result, $db_field_ChartData,$db_field_CategoryNames="", $strParam="",$LinkPlaceHolder=""){
+	   	      	   
+		$paramset="";		   
+	   if($this->DataBaseType=="mysql"){	
+		   # fetching recordset till eof
+		   while($row = mysql_fetch_array($query_result)){
+			
+			          if($LinkPlaceHolder==""){
+						  $paramset="";
+					   }else{
+						   # Getting link
+						  $paramset="link=" . urlencode($this->getLinkFromPattern($row,$LinkPlaceHolder));
+					   }
+					   if ($strParam=""){
+						 $strParam=$paramset;
+					   }else{
+						 $strParam .= ";" . $paramset; 
+					   }
+			
+			 # covert to set element and save to $partXML
+			 if($db_field_CategoryNames==""){
+				$data=@$row[$db_field_ChartData];
+				if($strParam!="")
+					$this->addChartData($this->encodeSpecialChars($data),$strParam);
+				else
+				 $this->addChartData($this->encodeSpecialChars($data));
+			}
+			else{
+				$data=@$row[$db_field_ChartData];
+				$label=@$row[$db_field_CategoryNames];
+				$this->addChartData($this->encodeSpecialChars($data),"name=" . $this->encodeSpecialChars($label) . ";" .$strParam,"" );
+			}
+         }
+	   }elseif($this->DataBaseType=="oracle"){
+		   # fetching recordset till eof
+		   while(OCIFetchInto($query_result, $row, OCI_ASSOC)){
+			
+			          if($LinkPlaceHolder==""){
+						  $paramset="";
+					   }else{
+						   # Getting link
+						  $paramset="link=" . urlencode($this->getLinkFromPattern($row,$LinkPlaceHolder));
+					   }
+					   if ($strParam=""){
+						 $strParam=$paramset;
+					   }else{
+						 $strParam .= ";" . $paramset; 
+					   }
+			
+			 # covert to set element and save to $partXML
+			 if($db_field_CategoryNames==""){
+				$data=@$row[$db_field_ChartData];
+				if($strParam!="")
+					$this->addChartData($this->encodeSpecialChars($data),$strParam);
+				else
+				 $this->addChartData($this->encodeSpecialChars($data));
+			}
+			else{
+				$data=@$row[$db_field_ChartData];
+				$label=@$row[$db_field_CategoryNames];
+				$this->addChartData($this->encodeSpecialChars($data),"name=" . $this->encodeSpecialChars($label) . ";" .$strParam,"" );
+			}
+	     }
+       }
+	 }
+	 
+	# setTLine create TrendLine parameter 
+	function addTrendLine($strParam){
+	   
+	   $listArray=explode($this->del,$strParam);
+	   foreach ($listArray as $valueArray) {
+    	   $paramValue=explode("=",$valueArray,2);
+		   if($this->validateParam($paramValue)==true){
+		      $this->trendLines[$this->tLineCounter][$paramValue[0]]=$this->encodeSpecialChars($paramValue[1]);
+		   }
+	   }
+	   $this->tLineCounter++;
+	 }
+
+
+	 #this function sets chart messages
+	 function setChartMessage($strParam){
+		$this->chartMSG="?";
+				
+		$listArray=explode($this->del,$strParam);
+		foreach ($listArray as $valueArray) {
+			$paramValue=explode("=",$valueArray,2);
+			if($this->validateParam($paramValue)==true){
+				$this->chartMSG.=$paramValue[0] . "=" . $this->encodeSpecialChars($paramValue[1]) . "&";
+			}
+		}
+		$this->chartMSG=substr($this->chartMSG,0,strlen($this->chartMSG)-1);
+	}
+
+	 #### - This function is mostly for Future USE -----------------------------
+	 # set JS constructor of FusionCharts.js
+	 function setAddChartParams($debugMode, $registerWithJS=0, $c="", $scaleMode="", $lang=""){
+	   $this->JSC["debugmode"]=$debugMode;           
+	   $this->JSC["registerwithjs"]=$registerWithJS;  
+	   $this->JSC["bgcolor"]=$c;                      
+	   $this->JSC["scalemode"]=$scaleMode;            
+	   $this->JSC["lang"]=$lang;  					  
+	 	 
+	 } 
+	 
+	 # The function SetInitParam() adds extra chart settings 
+	 function setInitParam($tname,$tvalue){
+        
+		$trimName= strtolower(str_replace(" ","",$tname));
+        $this->JSC[$trimName]=$tvalue;
+
+	 }
+	
+	 # getXML render all class arrays to XML output
+	 function getXML(){
+				
+		$this->strXML="";
+		
+		$strChartParam="";
+		
+		 
+		$strChartParam=$this->getChartParamsXML();
+		if($this->seriesType==1){
+				   if(gettype(strpos($this->chartType,"line"))!="boolean"){
+					  if(strpos($strChartParam,"lineColor")===false){
+						$colorSet=$this->getColor(0);
+						$this->setChartParams("lineColor=" . $colorSet );
+					  }
+					  
+				   }
+				   if(gettype(strpos($this->chartType,"area"))!="boolean"){
+					  if(strpos($strChartParam,"areaBgColor")===false){
+						$colorSet=$this->getColor(0);
+						$this->setChartParams("areaBgColor=" . $colorSet );
+					  }
+				   }
+		}
+		
+		
+		# calling getChartParamsXML function for chart parameter
+		$this->strXML  =  "<graph " . $this->getChartParamsXML() . " >";
+		if ($this->seriesType >= 0 and $this->seriesType <= 4) {
+			
+			# calling getCategoriesXML function for Category element
+			$this->strXML .= $this->getCategoriesXML();
+			# calling getDatasetXML function for set element 
+			$this->strXML .= $this->getDatasetXML();
+			# calling getvTrendLinesXML function for vTrendLines element
+			if($this->seriesType==3){
+			  $this->strXML .= $this->getvTrendLinesXML();
+			}  
+			#  Calling getLinesetXML
+			if($this->seriesType==4){
+			  $this->strXML .= $this->getLinesetXML();
+			} 
+			# calling getTrendLinesXML function for TrendLines element
+			$this->strXML .= $this->getTrendLinesXML();
+			# calling getStylesXML function for Styles element
+			$this->strXML .= $this->getStylesXML();
+		
+		}else if($this->seriesType == 5) {
+			$this->strXML .= $this->getGanttCategoriesXML();
+			$this->strXML .= $this->getProcessesXML();
+			$this->strXML .= $this->getGanttDatatableXML();
+			$this->strXML .= $this->getTasksXML();
+			$this->strXML .= $this->getConnectorsXML();
+			$this->strXML .= $this->getMilestonesXML();
+			# calling getTrendLinesXML function for TrendLines element
+			$this->strXML .= $this->getTrendLinesXML();
+			# calling getStylesXML function for Styles element
+			$this->strXML .= $this->getStylesXML();
+			$this->strXML .= $this->getLegendXML();
+		}	
+		
+		# Closing Chart element
+		$this->strXML .= "</graph>";
+		
+		# Return XML output
+		return $this->strXML;
+	  }
+	 
+	 # set wMode
+	 function setwMode($isTransparent=""){
+	    $this->wMode=$isTransparent;
+	 }
+	 	 
+	 # Function getXML render all class arrays to XML output
+	 function renderChart($isHTML=false, $display=true){
+		
+		$this->strXML=$this->getXML();	
+		$this->SWFFile=$this->SWFPath . "FCF_" . $this->chartSWF[$this->chartType][0]  . ".swf";
+		
+		if($this->noCache==true){
+		  if($this->chartMSG==""){
+		     $this->chartMSG = "?nocache=" . microtime();
+		  }else{
+		     $this->chartMSG .=  "&nocache=" . microtime();
+		  }
+		}
+		
+	    # print the charts
+		if($isHTML==false){
+		  if($display){
+	         print $this->renderChartJS($this->SWFFile . $this->chartMSG,"",$this->strXML,$this->chartID, $this->width, $this->height,$this->JSC["debugmode"], $this->JSC["registerwithjs"],$this->wMode);
+	      }else{
+		    return $this->renderChartJS($this->SWFFile . $this->chartMSG,"",$this->strXML,$this->chartID, $this->width, $this->height,$this->JSC["debugmode"], $this->JSC["registerwithjs"],$this->wMode); 
+		  }		 
+		  
+		}else{
+		  if($display){
+		    print $this->renderChartHTML($this->SWFFile . $this->chartMSG,"",$this->strXML,$this->chartID, $this->width, $this->height,$this->JSC["debugmode"], $this->JSC["registerwithjs"],$this->wMode);
+		  }else{
+		    return $this->renderChartHTML($this->SWFFile . $this->chartMSG,"",$this->strXML,$this->chartID, $this->width, $this->height,$this->JSC["debugmode"], $this->JSC["registerwithjs"],$this->wMode);
+		  }	
+		}  
+		
+	  } 
+	  
+	  # Sets whether chart SWF files are not to be cached 
+      function setOffChartCaching($swfNoCache=false){
+           $this->noCache=$swfNoCache;
+      } 
+
+	 # Renders Chart form External XML data source
+	 function renderChartFromExtXML($dataXML){
+		print $this->renderChartJS($this->SWFFile,"",$dataXML,$this->chartID, $this->width, $this->height, $this->JSC["debugmode"], $this->JSC["registerwithjs"], $this->wMode);
+	 } 
+     
+    // RenderChartJS renders the JavaScript + HTML code required to embed a chart.
+	// This function assumes that you've already included the FusionCharts JavaScript class
+	// in your page.
+	
+	// $chartSWF - SWF File Name (and Path) of the chart which you intend to plot
+	// $strURL - If you intend to use dataURL method for this chart, pass the URL as this parameter. Else, set it to "" (in case of dataXML method)
+	// $strXML - If you intend to use dataXML method for this chart, pass the XML data as this parameter. Else, set it to "" (in case of dataURL method)
+	// $chartId - Id for the chart, using which it will be recognized in the HTML page. Each chart on the page needs to have a unique Id.
+	// $chartWidth - Intended width for the chart (in pixels)
+	// $chartHeight - Intended height for the chart (in pixels)
+	// $debugMode - Whether to start the chart in debug mode
+	// $registerWithJS - Whether to ask chart to register itself with JavaScript
+	// $setTransparent - Transparent mode
+	function renderChartJS($chartSWF, $strURL, $strXML, $chartId, $chartWidth, $chartHeight, $debugMode=false, $registerWithJS=false, $setTransparent="") {
+		//First we create a new DIV for each chart. We specify the name of DIV as "chartId"Div.			
+		//DIV names are case-sensitive.
+	
+		// The Steps in the script block below are:
+		//
+		//  1)In the DIV the text "Chart" is shown to users before the chart has started loading
+		//    (if there is a lag in relaying SWF from server). This text is also shown to users
+		//    who do not have Flash Player installed. You can configure it as per your needs.
+		//
+		//  2) The chart is rendered using FusionCharts Class. Each chart's instance (JavaScript) Id 
+		//     is named as chart_"chartId".		
+		//
+		//  3) Check whether to provide data using dataXML method or dataURL method
+		//     save the data for usage below 
+		$strHTML="";
+		
+		if ($strXML=="")
+			$tempData = "\t//Set the dataURL of the chart\n\tchart_$chartId.setDataURL(\"$strURL\");";
+		else
+			$tempData = "\t//Provide entire XML data using dataXML method\n\tchart_$chartId.setDataXML(\"$strXML\");";
+	
+		// Set up necessary variables for the RENDERCHART
+		$chartIdDiv = $chartId . "Div";
+		$ndebugMode = $this->boolToNum($debugMode);
+		$nregisterWithJS = $this->boolToNum($registerWithJS);
+		$nsetTransparent=($setTransparent?"true":"false");
+	
+	
+		// Create a string for output by the caller
+
+		$strHTML .= "\n<!-- START Script Block for Chart $chartId --> \n\n";
+		
+		$strHTML .= "<div id=\"$chartIdDiv\">\n";
+		$strHTML .=	"\tChart.\n";
+		$strHTML .= "</div>\n";
+		$strHTML .= "<script type=\"text/javascript\" >\n";	
+			//Instantiate the Chart	
+		$strHTML .= "\tvar chart_$chartId = new FusionCharts(\"$chartSWF\", \"$chartId\", \"$chartWidth\", \"$chartHeight\", \"$ndebugMode\", \"$nregisterWithJS\", \"" . $this->JSC["bgcolor"] . "\",\"" . $this->JSC["scalemode"] . "\",\"" . $this->JSC["lang"] . "\"); \n";
+       
+	   	if($nsetTransparent=="true"){
+		     $strHTML .= "\tchart_$chartId.setTransparent(\"$nsetTransparent\");\n";
+        }
+		
+		$strHTML .= $tempData . "\n";
+		//Finally, render the chart.
+		$strHTML .=	"\tchart_$chartId.render(\"$chartIdDiv\");\n";
+		$strHTML .= "</script>\n\n";
+		$strHTML .= "<!-- END Script Block for Chart $chartId -->\n";
+		
+		return $strHTML;
+	  
+	}
+
+
+    //RenderChartHTML function renders the HTML code for the JavaScript. This
+    //method does NOT embed the chart using JavaScript class. Instead, it uses
+    //direct HTML embedding. So, if you see the charts on IE 6 (or above), you'll
+    //see the "Click to activate..." message on the chart.
+    // $chartSWF - SWF File Name (and Path) of the chart which you intend to plot
+    // $strURL - If you intend to use dataURL method for this chart, pass the URL as this parameter. Else, set it to "" (in case of dataXML method)
+    // $strXML - If you intend to use dataXML method for this chart, pass the XML data as this parameter. Else, set it to "" (in case of dataURL method)
+    // $chartId - Id for the chart, using which it will be recognized in the HTML page. Each chart on the page needs to have a unique Id.
+    // $chartWidth - Intended width for the chart (in pixels)
+    // $chartHeight - Intended height for the chart (in pixels)
+    // $debugMode - Whether to start the chart in debug mode
+	// $registerWithJS - Whether to ask chart to register itself with JavaScript
+	// $setTransparent - Transparent mode
+    function renderChartHTML($chartSWF, $strURL, $strXML, $chartId, $chartWidth, $chartHeight, $debugMode=false,$registerWithJS=false, $setTransparent="") {
+        // Generate the FlashVars string based on whether dataURL has been provided or dataXML.
+		
+		$strHTML="";
+        $strFlashVars = "&chartWidth=" . $chartWidth . "&chartHeight=" . $chartHeight . "&debugMode=" . $this->boolToNum($debugMode);
+		
+		$strFlashVars .= "&scaleMode=" . $this->JSC["scalemode"] . "&lang=" . $this->JSC["lang"];
+		
+        if ($strXML=="")
+            // DataURL Mode
+            $strFlashVars .= "&dataURL=" . $strURL;
+        else
+            //DataXML Mode
+            $strFlashVars .= "&dataXML=" . $strXML;
+        
+        $nregisterWithJS = $this->boolToNum($registerWithJS);
+        if($setTransparent!=""){
+          $nsetTransparent=($setTransparent==false?"opaque":"transparent");
+        }else{
+          $nsetTransparent="window";
+        }
+
+        $strHTML .= "\n<!-- START Code Block for Chart $chartId -->\n\n";
+
+         $HTTP="http";
+         if(strtolower($_SERVER['HTTPS'])=="on")
+         {
+            $HTTP="https";
+         } 
+
+		 $Strval = $_SERVER['HTTP_USER_AGENT'];
+		 $pos=strpos($Strval,"MSIE");
+		 if($pos===false){
+
+            $strHTML .= "<embed src=\"$chartSWF\" FlashVars=\"$strFlashVars&registerWithJS=$nregisterWithJS\" quality=\"high\" width=\"$chartWidth\" height=\"$chartHeight\" name=\"$chartId\" " . ($this->JSC["bgcolor"]!="")? " bgcolor=\"" . $this->JSC["bgcolor"] . "\"":"" . " allowScriptAccess=\"always\"  type=\"application/x-shockwave-flash\"  pluginspage=\"$HTTP://www.macromedia.com/go/getflashplayer\" wmode=\"$nsetTransparent\" \n";
+            
+         }else{
+            $strHTML .= "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"$HTTP://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0\" width=\"$chartWidth\" height=\"$chartHeight\" id=\"$chartId\"> \n";
+            $strHTML .= "\t<param name=\"allowScriptAccess\" value=\"always\" /> \n";
+            $strHTML .= "\t<param name=\"movie\" value=\"$chartSWF\" /> \n";		
+            $strHTML .= "\t<param name=\"FlashVars\" value=\"$strFlashVars&registerWithJS=$nregisterWithJS\" /> \n";
+            $strHTML .= "\t<param name=\"quality\" value=\"high\"  /> \n";
+            $strHTML .= "\t<param name=\"wmode\" value=\"$nsetTransparent\"  /> \n"; 
+               //Set background color
+	           if($this->JSC["bgcolor"] !="") {
+		          $strHTML .=  "\t<param name=\"bgcolor\" value=\"" . $this->JSC["bgcolor"] .  "\" /> \n";
+		       }
+			
+            $strHTML .= "</object>\n";
+            $strHTML .= "<!-- END Code Block for Chart $chartId -->\n";
+
+       }
+	   return $strHTML;
+	}
+
+    // The function boolToNum() function converts boolean values to numeric (1/0)
+    function boolToNum($bVal) {
+        return (($bVal==true) ? 1 : 0);
+    }
+
+
+##------------ PRIVATE FUNCTIONS ----------------------------------------------------------------
+	 
+	 # getDatasetXML create set chart xml 
+	 function getDatasetXML(){
+       # Calling dataset function depending on seriesType
+	   switch ($this->seriesType){
+	   case 1 :
+	     return $this->getSSDatasetXML();
+		 break;
+	   case 2 :
+	     return $this->getMSDatasetXML();
+	     break;
+	   case 3 :
+	   	 return $this->getMSDatasetXML();
+	     break;
+	   case 4 :
+	     return $this->getMSStackedDatasetXML();
+	     break;
+	   }
+	 }
+	 # By getChartParamsXML, we can fetch charts array and convert into XML
+	 # and return like "caption='xyz' xAxisName='x side' ............
+	 function getChartParamsXML(){
+		$partXML="";	
+		# feching charts each array and converting into chat parameter
+		foreach($this->chartParams as $part_type => $part_name){
+		   $partXML .= $part_type . "='" . $this->encodeSpecialChars($part_name) . "' ";
+		}
+		# Return Chart Parameter
+		return $partXML;
+	 }
+	 
+	 
+	 # Function getCategoriesXML for getting Category part XML
+	 function getCategoriesXML(){
+	   if($this->seriesType>1){
+		   $partXML="";
+		   # adding categories parameter
+		   $partXML="<categories " . $this->categoriesParam . " >";
+		   if($this->categoryNamesCounter>1){
+		   foreach($this->categoryNames as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					 if($part_name!="Array"){
+						 $partXML .= $part_name;
+					}
+				   } 
+		   }
+		   }
+		   # Closing <categories>
+		   $partXML .="</categories>";
+		   return $partXML;
+	   }
+	 }
+	 # creating single set element
+     #       <set value='30' />
+     #       <set value='26' />
+
+	 function getSSDatasetXML(){
+	   if($this->seriesType==1){
+		   $partXML="";
+		   foreach($this->dataset as $part_type => $part_name){
+			   if($part_name!=""){ 
+				 # adding elements 
+				 if($part_name!="Array"){
+				   $partXML .= $part_name;
+				 }
+			   } 
+		   }
+		   return $partXML;
+	   }
+	 }
+	 
+	 # getMSDatasetXML for getting datset part XML
+	 #     <dataset seriesName='Product A' color='AFD8F8' showValues='0'>
+     #       <set value='30' />
+     #       <set value='26' />
+     #     </dataset>
+	 function getMSDatasetXML(){
+	   if($this->seriesType>1){
+		   $partXML="";
+		   foreach($this->dataset as $part_type => $part_name){
+			   $partXML .="<dataset  " . $this->datasetParam[$part_type] . " >";
+			   foreach($this->dataset[$part_type] as $part_type1 => $part_name1){
+					   if($part_name1!=""){ 
+						 # Adding elements 
+						 if($part_name1!="Array"){
+						   $partXML .= $part_name1;
+						 }
+					   } 
+			   }
+			   $partXML .="</dataset>";
+		   }
+		   return $partXML;
+	   }
+	 }
+	 
+
+	 # getTrendLinesXML create XML output depending on trendLines array
+	 #  <trendLines>
+	 #    <line startValue='700000' color='009933' displayvalue='Target' /> 
+	 # </trendLines>
+	 function getTrendLinesXML(){
+		$partXML="";
+		$lineXML="";	
+		# fetching trendLines array
+		foreach($this->trendLines as $l_type => $l_name){
+		  # staring line element
+		  $lineXML .="<line ";
+		  # fetching trendLines array with in array element
+		  foreach($this->trendLines[$l_type] as $part_type => $part_name){
+	
+				$lineXML .= $part_type . "='" . $this->encodeSpecialChars($part_name) . "' ";
+	
+		  }
+		  # close line element
+		  $lineXML .=" />";
+		}
+		# if line element present then adding $lineXML with in trendLines element 
+		
+		$pos = strpos($lineXML, "=");
+		if ($pos!==false){
+		   $partXML = "<trendLines>" . $lineXML . "</trendLines>"; 
+		}else{
+		   # return nothing
+		   $partXML="";
+		}
+		# return trendLines xml
+		return $partXML;
+	 }
+	 
+	 
+	 
+ 	 # adding set element to dataset element for seriesType 1 and 2
+	 function setSSMSDataArray($value="",$setParam="",$vlineParam = "" ){
+	     $strSetXML="";
+		 $strParam="";
+		 $color=0;
+		 if($vlineParam==""){
+		   if($setParam!=""){
+               $strParam = $this->ConvertParamToXMLAttribute($setParam);
+			   
+		   }
+		  				  
+		   $colorSet="";
+		   if ($this->UserColorON == true){
+		   		if($this->seriesType==1 && (gettype(strpos($this->chartType,"line"))=="boolean" && gettype(strpos($this->chartType,"area"))=="boolean")){
+				  if(strpos(strtolower($strParam)," color")===false){
+					 $colorSet=" color='" . $this->getColor($this->setCounter) . "' ";
+				  }   
+			   }
+		   }else{
+			   if($this->seriesType==1 && (gettype(strpos($this->chartType,"pie"))=="boolean" && gettype(strpos($this->chartType,"line"))=="boolean" && gettype(strpos($this->chartType,"area"))=="boolean")){
+				  if(strpos(strtolower($strParam)," color")===false){
+					 $colorSet=" color='" . $this->getColor($this->setCounter) . "' ";
+				  }   
+			   }
+		   }
+			  # setting set parameter 
+			  $strSetXML ="<set  value='" . $value . "' " . $strParam . $colorSet . " />";
+         
+		 }else{
+		   $strParam = $this->ConvertParamToXMLAttribute($strParam);
+		   
+		   # setting vline parameter
+		   $strSetXML="<vLine " . $strParam . "  />"; 
+		 }
+	     return $strSetXML;
+	 }
+
+   ## - - - -   - -   Array Init Functions  - - --- - -- - - - - - - -- - - - - -
+   
+	 # Function createCategory create array element with in Categories
+	 function createCategory($catID){
+		 $this->categoryNames[$catID]= array();
+	 }
+	 # createDataset dataset array element
+	 function createDataset($dataID){
+		 $this->dataset[$dataID]= array();
+	 }
+	 # creating set  dataset array element
+	 function createDataValues($datasetID, $dataID){
+		 $this->dataset[$datasetID][$dataID]= array();
+	 }
+	 # createTrendLines create TrendLines array
+	 function createTrendLines($lineID){
+		$this->trendLines[$lineID] = array();
+	 }
+	 # setTLine create TrendLine parameter 
+	 function setTLine($lineID,$paramName, $paramValue){
+		 $this->trendLines[$lineID][$paramName]=$paramValue;
+	 }
+
+
+  # ----- ----------    -----  Misc utility functions  ---- ------ -----------
+
+	 # converting ' and " to %26apos; and &quot; 
+	 function encodeSpecialChars($strValue){
+	 
+	    $pattern="/%(?![\da-f]{2}|[\da-f]{4})/i";
+		$strValue=preg_replace($pattern, "%25", $strValue);
+		
+	    if ($this->encodeChars==true){
+			$strValue=str_replace("&","%26",$strValue);
+			$strValue=str_replace("'","%26apos;",$strValue);
+			$strValue=str_replace("\"","%26quot;",$strValue);
+					
+			$strValue=preg_replace("/\<a/i", "%26lt;A", $strValue);
+			$strValue=preg_replace("/\<\/a/i", "%26lt;/A", $strValue);
+			
+			$strValue=preg_replace("/\<i/i", "%26lt;I", $strValue);
+			$strValue=preg_replace("/\<\/i/i", "%26lt;/I", $strValue);
+			
+			$strValue=preg_replace("/\<u/i", "%26lt;U", $strValue);
+			$strValue=preg_replace("/\<\/u/i", "%26lt;/U", $strValue);
+			
+			$strValue=preg_replace("/\<li/i", "%26lt;LI", $strValue);
+			$strValue=preg_replace("/\<\/li/i", "%26lt;/LI", $strValue);
+			
+			$strValue=preg_replace("/\<font/i", "%26lt;FONT", $strValue);
+			$strValue=preg_replace("/\<\/font/i", "%26lt;/FONT", $strValue);
+			
+			$strValue=preg_replace("/\<p/i", "%26lt;P", $strValue);
+			$strValue=preg_replace("/\<\/p/i", "%26lt;/P", $strValue);
+			
+			$strValue=preg_replace("/\<br/i", "%26lt;BR", $strValue);
+			
+			$strValue=preg_replace("/\<b/i", "%26lt;B", $strValue);
+			$strValue=preg_replace("/\<\/b/i", "%26lt;/B", $strValue);
+			
+			$strValue=str_replace("<", "%ab",$strValue);
+		    $strValue=str_replace(">", "%26gt;",$strValue);	
+	    }else{
+			$strValue=str_replace("'","&apos;",$strValue);
+			$strValue=str_replace("\"","&quot;",$strValue);
+			
+			$strValue=preg_replace("/\<a/i", "&lt;A", $strValue);
+			$strValue=preg_replace("/\<\/a/i", "&lt;/A", $strValue);
+			
+			$strValue=preg_replace("/\<i/i", "&lt;I", $strValue);
+			$strValue=preg_replace("/\<\/i/i", "&lt;/I", $strValue);
+			
+			$strValue=preg_replace("/\<u/i", "&lt;U", $strValue);
+			$strValue=preg_replace("/\<\/u/i", "&lt;/U", $strValue);
+			
+			$strValue=preg_replace("/\<li/i", "&lt;LI", $strValue);
+			$strValue=preg_replace("/\<\/li/i", "&lt;/LI", $strValue);
+			
+			$strValue=preg_replace("/\<font/i", "&lt;FONT", $strValue);
+			$strValue=preg_replace("/\<\/font/i", "&lt;/FONT", $strValue);
+			
+			$strValue=preg_replace("/\<p/i", "&lt;P", $strValue);
+			$strValue=preg_replace("/\<\/p/i", "&lt;/P", $strValue);
+								
+			$strValue=preg_replace("/\<br/i", "&lt;BR", $strValue);
+					
+			$strValue=preg_replace("/\<b/i", "&lt;B", $strValue);
+			$strValue=preg_replace("/\<\/b/i", "&lt;/B", $strValue);
+			
+			$strValue=str_replace("<","%ab",$strValue);
+			$strValue=str_replace(">", "&gt;",$strValue);	
+	    }
+	  	    
+		$strValue=str_replace("=","%3d",$strValue);
+		$strValue=str_replace("+","%2b",$strValue);
+		
+		$strValue=str_replace("¢","%a2",$strValue);
+		$strValue=str_replace("£","%a3",$strValue);
+		$strValue=str_replace("€","%E2%82%AC",$strValue);
+		$strValue=str_replace("¥","%a5",$strValue);
+		$strValue=str_replace("₣","%e2%82%a3",$strValue);
+	
+	    return $strValue;
+	   
+	 }
+	 
+    # Its convert pattern link to original link 
+	# abcd.php?cid=##Field_name_1##&pname=##Field_name_2##
+    function getLinkFromPattern($row,$tempLink){			
+		# convert link into array break on '##'
+		$aa=explode("##",$tempLink);
+		# Reading array
+		foreach($aa as $v){
+		  # Finding '=' into array
+		  $pos = strpos($v, "=");
+			  # not found '=' 
+			  if($pos === false){
+			  	if($v!=""){
+					$pet="##" . $v . "##";
+	   			    $tempLink=str_replace($pet,$row[$v],$tempLink); 
+				}
+			  }
+ 		 }
+		 return $tempLink;
+	 }		
+
+	 
+	 # convertion of semi colon(;) separeted paramater to XML attribute
+	 function ConvertParamToXMLAttribute($strParam){
+	 	 		 
+		 $xmlParam="";
+		 $listArray=explode($this->del,$strParam);
+		 foreach ($listArray as $valueArray) {
+		   $paramValue=explode("=",$valueArray,2);
+		   if($this->validateParam($paramValue)==true){
+			   # creating parameter set
+		       $xmlParam .= $paramValue[0] . "='" . $this->encodeSpecialChars($paramValue[1]) . "' ";
+		   }
+		}
+	
+		# Return
+        return $xmlParam;
+			
+	 }
+	 
+	 function validateParam($paramValue){
+	     if(count($paramValue)>=2){
+		    if(trim($paramValue[0])==""){
+			  return false;
+			}
+		    return true;
+		 }else{
+		    return false;
+		 }
+	 }
+
+	 # Getting Charts series type from charts array. 1 => single series, 2=> multi-series, 3=> scatter and bubble, 4=> MSStacked. defult 1 => single series
+	 function getSeriesType(){
+	    $sValue=1;	
+		if(is_array($this->chartSWF[$this->chartType])){
+		  $sValue=$this->chartSWF[$this->chartType][1];
+		}else{
+		  $sValue=1;
+		}
+		$this->seriesType=$sValue; 
+	 }
+	  	 
+	 #this function returns a color from a list of colors
+	 function getColor($counter){
+		
+		$strColor="";
+		if ($this->UserColorON == false){
+		  $strColor=$this->arr_FCColors[$counter % count($this->arr_FCColors)];
+		}else{
+		  $strColor=$this->UserColor[$counter % count($this->UserColor)];
+		}
+		
+		return $strColor;
+	 }
+	 
+	 # Clear User Color 
+	 function ClearUserColor()
+     {
+          $this->UserColorON = false;
+     }
+	 
+	 # add User Colors
+	 function addColors($ColorList)
+        {
+		   $listArray=explode($this->del, $ColorList);
+ 		   $this->UserColorON = true;
+		   foreach ($listArray as $valueArray) {
+		  	   $this->UserColor[$this->userColorCounter]=$valueArray;
+			   $this->userColorCounter++;
+	    	}
+        }
+		
+  ### ----- Pupulate Color and Chart SWF array  ------ ------- ---------------------
+	 function colorInit(){
+	    $this->arr_FCColors[] = "AFD8F8";
+		$this->arr_FCColors[] = "F6BD0F";
+		$this->arr_FCColors[] = "8BBA00";
+		$this->arr_FCColors[] = "FF8E46";
+		$this->arr_FCColors[] = "008E8E";
+		$this->arr_FCColors[] = "D64646";
+		$this->arr_FCColors[] = "8E468E";
+		$this->arr_FCColors[] = "588526";
+		$this->arr_FCColors[] = "B3AA00";
+		$this->arr_FCColors[] = "008ED6";
+		$this->arr_FCColors[] = "9D080D";
+		$this->arr_FCColors[] = "A186BE";
+		$this->arr_FCColors[] = "CC6600";
+		$this->arr_FCColors[] = "FDC689";
+		$this->arr_FCColors[] = "ABA000";
+		$this->arr_FCColors[] = "F26D7D";
+		$this->arr_FCColors[] = "FFF200";
+		$this->arr_FCColors[] = "0054A6";
+		$this->arr_FCColors[] = "F7941C";
+		$this->arr_FCColors[] = "CC3300";
+		$this->arr_FCColors[] = "006600";
+		$this->arr_FCColors[] = "663300";
+		$this->arr_FCColors[] = "6DCFF6";
+		
+	 }
+	 
+
+
+	 # Setting FusionCharts SWF file array list and series 
+	 function setChartArrays(){
+	 
+	    $this->chartSWF['area2d'][0]="Area2D";
+		$this->chartSWF['area2d'][1]=1;
+		$this->chartSWF['bar2d'][0]="Bar2D";
+		$this->chartSWF['bar2d'][1]=1;
+		$this->chartSWF['column2d'][0]="Column2D";
+		$this->chartSWF['column2d'][1]=1;
+		$this->chartSWF['column3d'][0]="Column3D";
+		$this->chartSWF['column3d'][1]=1;
+		$this->chartSWF['doughnut2d'][0]="Doughnut2D";
+		$this->chartSWF['doughnut2d'][1]=1;
+		$this->chartSWF['doughnut3d'][0]="Doughnut3D";
+		$this->chartSWF['doughnut3d'][1]=1;
+		$this->chartSWF['line'][0]="Line";
+		$this->chartSWF['line'][1]=1;
+		$this->chartSWF['pie2d'][0]="Pie2D";
+		$this->chartSWF['pie2d'][1]=1;		
+		$this->chartSWF['pie3d'][0]="Pie3D";
+		$this->chartSWF['pie3d'][1]=1;	
+		$this->chartSWF['funnel'][0]="Funnel";
+		$this->chartSWF['funnel'][1]=1;	
+				
+		$this->chartSWF['msarea'][0]="MSArea";
+		$this->chartSWF['msarea'][1]=2;
+		$this->chartSWF['msarea2d'][0]="MSArea2D";
+		$this->chartSWF['msarea2d'][1]=2;
+		$this->chartSWF['msbar2d'][0]="MSBar2D";
+		$this->chartSWF['msbar2d'][1]=2;
+		$this->chartSWF['mscolumn2d'][0]="MSColumn2D";
+		$this->chartSWF['mscolumn2d'][1]=2;
+		$this->chartSWF['mscolumn3d'][0]="MSColumn3D";
+		$this->chartSWF['mscolumn3d'][1]=2;
+		$this->chartSWF['mscolumn3dlinedy'][0]="MSColumn3DLineDY";
+		$this->chartSWF['mscolumn3dlinedy'][1]=2;
+		$this->chartSWF['mscolumnLine3D'][0]="MSColumnLine3D";
+		$this->chartSWF['mscolumnLine3D'][1]=2;
+		$this->chartSWF['mscombi2d'][0]="MSCombi2D";
+		$this->chartSWF['mscombi2d'][1]=2;
+		$this->chartSWF['mscombidy2d'][0]="MSCombiDY2D";
+		$this->chartSWF['mscombidy2d'][1]=2;
+		$this->chartSWF['msline'][0]="MSLine";
+		$this->chartSWF['msline'][1]=2;		
+		$this->chartSWF['scrollarea2d'][0]="ScrollArea2D";
+		$this->chartSWF['scrollarea2d'][1]=2;		
+		$this->chartSWF['scrollcolumn2d'][0]="ScrollColumn2D";
+		$this->chartSWF['scrollcolumn2d'][1]=2;		
+		$this->chartSWF['scrollcombi2d'][0]="ScrollCombi2D";
+		$this->chartSWF['scrollcombi2d'][1]=2;
+		$this->chartSWF['scrollcombidy2d'][0]="ScrollCombiDY2D";
+		$this->chartSWF['scrollcombidy2d'][1]=2;		
+		$this->chartSWF['scrollline2d'][0]="ScrollLine2D";
+		$this->chartSWF['scrollline2d'][1]=2;		
+		$this->chartSWF['scrollstackedcolumn2d'][0]="ScrollStackedColumn2D";
+		$this->chartSWF['scrollstackedcolumn2d'][1]=2;		
+		$this->chartSWF['stackedarea2d'][0]="StackedArea2D";
+		$this->chartSWF['stackedarea2d'][1]=2;		
+		$this->chartSWF['stackedbar2d'][0]="StackedBar2D";
+		$this->chartSWF['stackedbar2d'][1]=2;		
+		$this->chartSWF['stackedbar3d'][0]="StackedBar3D";
+		$this->chartSWF['stackedbar3d'][1]=2;
+		$this->chartSWF['stackedcolumn2d'][0]="StackedColumn2D";
+		$this->chartSWF['stackedcolumn2d'][1]=2;
+		$this->chartSWF['stackedcolumn3d'][0]="StackedColumn3D";
+		$this->chartSWF['stackedcolumn3d'][1]=2;		
+		$this->chartSWF['stackedcolumn3dlinedy'][0]="StackedColumn3DLineDY";
+		$this->chartSWF['stackedcolumn3dlinedy'][1]=2;	
+		$this->chartSWF['mscolumn2dlinedy'][0]="MSColumn2DLineDY";
+		$this->chartSWF['mscolumn2dlinedy'][1]=2;
+			
+		
+		$this->chartSWF['bubble'][0]="Bubble";
+		$this->chartSWF['bubble'][1]=3;
+		$this->chartSWF['scatter'][0]="Scatter";
+		$this->chartSWF['scatter'][1]=3;
+		
+		$this->chartSWF['msstackedcolumn2dlinedy'][0]="MSStackedColumn2DLineDY";
+        $this->chartSWF['msstackedcolumn2dlinedy'][1]=4;	
+	    $this->chartSWF['msstackedcolumn2d'][0]="MSStackedColumn2D";
+		$this->chartSWF['msstackedcolumn2d'][1]=2;
+		
+		$this->chartSWF['gantt'][0]="Gantt";
+        $this->chartSWF['gantt'][1]=5;
+	 }
+
+   ####################### GANTT CHART  (start) ######################################
+   # ----------- Public Functions -----------------------------------------------
+
+	 # Function addCategory adding Category and vLine element
+	 function addGanttCategorySet($catParam=""){
+		$this->GT_categories_Counter++;
+		$this->GT_categories[$this->GT_categories_Counter]= array();
+		$strParam="";
+		 
+		# cheking catParam not blank
+		if($catParam!=""){
+		   
+		   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+		   
+		}
+		
+		$this->GT_categoriesParam[$this->GT_categories_Counter]=$strParam;
+     }
+     # Function addGanttCategory adding Category 
+	 function addGanttCategory($label="",$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+		       $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			   
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<category name='" . $label . "' " . $strParam . " />";
+         		 
+		 # storing into GT_categories array
+		 $this->GT_categories[$this->GT_categories_Counter][$this->GT_subcategories_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_subcategories_Counter++;
+	 }
+ 
+     # Setting Process Parameter into categoriesParam variables
+	 function setGanttProcessesParams($strParam){
+	   
+	   $this->GT_processes_Param .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttProcess adding Process
+	 function addGanttProcess($label="",$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+		       
+			   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			   
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<process name='" . $label . "' " . $strParam . " />";
+         		 
+		 # storing into categoryNames array
+		 $this->GT_processes[$this->GT_processes_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_processes_Counter++;
+	 }
+
+
+ 
+ # Setting Tasks Parameter into TaskParam variables
+	 function setGanttTasksParams($strParam){
+	 
+	   $this->GT_Tasks_Param .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttTasks adding Tasks
+	 function addGanttTask($label="",$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+			   
+			   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			   
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<task name='" . $label . "' " . $strParam . " />";
+         		 
+		 # storing into GT_Tasks array
+		 $this->GT_Tasks[$this->GT_Tasks_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_Tasks_Counter++;
+	 }
+	 
+
+
+ # Setting Tasks Parameter into ConnectorsParam variables
+	 function setGanttConnectorsParams($strParam){
+	   $this->GT_Connectors_Param .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttConnector adding Connector
+	 function addGanttConnector($From,$To,$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+			   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			   
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<connector fromTaskId='" . $From . "'  toTaskId='" . $To . "' " . $strParam . " />";
+         		 
+		 # storing into GT_Connectors array
+		 $this->GT_Connectors[$this->GT_Connectors_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_Connectors_Counter++;
+	 }
+	 
+
+ 
+ # Setting Milestones Parameter into MilestonesParam variables
+	 function setGanttMilestonesParams($strParam){
+	   $this->GT_Milestones_Param .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttMilestones adding Milestones
+	 function addGanttMilestone($taskID,$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+		       $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			   
+		    }
+			# adding label and parameter set to Milestones
+		   $strCatXML ="<milestone taskId='" . $taskID . "'  " . $strParam . " />";
+         		 
+		 # storing into GT_Milestones array
+		 $this->GT_Milestones[$this->GT_Milestones_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_Milestones_Counter++;
+	 }
+	 
+
+ 
+ # Setting Legend Parameter into LegendParam variables
+	 function setGanttLegendParams($strParam){
+	   
+	   $this->GT_legend_Param .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttLegendItem adding LegendItem
+	 function addGanttLegendItem($label,$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+			  
+			   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+			  
+		    }
+			# adding label and parameter set to LegendItem
+		   $strCatXML ="<item label='" . $label . "'  " . $strParam . " />";
+         		 
+		 # storing into GT_legend array
+		 $this->GT_legend[$this->GT_legend_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_legend_Counter++;
+	 }
+	 
+    
+	# Setting Datatable Parameter into DatatableParam variables
+	 function setGanttDatatableParams($strParam){
+	 
+	   $this->GT_datatableParam .= $this->ConvertParamToXMLAttribute($strParam);
+	   
+	 } 	 
+	 
+	 # Function addGanttDatacolumn adding Datacolumn
+	 function addGanttDatacolumn($catParam=""){
+		$this->GT_datatable_Counter++;
+		$this->GT_datatable[$this->GT_datatable_Counter]= array();
+		$strParam="";
+		 
+		# cheking catParam not blank
+		if($catParam!=""){
+		   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+		}
+		
+		$this->GT_dataColumnParam[$this->GT_datatable_Counter]=$strParam;
+     }
+     # Function addGanttColumnText adding ColumnText
+	 function addGanttColumnText($label="",$catParam=""){
+	     
+	 	 $strCatXML="";
+		 $strParam="";
+		 
+		   # cheking catParam not blank
+		   if($catParam!=""){
+			   $strParam = $this->ConvertParamToXMLAttribute($catParam);
+		    }
+			# adding label and parameter set to category 
+		   $strCatXML ="<text label='" . $label . "' " . $strParam . " />";
+         		 
+		 # storing into GT_datatable array
+		 $this->GT_datatable[$this->GT_datatable_Counter][$this->GT_subdatatable_Counter]=$strCatXML;
+		 # Increase Counter
+		 $this->GT_subdatatable_Counter++;
+	 }
+
+  ### ------------- Gantt Private Functoins ----------------------------------------------------------------------
+
+	#-- Gantt array init ------------------------------------------------
+    # Function createCategory create array element with in Categories
+	 function createGanttCategory($catID){
+		 $this->GT_categories[$catID]= array();
+	 }
+	# Function createGanttDatatable create array element with in Datatable
+	 function createGanttDatatable($catID){
+		 $this->GT_datatable[$catID]= array();
+	 }
+
+
+	#-- GANTT XML genetators -------------------------------------------
+	
+ 	 # Function getCategoriesXML for getting Category part XML
+	 function getGanttCategoriesXML(){
+		   $partXML="";
+		   foreach($this->GT_categories as $part_type => $part_name){
+			   # adding categories parameter
+			   $partXML .="<categories " . $this->GT_categoriesParam[$part_type] . " >";
+			   foreach($this->GT_categories[$part_type] as $part_type1 => $part_name1){
+					   if($part_name1!=""){ 
+						 # adding elements 
+							 $partXML .= $part_name1;
+					   } 
+			   }
+			  # Closing <categories>
+		      $partXML .="</categories>"; 
+		   }
+		   
+		   return $partXML;
+	 }
+	 
+	 # Function getProcessesXML for getting Processes part XML
+	 function getProcessesXML(){
+	   
+		   $partXML="";
+		   # adding processes parameter
+		   $partXML="<processes " . $this->GT_processes_Param . " >";
+		    foreach($this->GT_processes as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					
+						 $partXML .= $part_name;
+					
+				   } 
+		   }
+		  
+		   # Closing <categories>
+		   $partXML .="</processes>";
+		   return $partXML;
+	   }
+
+
+	 # Function getProcessesXML for getting Processes part XML
+	 function getTasksXML(){
+	   
+		   $partXML="";
+		   # adding processes parameter
+		   $partXML="<tasks " . $this->GT_Tasks_Param . " >";
+		    foreach($this->GT_Tasks as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					
+						 $partXML .= $part_name;
+					
+				   } 
+		   }
+		  
+		   # Closing <tasks>
+		   $partXML .="</tasks>";
+		   return $partXML;
+	   }	
+
+
+	 # Function getConnectorsXML for getting Connectors part XML
+	 function getConnectorsXML(){
+	       $c=0;
+		   $partXML="";
+		   # adding connectors parameter
+		   $partXML="<connectors " . $this->GT_Connectors_Param . " >";
+		    foreach($this->GT_Connectors as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					
+						 $partXML .= $part_name;
+						 $c++;				
+				   } 
+		   }
+		  
+		   # Closing <connectors>
+		   $partXML .="</connectors>";
+		   if ($c>0){
+		   	   return $partXML;
+		   }else{
+		       return "";
+		   }	   
+	   }	      
+
+	 # Function getMilestonesXML for getting Milestones part XML
+	 function getMilestonesXML(){
+	       $c=0;
+		   $partXML="";
+		   # adding Milestones parameter
+		   $partXML="<milestones " . $this->GT_Milestones_Param . " >";
+		   foreach($this->GT_Milestones as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					 $partXML .= $part_name;
+					 $c++;
+				   } 
+		   }
+		  
+		   # Closing <milestones>
+		   $partXML .="</milestones>";
+		   if ($c>0) {
+		     return $partXML;
+		   }else{
+		     return "";
+		   }
+	   }	      
+
+
+	 # Function getLegendXML for getting Legend part XML
+	 function getLegendXML(){
+	       $c=0;
+		   $partXML="";
+		   # adding Legend parameter
+		   $partXML="<legend " . $this->GT_legend_Param . " >";
+		   foreach($this->GT_legend as $part_type => $part_name){
+				   if($part_name!=""){ 
+					 # adding elements 
+					 $partXML .= $part_name;
+					 $c++;
+				   } 
+		   }
+		  
+		   # Closing <milestones>
+		   $partXML .="</legend>";
+		   if ($c>0) {
+		     return $partXML;
+		   }else{
+		     return "";
+		   }
+	   }	      	   
+
+
+ 	 # Function getGanttDatatableXML for getting Category part XML
+	 function getGanttDatatableXML(){
+		   $partXML="";
+		   foreach($this->GT_datatable as $part_type => $part_name){
+			   # adding dataColumn parameter
+			   $partXML .="<dataColumn " . $this->GT_dataColumnParam[$part_type] . " >";
+			   foreach($this->GT_datatable[$part_type] as $part_type1 => $part_name1){
+					   if($part_name1!=""){ 
+						 # adding elements 
+							 $partXML .= $part_name1;
+					   } 
+			   }
+			  # Closing <dataColumn>
+		      $partXML .="</dataColumn>"; 
+		   }
+		   $allPart="<dataTable " . $this->GT_datatableParam . " >" . $partXML . "</dataTable>";
+		   return $allPart;
+	 }
+
+
+
+ ####################### GANTT CHART  (end) ######################################
+
+
+
+ #====================== For Future Use (start) =====================================
+	
+ ##---------PUBLIC functions ----------------------------------------------------
+	 # adding Lineset array and parameter to it
+	 function addLineset($seriesName, $strParam){
+	   $this->createLineset();
+	   $this->lineSetCounter++;
+       $this->lineSet[$this->lineCounter][$this->lineSetCounter]= array();
+	   		
+	   $tempParam="";
+	   $tempParam ="seriesName='" . $seriesName . "' ";
+	   
+	   $tempParam .= $this->ConvertParamToXMLAttribute($strParam); 
+	  		
+	   $this->lineIDCounter++;
+	   # setting lineSetParam array with Parameter set	
+	   $this->lineSetParam [$this->lineSetCounter]=$tempParam;
+	   
+	  	  
+	 }
+      
+	 # adding Line's Set data 
+	 function addLinesetData($value="",$setParam="",$vlineParam = "" ){
+	     $strSetXML="";
+		 # getting parameter set  
+		 $strSetXML=$this->setSSMSDataArray($value,$setParam,$vlineParam);
+         
+		 # setting paramter to lineSet array
+		 $this->lineSet[$this->lineCounter][$this->lineSetCounter][$this->lineIDCounter]=$strSetXML;
+		 
+		 # Increase lineIDCounter
+		 $this->lineIDCounter++;
+	 }
+	 
+	  
+	 # adding ms dataset and parameter	 
+	 function addMSSSubDataset($seriesName, $strParam){
+	   $this->MSSSubDatasetCounter++;
+       $this->MSSDataset[$this->MSSDatasetCounter][$this->MSSSubDatasetCounter]= array();
+	   		
+	   $tempParam="";
+	   # creating seriesName
+	   $tempParam ="seriesName='" . $seriesName . "' ";
+	   $tempParam .= $this->ConvertParamToXMLAttribute($strParam);
+	   		
+	   $this->MSSSetCounter++;	
+	   
+	   # adding Parameter to MSSDatasetParams array
+	   $this->MSSDatasetParams[$this->MSSDatasetCounter][$this->MSSSubDatasetCounter]=$tempParam;
+	   
+		  
+	 }
+
+	 # adding set element to dataset element for seriesType 3
+	 function setScatterBubbleDataArray($value="",$setParam="",$vlineParam = "" ){
+	     $strSetXML="";
+		 $strParam="";
+		 if($vlineParam==""){
+		   if($setParam!=""){
+		        $strParam = $this->ConvertParamToXMLAttribute($setParam);
+			   
+		   }
+		   # adding Parameter into set elements
+		   $strSetXML ="<set  x='" . $value . "' " . $strParam . " />";
+         
+		 }else{
+		   # Parameter for vLine
+		   $strParam = $this->ConvertParamToXMLAttribute($vlineParam);
+		   	   
+		   # adding vLine element
+		   $strSetXML="<vLine " . $strParam . "  />"; 
+		 }
+	     return $strSetXML;
+	 }
+	 
+	 
+	# setvTLine create TrendLine parameter 
+	 function setVTrendLines($strParam){
+	   $listArray=explode($this->del,$strParam);
+	   foreach ($listArray as $valueArray) {
+    	   $paramValue=explode("=",$valueArray,2);
+		   if($this->validateParam($paramValue)==true){
+		     $this->vtrendLines[$this->vtLineCounter][$paramValue[0]]=$this->encodeSpecialChars($paramValue[1]);
+		   }
+	   }
+	   $this->vtLineCounter++;
+	 }
+	 
+	 
+	 # setSubStylesParam create sub styles array to store parameters
+	 function addStyleDef($styleName,$styleType,$strParam){
+		$this->styles["definition"]["style"][$this->styleDefCounter]["name"]= $styleName;
+		$this->styles["definition"]["style"][$this->styleDefCounter]["type"]= $styleType;
+		
+		$listArray=explode($this->del,$strParam);
+	    foreach ($listArray as $valueArray) {
+    	   $paramValue=explode("=",$valueArray,2);
+		   if($this->validateParam($paramValue)==true){ 
+		      $this->styles["definition"]["style"][$this->styleDefCounter][$paramValue[0]]= $this->encodeSpecialChars($paramValue[1]);
+		   }
+		}   
+        $this->styleDefCounter++;
+    	
+	 }
+     # apply styles
+	 function addStyleApp($toObject,$styles){
+		$this->styles["application"]["apply"][$this->styleAppCounter]["toObject"]= $toObject;
+		$this->styles["application"]["apply"][$this->styleAppCounter]["styles"]= $styles;
+		
+        $this->styleAppCounter++;
+	 }
+	 
+
+  ##---------PRIVATE functions ----------------------------------------------------
+	
+	## - --  - - XML generators  - - - - ---- - -- - - - -
+		 # Function getLinesetXML for getting Lineset XML
+	 function getLinesetXML(){
+	   # if seriesType MSStackedColumn2DLineDY (4) then linset element will be Generate
+	   if($this->seriesType==4){
+		   $partXML="";
+		   # Fetching lineSet array and Generating lineset xml element
+		   foreach($this->lineSet as $part_type => $part_name){
+		     $partXML .= "<lineset " . $this->lineSetParam[$part_type]   . " >";
+		     foreach($this->lineSet[$part_type] as $part_type1 => $part_name1){ 
+		         foreach($this->lineSet[$part_type][$part_type1] as $part_type2 => $part_name2){   
+				   if ($part_type2!=""){
+					  $partXML .= $part_name2;
+					 } 
+				 }	 
+		       }
+		     $partXML .= "</lineset>";
+		   }
+		   return $partXML;
+	   }
+	 }
+
+	 # Function getMSStackedDatasetXML for getting datset part XML from ms stacked chart dataset array
+	 # <dataset>
+     #     <dataset seriesName='Product A' color='AFD8F8' showValues='0'>
+     #       <set value='30' />
+     #       <set value='26' />
+     #     </dataset>
+	 # </dataset>
+	 
+	 function getMSStackedDatasetXML(){
+	   if($this->seriesType==4){
+		   $partXML="";
+		   
+		   foreach($this->MSSDataset as $part_type => $part_name){
+		     $partXML .= "<dataset>";
+		     foreach($this->MSSDataset[$part_type] as $part_type1 => $part_name1){ 
+		        $partXML .= "<dataset " . $this->MSSDatasetParams[$part_type][$part_type1] . " >";
+		        foreach($this->MSSDataset[$part_type][$part_type1] as $part_type2 => $part_name2){ 
+		             if ($part_type2!=""){
+					    $partXML .= $part_name2;
+					 } 
+		        }
+		        $partXML .= "</dataset>";
+		     }
+		     $partXML .= "</dataset>";
+		   }
+		   
+		   return $partXML;
+	   }
+	 }
+	 
+	 
+
+
+	 # getvTrendLinesXML create XML output depending on trendLines array
+	 #  <vTrendlines>
+	 #    <line displayValue='vTrendLines' startValue='5' endValue='6' alpha='10' color='ff0000'  />
+	 # </vTrendlines>
+	 function getvTrendLinesXML(){
+		$partXML="";
+		$lineXML="";	
+		# fetching vtrendLines array
+		foreach($this->vtrendLines as $l_type => $l_name){
+		  # staring line element
+		  $lineXML .="<line ";
+		  # fetching vtrendLines array with in array element
+		  foreach($this->vtrendLines[$l_type] as $part_type => $part_name){
+				$lineXML .= $part_type . "='" . $this->encodeSpecialChars($part_name) . "' ";
+		  }
+		  # close line element
+		  $lineXML .=" />";
+		}
+		# if line element present then adding $lineXML with in vtrendLines element 
+		$pos = strpos($lineXML, "=");
+        if ($pos !== false) {
+		   $partXML = "<vTrendlines>" . $lineXML . "</vTrendlines>"; 
+		}else{
+		   # return nothing
+		   $partXML="";
+		}
+		# return vtrendLines xml
+		return $partXML;
+	 }
+	 # getStylesXML create the styles XML from styles array
+	 /*
+	 <styles>
+       <definition>
+         <style name='CanvasAnim' type='animation' param='_xScale' start='0' duration='1' />
+       </definition>
+       <application>
+         <apply toObject='Canvas' styles='CanvasAnim' />
+       </application>   
+     </styles>
+     */
+	 function getStylesXML(){
+		$partXML="";
+		$lineXML="";	
+	    # fetching styles array	
+		foreach($this->styles as $s_type => $s_name){
+		 $lineXML .="<" . $s_type . ">";
+		 # fetching styles array with in array	
+		 foreach($this->styles[$s_type] as $sub_type => $sub_name){
+		  # creating dynamic element depend on array name
+		  
+		  # fetching styles array with in array	with array element 
+		  foreach($this->styles[$s_type][$sub_type] as $part_type => $part_name){
+			 $lineXML .="<" . $sub_type . " ";
+			 foreach($this->styles[$s_type][$sub_type][$part_type] as $part_type1 => $part_name1){
+	
+				 # adding elements parameter
+				 $lineXML .= $part_type1 . "='" . $this->encodeSpecialChars($part_name1) . "' ";
+	
+			 }
+			 $lineXML .=" />";
+		  }
+		  
+		 }
+		 # closing open eleement
+		 $lineXML .="</" . $s_type .  ">";
+		}
+		# adding $lineXML  with in style element
+		# cheking element have any attribute or not
+		$pos = strpos($lineXML, "=");
+        if ($pos !== false) {
+     		$partXML = "<styles>" . $lineXML . "</styles>"; 
+		}else{
+	        $partXML ="";	
+		}
+		# returning the part of xml
+		return $partXML;
+	 }
+	 
+
+	
+	 
+	## ---------- Array Init functions ----------------------------------------------
+	 # create Lineset array 
+	 function createLineset(){
+		 $this->lineCounter++;
+		 $this->lineSet[$this->lineCounter]= array();
+	 }
+     
+
+	 # creating MS-Stacked ataset array element and parameter array
+	 function createMSSDataset(){
+		 $this->MSSDatasetCounter++;
+		 $this->MSSDataset[$this->MSSDatasetCounter]= array();
+		 $this->MSSDatasetParams[$this->MSSDatasetCounter]=array();
+	 }
+	 
+	 # Creating set data with in datset
+	 function createMSSSetData(){
+		 $this->MSSSetCounter++;
+		 $this->MSSDataset[$this->MSSDatasetCounter][$this->MSSSubDatasetCounter][$this->MSSSetCounter]= array();
+	 }
+
+	 # createStyles create array element with in styles array
+	 function createStyles($styleID){
+		 $this->styles[$styleID]= array();
+	 }
+
+	 # createSubStyles create array element with in styles array element with in sub styles array 
+	 # element for storing sub element parameter
+	 function createSubStyles($styleID,$subStyle){
+		 $this->styles[$styleID][$subStyle]= array();
+	 }
+	 
+
+	  # createvTrendLines create TrendLines array
+	 function createvTrendLines($lineID){
+		$this->vtrendLines[$lineID] = array();
+	 }
+	 
+	 # setvTLine create TrendLine parameter 
+	 function setvTLine($lineID,$paramName, $paramValue){
+		 $this->vtrendLines[$lineID][$paramName]=$paramValue;
+	 }
+	
+	 # create sub styles param
+	 function createSubStylesParam($styleID,$subStyle,$subParam){
+		 $this->styles[$styleID][$subStyle][$subParam]= array();
+	 }
+	 
+	 # setSubStylesParam create sub styles array to store parameters
+	 function setSubStylesParam($styleID,$subStyle,$subParam,$id,$value){
+		 $this->styles[$styleID][$subStyle][$subParam][$id]= $value;
+	 }
+
+	 
+	 
+#====================== For Future Use (end) ======================================
+
+
+}
+
+
+
+?>
diff --git a/pandora_console/reporting/Image/Canvas.php b/pandora_console/include/Image/Canvas.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas.php
rename to pandora_console/include/Image/Canvas.php
diff --git a/pandora_console/reporting/Image/Canvas/Color.php b/pandora_console/include/Image/Canvas/Color.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/Color.php
rename to pandora_console/include/Image/Canvas/Color.php
diff --git a/pandora_console/reporting/Image/Canvas/Fonts/README b/pandora_console/include/Image/Canvas/Fonts/README
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/Fonts/README
rename to pandora_console/include/Image/Canvas/Fonts/README
diff --git a/pandora_console/reporting/Image/Canvas/Fonts/fontmap.txt b/pandora_console/include/Image/Canvas/Fonts/fontmap.txt
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/Fonts/fontmap.txt
rename to pandora_console/include/Image/Canvas/Fonts/fontmap.txt
diff --git a/pandora_console/reporting/Image/Canvas/GD.php b/pandora_console/include/Image/Canvas/GD.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/GD.php
rename to pandora_console/include/Image/Canvas/GD.php
diff --git a/pandora_console/reporting/Image/Canvas/GD/JPG.php b/pandora_console/include/Image/Canvas/GD/JPG.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/GD/JPG.php
rename to pandora_console/include/Image/Canvas/GD/JPG.php
diff --git a/pandora_console/reporting/Image/Canvas/GD/PNG.php b/pandora_console/include/Image/Canvas/GD/PNG.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/GD/PNG.php
rename to pandora_console/include/Image/Canvas/GD/PNG.php
diff --git a/pandora_console/reporting/Image/Canvas/ImageMap.php b/pandora_console/include/Image/Canvas/ImageMap.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/ImageMap.php
rename to pandora_console/include/Image/Canvas/ImageMap.php
diff --git a/pandora_console/reporting/Image/Canvas/PDF.php b/pandora_console/include/Image/Canvas/PDF.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/PDF.php
rename to pandora_console/include/Image/Canvas/PDF.php
diff --git a/pandora_console/reporting/Image/Canvas/SVG.php b/pandora_console/include/Image/Canvas/SVG.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/SVG.php
rename to pandora_console/include/Image/Canvas/SVG.php
diff --git a/pandora_console/reporting/Image/Canvas/Tool.php b/pandora_console/include/Image/Canvas/Tool.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/Tool.php
rename to pandora_console/include/Image/Canvas/Tool.php
diff --git a/pandora_console/reporting/Image/Canvas/WithMap.php b/pandora_console/include/Image/Canvas/WithMap.php
similarity index 100%
rename from pandora_console/reporting/Image/Canvas/WithMap.php
rename to pandora_console/include/Image/Canvas/WithMap.php
diff --git a/pandora_console/reporting/Image/Color.php b/pandora_console/include/Image/Color.php
similarity index 100%
rename from pandora_console/reporting/Image/Color.php
rename to pandora_console/include/Image/Color.php
diff --git a/pandora_console/reporting/Image/Graph.php b/pandora_console/include/Image/Graph.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph.php
rename to pandora_console/include/Image/Graph.php
diff --git a/pandora_console/reporting/Image/Graph/Axis.php b/pandora_console/include/Image/Graph/Axis.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis.php
rename to pandora_console/include/Image/Graph/Axis.php
diff --git a/pandora_console/reporting/Image/Graph/Axis/Category.php b/pandora_console/include/Image/Graph/Axis/Category.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis/Category.php
rename to pandora_console/include/Image/Graph/Axis/Category.php
diff --git a/pandora_console/reporting/Image/Graph/Axis/Logarithmic.php b/pandora_console/include/Image/Graph/Axis/Logarithmic.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis/Logarithmic.php
rename to pandora_console/include/Image/Graph/Axis/Logarithmic.php
diff --git a/pandora_console/reporting/Image/Graph/Axis/Marker/Area.php b/pandora_console/include/Image/Graph/Axis/Marker/Area.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis/Marker/Area.php
rename to pandora_console/include/Image/Graph/Axis/Marker/Area.php
diff --git a/pandora_console/reporting/Image/Graph/Axis/Marker/Line.php b/pandora_console/include/Image/Graph/Axis/Marker/Line.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis/Marker/Line.php
rename to pandora_console/include/Image/Graph/Axis/Marker/Line.php
diff --git a/pandora_console/reporting/Image/Graph/Axis/Radar.php b/pandora_console/include/Image/Graph/Axis/Radar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Axis/Radar.php
rename to pandora_console/include/Image/Graph/Axis/Radar.php
diff --git a/pandora_console/reporting/Image/Graph/Common.php b/pandora_console/include/Image/Graph/Common.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Common.php
rename to pandora_console/include/Image/Graph/Common.php
diff --git a/pandora_console/reporting/Image/Graph/Config.php b/pandora_console/include/Image/Graph/Config.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Config.php
rename to pandora_console/include/Image/Graph/Config.php
diff --git a/pandora_console/reporting/Image/Graph/Constants.php b/pandora_console/include/Image/Graph/Constants.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Constants.php
rename to pandora_console/include/Image/Graph/Constants.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor.php b/pandora_console/include/Image/Graph/DataPreprocessor.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor.php
rename to pandora_console/include/Image/Graph/DataPreprocessor.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Array.php b/pandora_console/include/Image/Graph/DataPreprocessor/Array.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Array.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Array.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Currency.php b/pandora_console/include/Image/Graph/DataPreprocessor/Currency.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Currency.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Currency.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Date.php b/pandora_console/include/Image/Graph/DataPreprocessor/Date.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Date.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Date.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Formatted.php b/pandora_console/include/Image/Graph/DataPreprocessor/Formatted.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Formatted.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Formatted.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Function.php b/pandora_console/include/Image/Graph/DataPreprocessor/Function.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Function.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Function.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/NumberText.php b/pandora_console/include/Image/Graph/DataPreprocessor/NumberText.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/NumberText.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/NumberText.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/RomanNumerals.php b/pandora_console/include/Image/Graph/DataPreprocessor/RomanNumerals.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/RomanNumerals.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/RomanNumerals.php
diff --git a/pandora_console/reporting/Image/Graph/DataPreprocessor/Sequential.php b/pandora_console/include/Image/Graph/DataPreprocessor/Sequential.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataPreprocessor/Sequential.php
rename to pandora_console/include/Image/Graph/DataPreprocessor/Sequential.php
diff --git a/pandora_console/reporting/Image/Graph/DataSelector.php b/pandora_console/include/Image/Graph/DataSelector.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataSelector.php
rename to pandora_console/include/Image/Graph/DataSelector.php
diff --git a/pandora_console/reporting/Image/Graph/DataSelector/EveryNthPoint.php b/pandora_console/include/Image/Graph/DataSelector/EveryNthPoint.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataSelector/EveryNthPoint.php
rename to pandora_console/include/Image/Graph/DataSelector/EveryNthPoint.php
diff --git a/pandora_console/reporting/Image/Graph/DataSelector/NoZeros.php b/pandora_console/include/Image/Graph/DataSelector/NoZeros.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataSelector/NoZeros.php
rename to pandora_console/include/Image/Graph/DataSelector/NoZeros.php
diff --git a/pandora_console/reporting/Image/Graph/DataSelector/Values.php b/pandora_console/include/Image/Graph/DataSelector/Values.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/DataSelector/Values.php
rename to pandora_console/include/Image/Graph/DataSelector/Values.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset.php b/pandora_console/include/Image/Graph/Dataset.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset.php
rename to pandora_console/include/Image/Graph/Dataset.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset/Function.php b/pandora_console/include/Image/Graph/Dataset/Function.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset/Function.php
rename to pandora_console/include/Image/Graph/Dataset/Function.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset/Random.php b/pandora_console/include/Image/Graph/Dataset/Random.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset/Random.php
rename to pandora_console/include/Image/Graph/Dataset/Random.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset/Sequential.php b/pandora_console/include/Image/Graph/Dataset/Sequential.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset/Sequential.php
rename to pandora_console/include/Image/Graph/Dataset/Sequential.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset/Trivial.php b/pandora_console/include/Image/Graph/Dataset/Trivial.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset/Trivial.php
rename to pandora_console/include/Image/Graph/Dataset/Trivial.php
diff --git a/pandora_console/reporting/Image/Graph/Dataset/VectorFunction.php b/pandora_console/include/Image/Graph/Dataset/VectorFunction.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Dataset/VectorFunction.php
rename to pandora_console/include/Image/Graph/Dataset/VectorFunction.php
diff --git a/pandora_console/reporting/Image/Graph/Element.php b/pandora_console/include/Image/Graph/Element.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Element.php
rename to pandora_console/include/Image/Graph/Element.php
diff --git a/pandora_console/reporting/Image/Graph/Figure/Circle.php b/pandora_console/include/Image/Graph/Figure/Circle.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Figure/Circle.php
rename to pandora_console/include/Image/Graph/Figure/Circle.php
diff --git a/pandora_console/reporting/Image/Graph/Figure/Ellipse.php b/pandora_console/include/Image/Graph/Figure/Ellipse.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Figure/Ellipse.php
rename to pandora_console/include/Image/Graph/Figure/Ellipse.php
diff --git a/pandora_console/reporting/Image/Graph/Figure/Polygon.php b/pandora_console/include/Image/Graph/Figure/Polygon.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Figure/Polygon.php
rename to pandora_console/include/Image/Graph/Figure/Polygon.php
diff --git a/pandora_console/reporting/Image/Graph/Figure/Rectangle.php b/pandora_console/include/Image/Graph/Figure/Rectangle.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Figure/Rectangle.php
rename to pandora_console/include/Image/Graph/Figure/Rectangle.php
diff --git a/pandora_console/reporting/Image/Graph/Fill.php b/pandora_console/include/Image/Graph/Fill.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Fill.php
rename to pandora_console/include/Image/Graph/Fill.php
diff --git a/pandora_console/reporting/Image/Graph/Fill/Array.php b/pandora_console/include/Image/Graph/Fill/Array.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Fill/Array.php
rename to pandora_console/include/Image/Graph/Fill/Array.php
diff --git a/pandora_console/reporting/Image/Graph/Fill/Gradient.php b/pandora_console/include/Image/Graph/Fill/Gradient.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Fill/Gradient.php
rename to pandora_console/include/Image/Graph/Fill/Gradient.php
diff --git a/pandora_console/reporting/Image/Graph/Fill/Image.php b/pandora_console/include/Image/Graph/Fill/Image.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Fill/Image.php
rename to pandora_console/include/Image/Graph/Fill/Image.php
diff --git a/pandora_console/reporting/Image/Graph/Font.php b/pandora_console/include/Image/Graph/Font.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Font.php
rename to pandora_console/include/Image/Graph/Font.php
diff --git a/pandora_console/reporting/Image/Graph/Grid.php b/pandora_console/include/Image/Graph/Grid.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Grid.php
rename to pandora_console/include/Image/Graph/Grid.php
diff --git a/pandora_console/reporting/Image/Graph/Grid/Bars.php b/pandora_console/include/Image/Graph/Grid/Bars.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Grid/Bars.php
rename to pandora_console/include/Image/Graph/Grid/Bars.php
diff --git a/pandora_console/reporting/Image/Graph/Grid/Lines.php b/pandora_console/include/Image/Graph/Grid/Lines.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Grid/Lines.php
rename to pandora_console/include/Image/Graph/Grid/Lines.php
diff --git a/pandora_console/reporting/Image/Graph/Grid/Polar.php b/pandora_console/include/Image/Graph/Grid/Polar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Grid/Polar.php
rename to pandora_console/include/Image/Graph/Grid/Polar.php
diff --git a/pandora_console/reporting/Image/Graph/Images/Icons/pinpoint.png b/pandora_console/include/Image/Graph/Images/Icons/pinpoint.png
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Images/Icons/pinpoint.png
rename to pandora_console/include/Image/Graph/Images/Icons/pinpoint.png
diff --git a/pandora_console/reporting/Image/Graph/Images/Icons/pinpointr.png b/pandora_console/include/Image/Graph/Images/Icons/pinpointr.png
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Images/Icons/pinpointr.png
rename to pandora_console/include/Image/Graph/Images/Icons/pinpointr.png
diff --git a/pandora_console/reporting/Image/Graph/Images/Maps/README b/pandora_console/include/Image/Graph/Images/Maps/README
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Images/Maps/README
rename to pandora_console/include/Image/Graph/Images/Maps/README
diff --git a/pandora_console/reporting/Image/Graph/Layout.php b/pandora_console/include/Image/Graph/Layout.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Layout.php
rename to pandora_console/include/Image/Graph/Layout.php
diff --git a/pandora_console/reporting/Image/Graph/Layout/Horizontal.php b/pandora_console/include/Image/Graph/Layout/Horizontal.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Layout/Horizontal.php
rename to pandora_console/include/Image/Graph/Layout/Horizontal.php
diff --git a/pandora_console/reporting/Image/Graph/Layout/Matrix.php b/pandora_console/include/Image/Graph/Layout/Matrix.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Layout/Matrix.php
rename to pandora_console/include/Image/Graph/Layout/Matrix.php
diff --git a/pandora_console/reporting/Image/Graph/Layout/Vertical.php b/pandora_console/include/Image/Graph/Layout/Vertical.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Layout/Vertical.php
rename to pandora_console/include/Image/Graph/Layout/Vertical.php
diff --git a/pandora_console/reporting/Image/Graph/Legend.php b/pandora_console/include/Image/Graph/Legend.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Legend.php
rename to pandora_console/include/Image/Graph/Legend.php
diff --git a/pandora_console/reporting/Image/Graph/Line/Array.php b/pandora_console/include/Image/Graph/Line/Array.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Line/Array.php
rename to pandora_console/include/Image/Graph/Line/Array.php
diff --git a/pandora_console/reporting/Image/Graph/Line/Dashed.php b/pandora_console/include/Image/Graph/Line/Dashed.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Line/Dashed.php
rename to pandora_console/include/Image/Graph/Line/Dashed.php
diff --git a/pandora_console/reporting/Image/Graph/Line/Dotted.php b/pandora_console/include/Image/Graph/Line/Dotted.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Line/Dotted.php
rename to pandora_console/include/Image/Graph/Line/Dotted.php
diff --git a/pandora_console/reporting/Image/Graph/Line/Formatted.php b/pandora_console/include/Image/Graph/Line/Formatted.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Line/Formatted.php
rename to pandora_console/include/Image/Graph/Line/Formatted.php
diff --git a/pandora_console/reporting/Image/Graph/Line/Solid.php b/pandora_console/include/Image/Graph/Line/Solid.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Line/Solid.php
rename to pandora_console/include/Image/Graph/Line/Solid.php
diff --git a/pandora_console/reporting/Image/Graph/Logo.php b/pandora_console/include/Image/Graph/Logo.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Logo.php
rename to pandora_console/include/Image/Graph/Logo.php
diff --git a/pandora_console/reporting/Image/Graph/Marker.php b/pandora_console/include/Image/Graph/Marker.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker.php
rename to pandora_console/include/Image/Graph/Marker.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Array.php b/pandora_console/include/Image/Graph/Marker/Array.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Array.php
rename to pandora_console/include/Image/Graph/Marker/Array.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Asterisk.php b/pandora_console/include/Image/Graph/Marker/Asterisk.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Asterisk.php
rename to pandora_console/include/Image/Graph/Marker/Asterisk.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Average.php b/pandora_console/include/Image/Graph/Marker/Average.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Average.php
rename to pandora_console/include/Image/Graph/Marker/Average.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Box.php b/pandora_console/include/Image/Graph/Marker/Box.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Box.php
rename to pandora_console/include/Image/Graph/Marker/Box.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Bubble.php b/pandora_console/include/Image/Graph/Marker/Bubble.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Bubble.php
rename to pandora_console/include/Image/Graph/Marker/Bubble.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Circle.php b/pandora_console/include/Image/Graph/Marker/Circle.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Circle.php
rename to pandora_console/include/Image/Graph/Marker/Circle.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Cross.php b/pandora_console/include/Image/Graph/Marker/Cross.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Cross.php
rename to pandora_console/include/Image/Graph/Marker/Cross.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Diamond.php b/pandora_console/include/Image/Graph/Marker/Diamond.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Diamond.php
rename to pandora_console/include/Image/Graph/Marker/Diamond.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Icon.php b/pandora_console/include/Image/Graph/Marker/Icon.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Icon.php
rename to pandora_console/include/Image/Graph/Marker/Icon.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Pinpoint.php b/pandora_console/include/Image/Graph/Marker/Pinpoint.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Pinpoint.php
rename to pandora_console/include/Image/Graph/Marker/Pinpoint.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Plus.php b/pandora_console/include/Image/Graph/Marker/Plus.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Plus.php
rename to pandora_console/include/Image/Graph/Marker/Plus.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Pointing.php b/pandora_console/include/Image/Graph/Marker/Pointing.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Pointing.php
rename to pandora_console/include/Image/Graph/Marker/Pointing.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Pointing/Angular.php b/pandora_console/include/Image/Graph/Marker/Pointing/Angular.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Pointing/Angular.php
rename to pandora_console/include/Image/Graph/Marker/Pointing/Angular.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Pointing/Radial.php b/pandora_console/include/Image/Graph/Marker/Pointing/Radial.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Pointing/Radial.php
rename to pandora_console/include/Image/Graph/Marker/Pointing/Radial.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/ReversePinpoint.php b/pandora_console/include/Image/Graph/Marker/ReversePinpoint.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/ReversePinpoint.php
rename to pandora_console/include/Image/Graph/Marker/ReversePinpoint.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Star.php b/pandora_console/include/Image/Graph/Marker/Star.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Star.php
rename to pandora_console/include/Image/Graph/Marker/Star.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Triangle.php b/pandora_console/include/Image/Graph/Marker/Triangle.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Triangle.php
rename to pandora_console/include/Image/Graph/Marker/Triangle.php
diff --git a/pandora_console/reporting/Image/Graph/Marker/Value.php b/pandora_console/include/Image/Graph/Marker/Value.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Marker/Value.php
rename to pandora_console/include/Image/Graph/Marker/Value.php
diff --git a/pandora_console/reporting/Image/Graph/Plot.php b/pandora_console/include/Image/Graph/Plot.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot.php
rename to pandora_console/include/Image/Graph/Plot.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Area.php b/pandora_console/include/Image/Graph/Plot/Area.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Area.php
rename to pandora_console/include/Image/Graph/Plot/Area.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Band.php b/pandora_console/include/Image/Graph/Plot/Band.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Band.php
rename to pandora_console/include/Image/Graph/Plot/Band.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Bar.php b/pandora_console/include/Image/Graph/Plot/Bar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Bar.php
rename to pandora_console/include/Image/Graph/Plot/Bar.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/BoxWhisker.php b/pandora_console/include/Image/Graph/Plot/BoxWhisker.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/BoxWhisker.php
rename to pandora_console/include/Image/Graph/Plot/BoxWhisker.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/CandleStick.php b/pandora_console/include/Image/Graph/Plot/CandleStick.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/CandleStick.php
rename to pandora_console/include/Image/Graph/Plot/CandleStick.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Dot.php b/pandora_console/include/Image/Graph/Plot/Dot.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Dot.php
rename to pandora_console/include/Image/Graph/Plot/Dot.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Fit/Line.php b/pandora_console/include/Image/Graph/Plot/Fit/Line.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Fit/Line.php
rename to pandora_console/include/Image/Graph/Plot/Fit/Line.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Impulse.php b/pandora_console/include/Image/Graph/Plot/Impulse.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Impulse.php
rename to pandora_console/include/Image/Graph/Plot/Impulse.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Line.php b/pandora_console/include/Image/Graph/Plot/Line.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Line.php
rename to pandora_console/include/Image/Graph/Plot/Line.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Odo.php b/pandora_console/include/Image/Graph/Plot/Odo.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Odo.php
rename to pandora_console/include/Image/Graph/Plot/Odo.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Pie.php b/pandora_console/include/Image/Graph/Plot/Pie.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Pie.php
rename to pandora_console/include/Image/Graph/Plot/Pie.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Radar.php b/pandora_console/include/Image/Graph/Plot/Radar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Radar.php
rename to pandora_console/include/Image/Graph/Plot/Radar.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Smoothed/Area.php b/pandora_console/include/Image/Graph/Plot/Smoothed/Area.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Smoothed/Area.php
rename to pandora_console/include/Image/Graph/Plot/Smoothed/Area.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Smoothed/Bezier.php b/pandora_console/include/Image/Graph/Plot/Smoothed/Bezier.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Smoothed/Bezier.php
rename to pandora_console/include/Image/Graph/Plot/Smoothed/Bezier.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Smoothed/Line.php b/pandora_console/include/Image/Graph/Plot/Smoothed/Line.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Smoothed/Line.php
rename to pandora_console/include/Image/Graph/Plot/Smoothed/Line.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Smoothed/Radar.php b/pandora_console/include/Image/Graph/Plot/Smoothed/Radar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Smoothed/Radar.php
rename to pandora_console/include/Image/Graph/Plot/Smoothed/Radar.php
diff --git a/pandora_console/reporting/Image/Graph/Plot/Step.php b/pandora_console/include/Image/Graph/Plot/Step.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plot/Step.php
rename to pandora_console/include/Image/Graph/Plot/Step.php
diff --git a/pandora_console/reporting/Image/Graph/Plotarea.php b/pandora_console/include/Image/Graph/Plotarea.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plotarea.php
rename to pandora_console/include/Image/Graph/Plotarea.php
diff --git a/pandora_console/reporting/Image/Graph/Plotarea/Element.php b/pandora_console/include/Image/Graph/Plotarea/Element.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plotarea/Element.php
rename to pandora_console/include/Image/Graph/Plotarea/Element.php
diff --git a/pandora_console/reporting/Image/Graph/Plotarea/Map.php b/pandora_console/include/Image/Graph/Plotarea/Map.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plotarea/Map.php
rename to pandora_console/include/Image/Graph/Plotarea/Map.php
diff --git a/pandora_console/reporting/Image/Graph/Plotarea/Radar.php b/pandora_console/include/Image/Graph/Plotarea/Radar.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Plotarea/Radar.php
rename to pandora_console/include/Image/Graph/Plotarea/Radar.php
diff --git a/pandora_console/reporting/Image/Graph/Simple.php b/pandora_console/include/Image/Graph/Simple.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Simple.php
rename to pandora_console/include/Image/Graph/Simple.php
diff --git a/pandora_console/reporting/Image/Graph/Title.php b/pandora_console/include/Image/Graph/Title.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Title.php
rename to pandora_console/include/Image/Graph/Title.php
diff --git a/pandora_console/reporting/Image/Graph/Tool.php b/pandora_console/include/Image/Graph/Tool.php
similarity index 100%
rename from pandora_console/reporting/Image/Graph/Tool.php
rename to pandora_console/include/Image/Graph/Tool.php
diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/include/fgraph.php
similarity index 78%
rename from pandora_console/reporting/fgraph.php
rename to pandora_console/include/fgraph.php
index a8f9022077..af75e7b91d 100644
--- a/pandora_console/reporting/fgraph.php
+++ b/pandora_console/include/fgraph.php
@@ -15,9 +15,14 @@
 
 
 
-
-require_once ('../include/config.php');
-require_once ($config['homedir'].'/reporting/pandora_graph.php');
+if ($config) {
+	require_once ($config['homedir'].'/include/config.php');
+	require_once ($config['homedir'].'/include/pandora_graph.php');
+	require_once ($config['homedir'].'/include/functions_fsgraph.php');
+} else {
+	require_once ('../include/config.php');
+	require_once ($config['homedir'].'/include/pandora_graph.php');
+}
 
 set_time_limit (0);
 error_reporting (0);
@@ -175,8 +180,12 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 				'order' => 'utimestamp ASC'),
 			array ('datos', 'utimestamp'));
 		
-		if ($result === false)
+		if ($result === false) {
+			if ($config['flash_charts']) {
+				return fs_error_image ();
+			}
 			graphic_error ();
+		}
 		
 		foreach ($result as $row) {
 			$datos = $row["datos"];
@@ -232,21 +241,34 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 			$module_list_name[$i] .= " (x". format_numeric ($weight_list[$i], 1).")";
 	}
 	
-	if ($period <= 3600)
+	if ($period <= 3600) {
 		$title_period = __('Last hour');
-	elseif ($period <= 86400)
+		$time_format = 'G:i:s';
+	} elseif ($period <= 86400) {
 		$title_period = __('Last day');
-	elseif ($period <= 604800)
+		$time_format = 'G:i';
+	} elseif ($period <= 604800) {
 		$title_period = __('Last week');
-	elseif ($period <= 2419200)
+		$time_format = 'M j';
+	} elseif ($period <= 2419200) {
 		$title_period = __('Last month');
-	else
+		$time_format = 'M j';
+	} else {
 		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
+		$time_format = 'M j';
+	}
 	
 	if ($max_value <= 0) {
+		if ($config['flash_charts']) {
+			return fs_error_image ();
+		}
 		graphic_error ();
 	}
 	
+	if ($config['flash_charts']) {
+		return fs_combined_chart ($real_data, $data, $module_list_name, $width, $height, $stacked, $resolution / 10, $time_format);
+	}
+
 	$engine = get_graph_engine ($period);
 	
 	$engine->width = $width;
@@ -301,8 +323,12 @@ function grafico_modulo_sparse ($id_agente_modulo, $period, $show_event,
 			'order' => 'utimestamp ASC'),
 		array ('datos', 'utimestamp'));
 	
-	if ($all_data === false)
+	if ($all_data === false) {
+		if ($config['flash_charts']) {
+			return fs_error_image ('../images');
+		}
 		graphic_error ();
+	}
 	$max_value = 0;
 	$min_value = 0;
 	$start = 0;
@@ -375,16 +401,26 @@ function grafico_modulo_sparse ($id_agente_modulo, $period, $show_event,
 		}
 	}
 	
-	if ($period <= 3600)
+	if ($period <= 3600) {
 		$title_period = __('Last hour');
-	elseif ($period <= 86400)
+		$time_format = 'G:i:s';
+	} elseif ($period <= 86400) {
 		$title_period = __('Last day');
-	elseif ($period <= 604800)
+		$time_format = 'G:i';
+	} elseif ($period <= 604800) {
 		$title_period = __('Last week');
-	elseif ($period <= 2419200)
+		$time_format = 'M j';
+	} elseif ($period <= 2419200) {
 		$title_period = __('Last month');
-	else
+		$time_format = 'M j';
+	} else {
 		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
+		$time_format = 'M j';
+	}
+
+	if ($config['flash_charts']) {
+		return fs_module_chart ($data, $width, $height, $avg_only, $resolution / 10, $time_format);
+	}
 	
 	$engine = get_graph_engine ($period);
 	$engine->width = $width;
@@ -440,14 +476,24 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) {
 	
 	for ($i = 0; $i < $interval; $i++) {
 		$bottom = $datelimit + ($periodtime * $i);
+		if ($config['flash_charts']) {
+			$name = date('G:i', $bottom);
+		} else {
+			$name = $bottom;
+		}
+
 		$top = $datelimit + ($periodtime * ($i + 1));
-		$data[$bottom] = (int) get_db_value_filter ('COUNT(*)',
+		$data[$name] = (int) get_db_value_filter ('COUNT(*)',
 			'tagent_access',
 			array ('id_agent' => $id_agent,
 				'utimestamp > '.$bottom,
 				'utimestamp < '.$top));
 	}
 
+	if ($config['flash_charts']) {
+		return fs_2d_area_chart ($data, $width, $height, $resolution / 1000, ';decimalPrecision=0');
+	}
+
 	$engine = get_graph_engine ($period);
 	
 	$engine->width = $width;
@@ -464,7 +510,52 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) {
 	$engine->single_graph ();
 }
 
+function graphic_agentevents ($id_agent, $width, $height, $period = 0) {
+	global $config;
+
+	$data = array ();
+
+	$resolution = $config['graph_res'] * ($period * 2 / $width); // Number of "slices" we want in graph
+	
+	$interval = (int) ($period / $resolution);
+	$date = get_system_time ();
+	$datelimit = $date - $period;
+	$periodtime = floor ($period / $interval);
+	$time = array ();
+	$data = array ();
+	
+	for ($i = 0; $i < $interval; $i++) {
+		$bottom = $datelimit + ($periodtime * $i);
+		if ($config['flash_charts']) {
+			$name = date('H\h', $bottom);
+		} else {
+			$name = $bottom;
+		}
+
+		$top = $datelimit + ($periodtime * ($i + 1));
+		$criticity = (int) get_db_value_filter ('criticity',
+			'tevento',
+			array ('id_agente' => $id_agent,
+				'utimestamp > '.$bottom,
+				'utimestamp < '.$top));
+
+		switch ($criticity) {
+			case 3: $data[$name] = 'E5DF63';
+					break;
+			case 4: $data[$name] = 'FF3C4B';
+					break;
+			default: $data[$name] = '9ABD18';
+		}
+		
+	}
+
+	if ($config['flash_charts']) {
+		return fs_agent_event_chart ($data, $width, $height, $resolution / 750);
+	}
+}
+
 function graph_incidents_status () {
+	global $config;
 	$data = array (0, 0, 0, 0);
 	
 	$data = array ();
@@ -489,10 +580,15 @@ function graph_incidents_status () {
 			$data[__("Invalid")]++;
 	}
 	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, 370, 180);
+	}
+
 	generic_pie_graph (370, 180, $data);
 }
 
 function grafico_incidente_prioridad () {
+	global $config;
 	$data_tmp = array (0, 0, 0, 0, 0, 0);
 	$sql = 'SELECT COUNT(id_incidencia), prioridad
 		FROM tincidencia GROUP BY prioridad
@@ -511,10 +607,15 @@ function grafico_incidente_prioridad () {
 			__('Very serious') => $data_tmp[4],
 			__('Maintenance') => $data_tmp[5]);
 	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, 320, 200);
+	}
+
 	generic_pie_graph (320, 200, $data);
 }
 
 function graphic_incident_group () {
+	global $config;
 	$data = array ();
 	$max_items = 5;
 	$sql = sprintf ('SELECT COUNT(id_incidencia), nombre
@@ -527,10 +628,16 @@ function graphic_incident_group () {
 		$name = $incident[1].' ('.$incident[0].')';
 		$data[$name] = $incident[0];
 	}
+
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, 320, 200);
+	}
+
 	generic_pie_graph (320, 200, $data);
 }
 
 function graphic_incident_user () {
+	global $config;
 	$data = array ();
 	$max_items = 5;
 	$sql = sprintf ('SELECT COUNT(id_incidencia), id_usuario
@@ -541,10 +648,16 @@ function graphic_incident_user () {
 		$name = $incident[1].' ('.$incident[0].')';
 		$data[$name] = $incident[0];
 	}
+	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, 320, 200);
+	}
+
 	generic_pie_graph (320, 200, $data);
 }
 
 function graphic_user_activity ($width = 350, $height = 230) {
+	global $config;
 	$data = array ();
 	$max_items = 5;
 	$sql = sprintf ('SELECT COUNT(id_usuario), id_usuario
@@ -554,10 +667,16 @@ function graphic_user_activity ($width = 350, $height = 230) {
 	foreach ($logins as $login) {
 		$data[$login[1]] = $login[0];
 	}
+	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
+
  	generic_pie_graph ($width, $height, $data);
 }
 
 function graphic_incident_source ($width = 320, $height = 200) {
+	global $config;
 	$data = array ();
 	$max_items = 5;
 	$sql = sprintf ('SELECT COUNT(id_incidencia), origen 
@@ -567,10 +686,16 @@ function graphic_incident_source ($width = 320, $height = 200) {
 	foreach ($origins as $origin) {
 		$data[$origin[1]] = $origin[0];
 	}
+	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
+
 	generic_pie_graph ($width, $height, $data);
 }
 
 function graph_db_agentes_modulos ($width, $height) {
+	global $config;
 	$data = array ();
 	
 	$modules = get_db_all_rows_sql ('SELECT COUNT(id_agente_modulo),id_agente
@@ -583,11 +708,16 @@ function graph_db_agentes_modulos ($width, $height) {
 		$agent_name = get_agent_name ($module['id_agente'], "none");
 		$data[$agent_name] = $module[0];
 	}
+
+	if ($config['flash_charts']) {
+		return fs_3d_bar_chart ($data, $width, $height);
+	}
 	
 	generic_horizontal_bar_graph ($width, $height, $data);
 }
 
 function grafico_eventos_usuario ($width, $height) {
+	global $config;
 	$data = array ();
 	$max_items = 5;
 	$sql = sprintf ('SELECT COUNT(id_evento),id_usuario
@@ -597,10 +727,16 @@ function grafico_eventos_usuario ($width, $height) {
 	foreach ($events as $event) {
 		$data[$event[1]] = $event[0];
 	}
+	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
+
 	generic_pie_graph ($width, $height, $data);
 }
 
 function grafico_eventos_total ($filter = "") {
+	global $config;
 	$filter = str_replace  ( "\\" , "", $filter);
 	$data = array ();
 	$legend = array ();
@@ -623,10 +759,15 @@ function grafico_eventos_total ($filter = "") {
 	
 	asort ($data);
 	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, 320, 200);
+	}
+
 	generic_pie_graph (320, 200, $data);
 }
 
 function graph_event_module ($width = 300, $height = 200, $id_agent) {
+	global $config;
 	$data = array ();
 	$max_items = 6;
 	$sql = sprintf ('SELECT COUNT(id_evento),nombre
@@ -656,6 +797,10 @@ function graph_event_module ($width = 300, $height = 200, $id_agent) {
 		$data = array_slice ($data, 0, $max_items);
 	}
 	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
+
 	generic_pie_graph ($width, $height, $data,
 		array ('zoom' => 75,
 			'show_legend' => false));
@@ -705,6 +850,10 @@ function grafico_eventos_grupo ($width = 300, $height = 200, $url = "") {
 		$loop++;
 	}
 	
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
+
 	error_reporting (0);
 	generic_pie_graph ($width, $height, $data, array ('show_legend' => false));
 }
@@ -793,6 +942,8 @@ function generic_pie_graph ($width = 300, $height = 200, &$data, $options = fals
 }
 
 function grafico_db_agentes_paquetes ($width = 380, $height = 300) {
+	global $config;
+
 	$data = array ();
 	$legend = array ();
 	
@@ -805,11 +956,17 @@ function grafico_db_agentes_paquetes ($width = 380, $height = 300) {
 	foreach ($count as $agent_id => $value) {
 		$data[$agents[$agent_id]] = $value;
 	}
+
+	if ($config['flash_charts']) {
+		return fs_3d_bar_chart ($data, $width, $height);
+	}
 	
 	generic_horizontal_bar_graph ($width, $height, $data, $legend);
 }
 
 function grafico_db_agentes_purge ($id_agent, $width, $height) {
+	global $config;
+
 	if ($id_agent < 1) {
 		$id_agent = -1;
 		$query = "";
@@ -846,6 +1003,10 @@ function grafico_db_agentes_purge ($id_agent, $width, $height) {
 	$data[__("Older")] += get_db_sql (sprintf ("SELECT COUNT(*) FROM tagente_datos_string WHERE 1=1 %s", $query));
 
 	$data[__("Older")] = $data[__("Older")] - $data["3 ".__("Months")];
+
+	if ($config['flash_charts']) {
+		return fs_3d_pie_chart ($data, $width, $height);
+	}
 	
 	generic_pie_graph ($width, $height, $data);
 }
@@ -1009,16 +1170,195 @@ function grafico_modulo_boolean ($id_agente_modulo, $period, $show_event,
 		$grafica[$d['timestamp_bottom']] = $d['sum'];
 	}
 	
-	if ($period <= 3600)
+	if ($period <= 3600) {
 		$title_period = __('Last hour');
-	elseif ($period <= 86400)
+		$time_format = 'G:i:s';
+	} elseif ($period <= 86400) {
 		$title_period = __('Last day');
-	elseif ($period <= 604800)
+		$time_format = 'G:i';
+	} elseif ($period <= 604800) {
 		$title_period = __('Last week');
-	elseif ($period <= 2419200)
+		$time_format = 'M j';
+	} elseif ($period <= 2419200) {
 		$title_period = __('Last month');
-	else
+		$time_format = 'M j';
+	} else {
 		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
+		$time_format = 'M j';
+	}
+
+	if ($config['flash_charts']) {
+		return fs_module_chart ($data, $width, $height, $avg_only, $resolution / 10, $time_format);
+	}
+
+	$engine = get_graph_engine ($period);
+	
+	$engine->width = $width;
+	$engine->height = $height;
+	$engine->data = &$grafica;
+	$engine->max_value = $max_value;
+	$engine->legend = array ($nombre_modulo);
+	$engine->title = '   '.strtoupper ($nombre_agente)." - ".__('Module').' '.$title;
+	$engine->subtitle = '     '.__('Period').': '.$title_period;
+	$engine->show_title = !$pure;
+	$engine->events = $show_event ? $real_event : false;
+	$engine->fontpath = $config['fontpath'];
+	$engine->alert_top = $show_alert ? $alert_high : false;
+	$engine->alert_bottom = $show_alert ? $alert_low : false;;
+	
+	if ($period < 10000)
+		$engine->xaxis_interval = 20;
+	else
+		$engine->xaxis_interval = $resolution * 4;
+	$engine->yaxis_interval = 1;
+	$engine->xaxis_format = 'date';
+	
+	$engine->single_graph ();
+	
+	return;
+}
+
+function grafico_modulo_string ($id_agente_modulo, $period, $show_event,
+	 $width, $height , $title, $unit_name, $show_alert, $avg_only = 0, $pure=0,
+	 $date = 0) {
+	global $config;
+
+	$resolution = $config['graph_res'] * 50; // Number of "slices" we want in graph
+	
+	if (! $date)
+		$date = get_system_time ();
+	
+	$datelimit = $date - $period; // limit date
+	$interval = (int) ($period / $resolution); // Each interval is $interval seconds length
+	$nombre_agente = get_agentmodule_agent_name ($id_agente_modulo);
+	$id_agente = get_agent_id ($nombre_agente);
+	$nombre_modulo = get_agentmodule_name ($id_agente_modulo);
+
+	if ($show_event == 1)
+		$real_event = array ();
+
+	if ($show_alert == 1) {
+		$alert_high = false;
+		$alert_low = false;
+		// If we want to show alerts limits
+		
+		$alert_high = get_db_value ('MAX(max_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
+		$alert_low = get_db_value ('MIN(min_value)', 'talert_template_modules', 'id_agent_module', (int) $id_agente_modulo);
+		
+		// if no valid alert defined to render limits, disable it
+		if (($alert_low === false || $alert_low === NULL) &&
+			($alert_high === false || $alert_high === NULL)) {
+			$show_alert = 0;
+		}
+	}
+
+	// interval - This is the number of "rows" we are divided the time
+	 // to fill data. more interval, more resolution, and slower.
+	// periodo - Gap of time, in seconds. This is now to (now-periodo) secs
+	
+	// Init tables
+	for ($i = 0; $i <= $resolution; $i++) {
+		$data[$i]['sum'] = 0; // SUM of all values for this interval
+		$data[$i]['count'] = 0; // counter
+		$data[$i]['timestamp_bottom'] = $datelimit + ($interval * $i); // [2] Top limit for this range
+		$data[$i]['timestamp_top'] = $datelimit + ($interval * ($i + 1)); // [3] Botom limit
+		$data[$i]['min'] = 1; // MIN
+		$data[$i]['max'] = 0; // MAX
+		$data[$i]['last'] = 0; // Last value
+		$data[$i]['events'] = 0; // Event
+	}
+	// Init other general variables
+	if ($show_event == 1) {
+		// If we want to show events in graphs
+		$sql = "SELECT utimestamp FROM tevento WHERE id_agente = $id_agente AND utimestamp > $datelimit";
+		$result = get_db_all_rows_sql ($sql);
+		foreach ($result as $row) {
+			$utimestamp = $row['utimestamp'];
+			for ($i = 0; $i <= $resolution; $i++) {
+				if ($utimestamp <= $data[$i]['timestamp_top'] && $utimestamp >= $data[$i]['timestamp_bottom']) {
+					$data['events']++;
+				}
+			}
+		}
+	}
+	// Init other general variables
+	$max_value = 0;
+	
+	$all_data = get_db_all_rows_filter ('tagente_datos_string',
+		array ('id_agente_modulo' => $id_agente_modulo,
+			"utimestamp > $datelimit",
+			"utimestamp < $date",
+			'order' => 'utimestamp ASC'),
+		array ('datos', 'utimestamp'));
+	
+	if ($all_data === false) {
+		$all_data = array ();
+	}
+	
+	foreach ($all_data as $module_data) {
+		$real_data = 1;
+		$utimestamp = $module_data["utimestamp"];
+		for ($i = 0; $i <= $resolution; $i++) {
+			if ($utimestamp <= $data[$i]['timestamp_top'] && $utimestamp >= $data[$i]['timestamp_bottom']) {
+				$data[$i]['sum'] += $real_data;
+				$data[$i]['count']++;
+				
+				$data[$i]['last'] = $real_data;
+				
+				$data[$i]['min'] = min ($data[$i]['min'], $real_data);
+				$data[$i]['max'] = max ($data[$i]['max'], $real_data);
+			}
+		}
+		
+	}
+	
+	$previous = (float) get_previous_data ($id_agente_modulo, $datelimit);
+	// Calculate Average value for $data[][0]
+	for ($i = 0; $i <= $resolution; $i++) {
+		if ($data[$i]['count'] == 0) {
+			$data[$i]['sum'] = $previous;
+			$data[$i]['min'] = $previous;
+			$data[$i]['max'] = $previous;
+			$data[$i]['last'] = $previous;
+			
+			$previous = $data[$i]['sum'];
+		} else {
+			$previous = $data[$i]['sum'];
+			if ($data[$i]['count'] > 1) {
+				$previous = $data[$i]['last'];
+				$data[$i]['sum'] = floor ($data[$i]['sum'] / $data[$i]['count']);
+			}
+		}
+		
+		// Get max value for all graph
+		$max_value = max ($max_value, $data[$i]['max']);
+	}
+	
+	$grafica = array ();
+	foreach ($data as $d) {
+		$grafica[$d['timestamp_bottom']] = $d['sum'];
+	}
+	
+	if ($period <= 3600) {
+		$title_period = __('Last hour');
+		$time_format = 'G:i:s';
+	} elseif ($period <= 86400) {
+		$title_period = __('Last day');
+		$time_format = 'G:i';
+	} elseif ($period <= 604800) {
+		$title_period = __('Last week');
+		$time_format = 'M j';
+	} elseif ($period <= 2419200) {
+		$title_period = __('Last month');
+		$time_format = 'M j';
+	} else {
+		$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
+		$time_format = 'M j';
+	}
+
+	if ($config['flash_charts']) {
+		return fs_module_chart ($data, $width, $height, $avg_only, $resolution / 10, $time_format);
+	}
 	
 	$engine = get_graph_engine ($period);
 	
@@ -1187,7 +1527,6 @@ if ($graphic_type) {
 	default:
 		graphic_error ();
 	}
-} else {
-	graphic_error ();
 }
 ?>
+<script language="JavaScript" src="include/FusionCharts/FusionCharts.js"></script>
diff --git a/pandora_console/reporting/fgraph2.php b/pandora_console/include/fgraph2.php
similarity index 100%
rename from pandora_console/reporting/fgraph2.php
rename to pandora_console/include/fgraph2.php
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index d3af7880e8..1cb9878790 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -103,6 +103,7 @@ function update_config () {
 	update_config_value ('round_corner', (bool) get_parameter ('round_corner', $config["round_corner"]));
 	update_config_value ('status_images_set', (string) get_parameter ('status_images_set', $config["status_images_set"]));
 	update_config_value ('agentaccess', (int) get_parameter ('agentaccess', $config['agentaccess']));
+	update_config_value ('flash_charts', (bool) get_parameter ('flash_charts', $config["flash_charts"]));
 }
 
 /**
@@ -242,12 +243,16 @@ function process_config () {
 	}
 	
 	if (!isset ($config['fontpath'])) {
-		update_config_value ( 'fontpath', $config['homedir'].'/reporting/FreeSans.ttf');
+		update_config_value ( 'fontpath', $config['homedir'].'/include/FreeSans.ttf');
 	}
 
 	if (!isset ($config['style'])) {
 		update_config_value ( 'style', 'pandora');
 	}
+
+	if (!isset ($config['flash_charts'])) {
+		update_config_value ( 'flash_charts', true);
+	}
 			
 	/* Finally, check if any value was overwritten in a form */
 	update_config ();
diff --git a/pandora_console/include/functions_custom_graphs.php b/pandora_console/include/functions_custom_graphs.php
index e15e9b9357..22681d8780 100644
--- a/pandora_console/include/functions_custom_graphs.php
+++ b/pandora_console/include/functions_custom_graphs.php
@@ -14,6 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+if ($config['flash_charts']) {
+	require_once ('include/fgraph.php');
+}
 
 /**
  * Get all the custom graphs a user can see.
@@ -77,11 +80,16 @@ function print_custom_graph ($id_graph, $height, $width, $period, $stacked, $ret
 			continue;
 		array_push ($modules, $source['id_agent_module']);
 		array_push ($weights, $source['weight']);
+	}	
+
+	if ($config['flash_charts']) {
+		$output = graphic_combined_module ($modules, $weights, $period, $width, $height,
+				'', '', 0, 0, 0, $stacked);
+	} else {
+		$modules = implode (',', $modules);
+		$weights = implode (',', $weights);
+		$output = '<img src="include/fgraph.php?tipo=combined&height='.$height.'&width='.$width.'&id='.$modules.'&period='.$period.'&weight_l='.$weights.'&stacked='.$stacked.'">';
 	}
-	$modules = implode (',', $modules);
-	$weights = implode (',', $weights);
-	
-	$output = '<img src="reporting/fgraph.php?tipo=combined&height='.$height.'&width='.$width.'&id='.$modules.'&period='.$period.'&weight_l='.$weights.'&stacked='.$stacked.'">';
 	
 	if ($return)
 		return $output;
diff --git a/pandora_console/include/functions_fsgraph.php b/pandora_console/include/functions_fsgraph.php
new file mode 100644
index 0000000000..2d1906994d
--- /dev/null
+++ b/pandora_console/include/functions_fsgraph.php
@@ -0,0 +1,287 @@
+<?php
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2009 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the  GNU Lesser General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+require_once ('FusionCharts/FusionCharts_Gen.php');
+
+// Returns the code needed to display the chart
+function get_chart_code ($chart, $width, $height, $swf) {
+	$random_number = rand ();
+	$div_id = 'chart_div_' . $random_number;
+	$chart_id = 'chart_' . $random_number;
+    $output = '<div id="' . $div_id. '"></div>';
+    $output .= '<script type="text/javascript">
+    			<!--
+        			$(document).ready(function pie_' . $chart_id . ' () {
+        				var myChart = new FusionCharts("' . $swf . '", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+        				myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
+						myChart.addParam("WMode", "Transparent");
+        				myChart.render("' . $div_id . '");
+        			})
+        		-->
+    			</script>';
+    return $output;
+}
+
+// Returns a 3D bar chart
+function fs_3d_bar_chart ($data, $width, $height) {
+	global $config;
+
+	if (sizeof ($data) == 0) {
+		return fs_error_image ();
+	}
+
+	// Generate the XML
+	$chart = new FusionCharts('Column3D', $width, $height);
+
+	$empty = 1;
+	foreach ($data as $name => $value) {
+		if ($value > 0) {
+			$empty = 0;
+		}
+		$chart->addChartData($value, 'name=' . clean_flash_string($name) . ';color=95BB04');
+	}
+
+  	$chart->setChartParams('showNames=1;rotateNames=1;showValues=0;showPercentageValues=0;showLimits=0;baseFontSize=9;' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
+
+	// Return the code
+	return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Column3D.swf');
+}
+
+// Returns a 3D pie chart
+function fs_3d_pie_chart ($data, $width, $height) {
+	global $config;
+
+	if (sizeof ($data) == 0) {
+		return fs_error_image ();
+	}
+
+	// Generate the XML
+	$chart = new FusionCharts('Pie3D', $width, $height);
+  	$chart->setChartParams('showNames=1;showValues=0;showPercentageValues=0;baseFontSize=9');
+
+	$empty = 1;
+	foreach ($data as $name => $value) {
+		if ($value > 0) {
+			$empty = 0;
+		}
+		$chart->addChartData($value, 'name=' . clean_flash_string($name));
+	}
+
+	// Chart is not empty, but all elements are 0
+	if ($empty == 1) {
+		return fs_error_image ();
+	}
+
+	// Return the code
+	return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Pie3D.swf');
+}
+
+// Returns a 2D area chart
+function fs_2d_area_chart ($data, $width, $height, $step = 1, $params = '') {
+	global $config;
+
+	if (sizeof ($data) == 0) {
+		return fs_error_image ();
+	}
+
+	// Generate the XML
+	$chart = new FusionCharts('Area2D', $width, $height);
+
+	$count = 0;
+	$num_vlines = 0;
+	$empty = 1;
+	foreach ($data as $name => $value) {
+		if ($count++ % $step == 0) {
+			$show_name = '1';
+			$num_vlines++;
+		} else {
+			$show_name = '0';
+		}
+		if ($value > 0) {
+			$empty = 0;
+		}
+		$chart->addChartData($value, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=95BB04');
+	}
+
+  	$chart->setChartParams('numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : '') . $params);
+
+	// Return the code
+	return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Area2D.swf');
+}
+
+// Returns a Pandora FMS module chart
+function fs_module_chart ($data, $width, $height, $avg_only = 1, $step = 10, $time_format = 'G:i') {
+	global $config;
+
+	// Generate the XML
+	$chart = new FusionCharts('MSArea2D', $width, $height);
+	$num_vlines = 0;
+	$count = 0;
+
+	// Create categories
+	foreach ($data as $value) {
+		if ($count++ % $step == 0) {
+			$show_name = '1';
+			$num_vlines++;
+		} else {
+			$show_name = '0';
+		}
+		$chart->addCategory(date($time_format, $value['timestamp_bottom']), 'hoverText=' . strftime ('%c', $value['timestamp_bottom']) . ';showName=' . $show_name);
+	}
+
+	// Max chart
+	if ($avg_only == 0) {
+		$chart->addDataSet('Max', 'color=BFED05');
+		foreach ($data as $value) {
+			$chart->addChartData($value['max']);
+		}
+	}
+
+	// Avg chart
+	$empty = 1;
+	$chart->addDataSet('Avg', 'color=95BB04');
+	foreach ($data as $value) {
+		if ($value['sum'] > 0) {
+			$empty = 0;
+		}
+		$chart->addChartData($value['sum']);
+	}
+
+	// Min chart
+	if ($avg_only == 0) {
+		$chart->addDataSet('Min', 'color=6D8703');
+		foreach ($data as $value) {
+			$chart->addChartData($value['min']);
+		}
+	}
+
+  	$chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
+
+	$random_number = rand ();
+	$div_id = 'chart_div_' . $random_number;
+	$chart_id = 'chart_' . $random_number;
+    $output = '<div id="' . $div_id. '" style="z-index:1;"></div>'; 
+	$output .= '<script language="JavaScript" src="../../include/FusionCharts/FusionCharts.js"></script>';
+    $output .= '<script type="text/javascript">
+    			<!--
+        			function pie_' . $chart_id . ' () {
+        				var myChart = new FusionCharts("../../include/FusionCharts/FCF_MSArea2D.swf", "' . $chart_id . '", "' . $width. '", "' . $height. '", "0", "1");
+        				myChart.setDataXML("' . addslashes($chart->getXML ()) . '");
+						myChart.addParam("WMode", "Transparent");
+        				myChart.render("' . $div_id . '");
+        			}
+					pie_' . $chart_id . ' ();
+        		-->
+    			</script>';
+    return $output;
+}
+
+// Returns a Pandora FMS combined chart
+function fs_combined_chart ($data, $categories, $sets, $width, $height, $type = 1, $step = 10, $time_format = 'G:i') {
+	global $config;
+
+	if (sizeof ($data) == 0) {
+		return fs_error_image ();
+	}
+
+	// Generate the XML
+	switch ($type) {
+		case 0: $chart_type = 'MSArea2D';
+				break;
+		case 1: $chart_type = 'StackedArea2D';
+				break;
+		case 2: $chart_type = 'MSLine';
+				break;
+		default: $chart_type = 'StackedArea2D';
+	}
+	
+	$chart = new FusionCharts($chart_type, $width, $height);
+
+	// Create categories
+	$count = 0;
+	$num_vlines = 0;
+	foreach ($categories as $category) {
+		if ($count++ % $step == 0) {
+			$show_name = '1';
+			$num_vlines++;
+		} else {
+			$show_name = '0';
+		}
+
+		$chart->addCategory(date($time_format, $category['timestamp_bottom']), 'hoverText=' . strftime ('%c', $category['timestamp_bottom']) . ';showName=' . $show_name);
+	}
+
+	// Stack charts
+	$empty = 1;	
+	for ($i = 0; $i < sizeof ($data); $i++) {
+		$chart->addDataSet ($sets[$i]);
+		foreach ($data[$i] as $value) {
+			if ($value > 0) {
+				$empty = 0;
+			}
+			$chart->addChartData($value);
+		}
+	}
+
+  	$chart->setChartParams('animation=0;numVDivLines=' . $num_vlines . ';showAlternateVGridColor=1;showNames=1;rotateNames=1;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=1;areaBorderThickness=1;areaBorderColor=000000' . ($empty == 1 ? ';yAxisMinValue=0;yAxisMaxValue=1' : ''));
+
+	// Return the code
+	return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_' . $chart_type . '.swf');
+}
+
+// Returns a Pandora FMS agent event chart
+function fs_agent_event_chart ($data, $width, $height, $step = 1) {
+	global $config;
+
+	if (sizeof ($data) == 0) {
+		return fs_error_image ();
+	}
+
+	// Generate the XML
+	$chart = new FusionCharts('Area2D', $width, $height);
+
+	$count = 0;
+	$num_vlines = 0;
+	foreach ($data as $name => $value) {
+		if ($count++ % $step == 0) {
+			$show_name = '1';
+			$num_vlines++;
+		} else {
+			$show_name = '0';
+		}
+		$chart->addChartData(1, 'name=' . clean_flash_string($name) . ';showName=' . $show_name . ';color=' . $value);
+	}
+
+  	$chart->setChartParams('numDivLines=0;numVDivLines=0;showNames=1;rotateNames=0;showValues=0;baseFontSize=9;showLimits=0;showAreaBorder=0;areaBorderThickness=1;canvasBgColor=9ABD18');
+
+	// Return the code
+	return get_chart_code ($chart, $width, $height, 'include/FusionCharts/FCF_Area2D.swf');
+}
+
+// Clean FLASH string strips non-valid characters for flashchart
+function clean_flash_string ($string) {
+	$string = html_entity_decode ($string, ENT_QUOTES, "UTF-8");
+	$temp = str_replace('&', '', $string);
+	$temp = str_replace(' ', '', $string);
+	return str_replace ('"', '', $temp);
+}
+
+// Prints an error image
+function fs_error_image ($image_dir = 'images') {
+	return '<img border="0" src="' . $image_dir . '/image_problem.png" />';
+}
+
+?>
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index a1a0e4111a..2869196648 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -322,7 +322,7 @@ function alert_reporting ($id_group, $period = 0, $date = 0, $return = false) {
 	if (sizeof ($alerts) > 0)
 		$fired_percentage = round (sizeof ($alerts_fired) / sizeof ($alerts) * 100, 2);
 	$not_fired_percentage = 100 - $fired_percentage;
-	$output .= '<img src="reporting/fgraph.php?tipo=alerts_fired_pipe&height=150&width=280&fired='.
+	$output .= '<img src="include/fgraph.php?tipo=alerts_fired_pipe&height=150&width=280&fired='.
 		$fired_percentage.'&not_fired='.$not_fired_percentage.'" style="float: right; border: 1px solid black">';
 	
 	$output .= '<strong>'.__('Alerts fired').': '.sizeof ($alerts_fired).'</strong><br />';
@@ -392,7 +392,7 @@ function monitor_health_reporting ($id_group, $period = 0, $date = 0, $return =
 	$output .= print_table ($table, true);
 	
 	//Floating it was ugly, moved it to the bottom
-	$output .= '<img src="reporting/fgraph.php?tipo=monitors_health_pipe&height=150&width=280&down='.$down_percentage.'&amp;not_down='.$not_down_percentage.'" style="border: 1px solid black" />';
+	$output .= '<img src="include/fgraph.php?tipo=monitors_health_pipe&height=150&width=280&down='.$down_percentage.'&amp;not_down='.$not_down_percentage.'" style="border: 1px solid black" />';
 	
 	if (!$return)
 		echo $output;
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 360c78b6c8..8ec259b10e 100644
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -152,7 +152,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
 				echo $layout_data['label'];
 				echo "<br>";
 
-				echo "<img src='".$config["homeurl"]."/reporting/fgraph.php?tipo=progress&height=15&width=$width&mode=1&percent=$percentile'>";
+				echo "<img src='".$config["homeurl"]."/include/fgraph.php?tipo=progress&height=15&width=$width&mode=1&percent=$percentile'>";
 
 				echo '</div>';
 				break;
@@ -166,7 +166,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
 						echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data['id_layout_linked'].'">';
 					}
 				}
-				print_image ("reporting/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".safe_input ($layout_data['label'])."&amp;height=".$layout_data['height']."&amp;width=".$layout_data['width']."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
+				print_image ("include/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".safe_input ($layout_data['label'])."&amp;height=".$layout_data['height']."&amp;width=".$layout_data['width']."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
 				echo "</a>";
 				echo "</div>";
 			}
diff --git a/pandora_console/reporting/pChart/pCache.class b/pandora_console/include/pChart/pCache.class
similarity index 100%
rename from pandora_console/reporting/pChart/pCache.class
rename to pandora_console/include/pChart/pCache.class
diff --git a/pandora_console/reporting/pChart/pChart.class b/pandora_console/include/pChart/pChart.class
similarity index 100%
rename from pandora_console/reporting/pChart/pChart.class
rename to pandora_console/include/pChart/pChart.class
diff --git a/pandora_console/reporting/pChart/pData.class b/pandora_console/include/pChart/pData.class
similarity index 93%
rename from pandora_console/reporting/pChart/pData.class
rename to pandora_console/include/pChart/pData.class
index e9cc5c65d6..bee85e938b 100644
--- a/pandora_console/reporting/pChart/pData.class
+++ b/pandora_console/include/pChart/pData.class
@@ -118,10 +118,9 @@
     }
 
    function AddPoint($Value,$Serie="Serie1",$Description="")
-    {//echo "#$Serie#";print_r($Value);
+    {
      if (is_array($Value) && count($Value) == 1)
-      $Value = reset($Value); //In previous releases has a bug, because  it's
-      //assumed  that array have a numerical indexes, now take the first simply.
+      $Value = $Value[0];
 
      $ID = 0;
      for($i=0;$i<=count($this->Data);$i++)
diff --git a/pandora_console/reporting/pandora_graph.php b/pandora_console/include/pandora_graph.php
similarity index 100%
rename from pandora_console/reporting/pandora_graph.php
rename to pandora_console/include/pandora_graph.php
diff --git a/pandora_console/reporting/pchart_graph.php b/pandora_console/include/pchart_graph.php
similarity index 100%
rename from pandora_console/reporting/pchart_graph.php
rename to pandora_console/include/pchart_graph.php
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 646f9d1c2f..6befc6252b 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -17,6 +17,10 @@
 
 // Load global vars
 require_once ("include/config.php");
+if ($config['flash_charts']) {
+	require_once ("include/fgraph.php");
+}
+
 check_login ();
 
 $id_agente = get_parameter_get ("id_agente", -1);
@@ -35,21 +39,27 @@ if (! give_acl ($config["id_user"], $agent["id_grupo"], "AR")) {
 	return;
 }
 
-echo "<h2>".__('Pandora agents')." &raquo; ".__('Agent general information')."</h2>";
+echo "<h2>".__('Pandora Agents')." &raquo; ".__('Agent general information')."</h2>";
 
 // Blank space below title
-echo '<div style="height: 10px">&nbsp;</div>';
-
+echo '<div style="height: 10px">&nbsp;</div>';	
+	
 //Floating div
 echo '<div style="float:right; width:320px; padding-top:11px;">';
-if ($config["agentaccess"] == 1){
-	echo '<b>'.__('Agent access rate (24h)').'</b><br />';
-	echo '<img border="1" src="reporting/fgraph.php?id='.$id_agente.'&tipo=agentaccess&height=90&width=290" />';
+echo '<b>'.__('Agent access rate (24h)').'</b><br />';
+if ($config['flash_charts']) {
+	echo graphic_agentaccess ($id_agente, 280, 110, 86400);
+} else {
+	echo '<img border="1" src="include/fgraph.php?id='.$id_agente.'&tipo=agentaccess&height=90&width=290" />';
 }
-	
 echo '<div style="height:25px">&nbsp;</div>';
 echo '<b>'.__('Events generated -by module-').'</b><br />';
-echo '<img border="1" src="reporting/fgraph.php?tipo=event_module&width=290&height=180&id_agent='.$id_agente.'" />';
+if ($config['flash_charts']) {
+	echo graphic_agentevents ($id_agente, 290, 60, 86400);
+	echo graph_event_module (290, 120, $id_agente);
+} else {
+	echo '<img border="1" src="include/fgraph.php?tipo=event_module&width=290&height=180&id_agent='.$id_agente.'" />';
+}
 echo '</div>';
 	
 echo '<div width="450px">';
@@ -123,7 +133,7 @@ if ($max > 0) {
 }
 
 echo '<tr><td class="datos"><b>'.__('Next agent contact').'</b></td>';
-echo '<td class="datos f9" colspan="2"><img src="reporting/fgraph.php?tipo=progress&percent='.$progress.'&height=20&width=200"></td></tr>';
+echo '<td class="datos f9" colspan="2"><img src="include/fgraph.php?tipo=progress&percent='.$progress.'&height=20&width=200"></td></tr>';
 
 //End of table
 echo '</table></div>';
diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php
index 7715e6cc4c..01b19067cf 100644
--- a/pandora_console/operation/agentes/estado_ultimopaquete.php
+++ b/pandora_console/operation/agentes/estado_ultimopaquete.php
@@ -176,20 +176,20 @@ foreach ($modules as $module) {
 		
 			
 		$handle = "stat".$nombre_tipo_modulo."_".$module["id_agente_modulo"];
-		$url = 'reporting/procesos.php?agente='.$module["id_agente_modulo"];
+		$url = 'include/procesos.php?agente='.$module["id_agente_modulo"];
 		$win_handle=dechex(crc32($module["id_agente_modulo"].$module["nombre"]));
 		echo "<td class=".$tdcolor." width='78'>";
 		$graph_label = output_clean_strict ($module["nombre"]);
 		
-		echo "<a href='javascript:winopeng(\"reporting/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".$graph_label."refresh=180000\", \"month_".$win_handle."\")'><img src='images/grafica_m.png' border=0></a>&nbsp;";
+		echo "<a href='javascript:winopeng(\"operation/agentes/stat_win.php?type=$graph_type&period=2419200&id=".$module["id_agente_modulo"]."&label=".$graph_label."refresh=180000\", \"month_".$win_handle."\")'><img src='images/grafica_m.png' border=0></a>&nbsp;";
 		
-		$link ="winopeng('reporting/stat_win.php?type=$graph_type&period=604800&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=6000','week_".$win_handle."')";
+		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=604800&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=6000','week_".$win_handle."')";
 		echo '<a href="javascript:'.$link.'"><img src="images/grafica_w.png" border=0></a>&nbsp;';
 		
-		$link ="winopeng('reporting/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=600','day_".$win_handle."')";
+		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=86400&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=600','day_".$win_handle."')";
 		echo '<a href="javascript:'.$link.'"><img src="images/grafica_d.png" border=0></a>&nbsp;';
 
-		$link ="winopeng('reporting/stat_win.php?type=$graph_type&period=3600&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=60','hour_".$win_handle."')";
+		$link ="winopeng('operation/agentes/stat_win.php?type=$graph_type&period=3600&id=".$module["id_agente_modulo"]."&label=".$graph_label."&refresh=60','hour_".$win_handle."')";
 		echo '<a href="javascript:'.$link.'"><img src="images/grafica_h.png" border=0></a>';
 	}
 	
diff --git a/pandora_console/reporting/stat_win.php b/pandora_console/operation/agentes/stat_win.php
similarity index 69%
rename from pandora_console/reporting/stat_win.php
rename to pandora_console/operation/agentes/stat_win.php
index e5113c897b..ce0a7450a1 100644
--- a/pandora_console/reporting/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -16,7 +16,7 @@
 
 
 // Global & session management
-require_once ('../include/config.php');
+require_once ('../../include/config.php');
 if (!isset ($config["auth"])) {
 	require_once ($config["homedir"]."/include/auth/mysql.php");
 } else {
@@ -28,8 +28,12 @@ if (! isset($_SESSION["id_user"])) {
 	session_write_close();
 }
 
-require_once ('../include/functions.php');
-require_once ('../include/functions_db.php');
+require_once ($config["homedir"] . '/include/functions.php');
+require_once ($config["homedir"] . '/include/functions_db.php');
+
+if ($config['flash_charts']) {
+	require_once ($config["homedir"] . '/include/fgraph.php');
+}
 
 check_login ();
 
@@ -45,11 +49,11 @@ if ($refresh > 0) {
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Pandora FMS Graph</title>
-<link rel="stylesheet" href="../include/styles/pandora_minimal.css" type="text/css" />
-<script type='text/javaScript' src='../include/javascript/calendar.js'></script>
-<script type='text/javascript' src='../include/javascript/x_core.js'></script>
-<script type='text/javascript' src='../include/javascript/x_event.js'></script>
-<script type='text/javascript' src='../include/javascript/x_slide.js'></script>
+<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
+<script type='text/javaScript' src='../../include/javascript/calendar.js'></script>
+<script type='text/javascript' src='../../include/javascript/x_core.js'></script>
+<script type='text/javascript' src='../../include/javascript/x_event.js'></script>
+<script type='text/javascript' src='../../include/javascript/x_slide.js'></script>
 <script type='text/javascript'><!--
 var defOffset = 2;
 var defSlideTime = 220;
@@ -125,22 +129,37 @@ if ($zoom > 1) {
 
 $utime = get_system_time ();
 $current = date("Y-m-d", $utime);
-$image = "fgraph.php?tipo=".$graph_type."&draw_alerts=".$draw_alerts."&draw_events=".$draw_events."&id=".$id."&zoom=".$zoom."&label=".$label."&height=".$height."&width=".$width."&period=".$period."&avg_only=".$avg_only;
 
-if ($start_date != $current){
-	$image .= "&date=".$utime;
-	print_image ($image, false, array ("border" => 0));
+if ($config['flash_charts']) {
+	switch ($graph_type) {
+		case 'sparse':	echo grafico_modulo_sparse ($id, $period, $draw_events, $width, $height,
+						                            $label, $unit_name, $draw_alerts, $avg_only, $pure, $date);
+						break;
+		case 'boolean': echo grafico_modulo_boolean ($id, $period, $draw_events, $width, $height,
+						                             $label, $unit_name, $draw_alerts, 1, $pure, $date);
+						break;
+		case 'string': 	echo grafico_modulo_string ($id, $period, $draw_events, $width, $height,
+						                            $label, $unit_name, $draw_alerts, 1, $pure, $date, 1);
+						break;
+		default: 	echo fs_error_image ('../images');
+	}
 } else {
+	$image = "../../include/fgraph.php?tipo=".$graph_type."&draw_alerts=".$draw_alerts."&draw_events=".$draw_events."&id=".$id."&zoom=".$zoom."&label=".$label."&height=".$height."&width=".$width."&period=".$period."&avg_only=".$avg_only;
+
+	if ($start_date != $current){
+		$image .= "&date=".$utime;
+	}
+
 	print_image ($image, false, array ("border" => 0));
-	
-	echo '<table width="450" cellspacing="1" cellpadding="1" class="databox" style="margin-left: 20px">';
-	echo '<tr><td><b>'.__('Max. Value').'</b>: '.format_for_graph (get_agentmodule_data_max ($id, $period));
-	echo '</td><td><b>'.__('Avg. Value').'</b>: '.format_for_graph (get_agentmodule_data_average ($id, $period));
-	echo '</td><td><b>'.__('Min. Value').'</b>: '.format_for_graph (get_agentmodule_data_min ($id, $period));
-	echo '</td></tr></table>';
 }
 
-echo '<div id="divmenu" class="menu"><b>'.__('Pandora FMS Graph configuration menu').'</b><br />'.__('Please, make your changes and apply with the <i>Reload</i> button');
+echo '<table width="450" cellspacing="1" cellpadding="1" class="databox" style="margin-left: 20px">';
+echo '<tr><td><b>'.__('Max. Value').'</b>: '.format_for_graph (get_agentmodule_data_max ($id, $period));
+echo '</td><td><b>'.__('Avg. Value').'</b>: '.format_for_graph (get_agentmodule_data_average ($id, $period));
+echo '</td><td><b>'.__('Min. Value').'</b>: '.format_for_graph (get_agentmodule_data_min ($id, $period));
+echo '</td></tr></table>';
+
+echo '<div id="divmenu" class="menu" style="z-index:2;"><b>'.__('Pandora FMS Graph configuration menu').'</b><br />'.__('Please, make your changes and apply with the <i>Reload</i> button');
 echo '<form method="get" action="stat_win.php">';
 print_input_hidden ("id", $id);
 print_input_hidden ("label", $label);
@@ -161,7 +180,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>';
@@ -206,3 +225,4 @@ echo '</td><td>';
 print_submit_button ('GO', "submit", false, 'class="sub next"');
 
 echo '</td></tr></table></form></div></body></html>';
+?>
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 09e97fc951..736af8c887 100644
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -61,7 +61,7 @@ $table->head = array ();
 $table->data = array ();
 $table->style = array ();
 
-$img = "reporting/fgraph.php?tipo=progress&height=20&width=140&mode=0&percent=";
+$img = "include/fgraph.php?tipo=progress&height=20&width=140&mode=0&percent=";
 
 $table->style[0] = "padding-top:4px; padding-bottom:4px;";
 $table->data[0][0] ='<b>'.__('Monitor health').'</b>';
@@ -188,7 +188,7 @@ foreach ($serverinfo as $server) {
 		$data[1] = print_status_image (STATUS_SERVER_OK, '', true);
 	}
 	
-	$data[2] = print_image ("reporting/fgraph.php?tipo=progress&percent=".$server["load"]."&height=20&width=80",
+	$data[2] = print_image ("include/fgraph.php?tipo=progress&percent=".$server["load"]."&height=20&width=80",
 		true, array ("title" => $server["lag_txt"]));
 	
 	$data[3] = $server["lag_txt"];
diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php
index a17b7962c6..bcfc59e116 100644
--- a/pandora_console/operation/events/event_statistics.php
+++ b/pandora_console/operation/events/event_statistics.php
@@ -18,6 +18,7 @@
 
 // Load global vars
 require_once ("include/config.php");
+require_once ("include/fgraph.php");
 
 check_login ();
 
@@ -29,19 +30,26 @@ if (! give_acl ($config['id_user'], 0, "AR")) {
 echo "<table width=95%>";
 echo "<tr><td valign='top'>";
 echo "<h3>".__('Event graph')."</h3>";
-echo '<img src="reporting/fgraph.php?tipo=total_events&width=300&height=200" border=0>';
+if ($config['flash_charts']) {
+	echo grafico_eventos_total ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=total_events&width=300&height=200" border=0>';
+}
 echo "</td><td valign='top'>";
 echo "<h3>".__('Event graph by user')."</h3>";
-echo '<img src="reporting/fgraph.php?tipo=user_events&width=300&height=200" border=0>';
+if ($config['flash_charts']) {
+	echo grafico_eventos_usuario (300, 200);
+} else {
+	echo '<img src="include/fgraph.php?tipo=user_events&width=300&height=200" border=0>';
+}
 echo "</td></tr>";
 echo "<tr><td>";
-if (isset($_GET["test"])){
-	echo "<h3>".__('Event graph by group')."</h3>";
-	echo '<img src="reporting/fgraph2.php?tipo=group_events&width=300&height=200" border=0>';
-	echo "</td><td>";
-}
 echo "<h3>".__('Event graph by group')."</h3>";
-echo '<img src="reporting/fgraph.php?tipo=group_events&width=300&height=200" border=0>';
+if ($config['flash_charts']) {
+	echo grafico_eventos_grupo (300, 200);
+} else {
+	echo '<img src="include/fgraph.php?tipo=group_events&width=300&height=200" border=0>';
+}
 echo '</td></tr>';
 echo "</table>";
 ?>
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 266ce14b47..6390cadf82 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -17,6 +17,9 @@
 // Load global vars
 require_once ("include/config.php");
 require_once ("include/functions_events.php"); //Event processing functions
+if ($config['flash_charts']) {
+	require_once ("include/fgraph.php");
+}
 
 check_login ();
 
@@ -307,7 +310,11 @@ echo '</a>';
 
 echo "</td></tr></table></form>"; //This is the filter div
 echo '<div style="width:220px; float:left;">';
-print_image ("reporting/fgraph.php?tipo=group_events&width=220&height=180&url=".rawurlencode ($sql_post), false, array ("border" => 0));
+if ($config['flash_charts']) {
+	echo grafico_eventos_grupo (220, 180, rawurlencode ($sql_post));
+} else {
+	print_image ("include/fgraph.php?tipo=group_events&width=220&height=180&url=".rawurlencode ($sql_post), false, array ("border" => 0));
+}
 echo '</div>';
 echo '<div id="steps_clean">&nbsp;</div>';
 echo '</div>';
diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index 039bd96f9f..22692e2aa2 100644
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -16,6 +16,7 @@
 
 // Load global vars
 require_once ("include/config.php");
+require_once ("include/fgraph.php");
 
 check_login ();
 
@@ -27,15 +28,35 @@ if (! give_acl ($config['id_user'], 0, "IR") == 1) {
 echo "<h2>".__('Incident management')." &raquo; ".__('Statistics')."</h2>";
 
 echo '<table width="90%">
-	<tr><td valign="top"><h3>'.__('Incidents by status').'</h3>
-	<img src="reporting/fgraph.php?tipo=estado_incidente" border="0"></td>
-	<td valign="top"><h3>'.__('Incidents by priority').'</h3>
-	<img src="reporting/fgraph.php?tipo=prioridad_incidente" border="0"></td></tr>
-	<tr><td><h3>'.__('Incidents by group').'</h3>
-	<img src="reporting/fgraph.php?tipo=group_incident" border="0"></td>
-	<td><h3>'.__('Incidents by user').'</h3>
-	<img src="reporting/fgraph.php?tipo=user_incident" border="0"></td></tr>
-	<tr><td><h3>'.__('Incidents by source').'</h3>
-	<img src="reporting/fgraph.php?tipo=source_incident" border="0"></td></tr>
-	</table>';
+	<tr><td valign="top"><h3>'.__('Incidents by status').'</h3>';
+if ($config['flash_charts']) {
+	echo graph_incidents_status ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=estado_incidente" border="0"></td>';
+}
+echo '<td valign="top"><h3>'.__('Incidents by priority').'</h3>';
+if ($config['flash_charts']) {
+	echo grafico_incidente_prioridad ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=prioridad_incidente" border="0"></td></tr>';
+}
+echo '<tr><td><h3>'.__('Incidents by group').'</h3>';
+if ($config['flash_charts']) {
+	echo grafico_incidente_prioridad ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=group_incident" border="0"></td>';
+}
+echo '<td><h3>'.__('Incidents by user').'</h3>';
+if ($config['flash_charts']) {
+	echo grafico_incidente_prioridad ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=user_incident" border="0"></td></tr>';
+}
+echo '<tr><td><h3>'.__('Incidents by source').'</h3>';
+if ($config['flash_charts']) {
+	echo grafico_incidente_prioridad ();
+} else {
+	echo '<img src="include/fgraph.php?tipo=source_incident" border="0"></td></tr>';
+}
+echo '</table>';
 ?>
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index a5d8ca269b..d6dda393ad 100644
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -144,7 +144,7 @@ foreach ($contents as $content) {
 		}
 		
 		$data = array ();
-		$data[0] = '<img src="reporting/fgraph.php?tipo=sparse&id='.$content['id_agent_module'].'&height=230&width=720&period='.$content['period'].'&date='.$datetime.'&avg_only=1&pure=1" border="0" alt="">';
+		$data[0] = '<img src="include/fgraph.php?tipo=sparse&id='.$content['id_agent_module'].'&height=230&width=720&period='.$content['period'].'&date='.$datetime.'&avg_only=1&pure=1" border="0" alt="">';
 		array_push ($table->data, $data);
 		
 		break;
@@ -182,7 +182,7 @@ foreach ($contents as $content) {
 
 		$table->colspan[1][0] = 4;
 		$data = array ();
-		$data[0] = '<img src="reporting/fgraph.php?tipo=combined&id='.implode (',', $modules).'&weight_l='.implode (',', $weights).'&height='.$graph_height.'&width='.$graph_width.'&period='.$content['period'].'&date='.$datetime.'&stacked='.$graph["stacked"].'&pure=1" border="1" alt="">';
+		$data[0] = '<img src="include/fgraph.php?tipo=combined&id='.implode (',', $modules).'&weight_l='.implode (',', $weights).'&height='.$graph_height.'&width='.$graph_width.'&period='.$content['period'].'&date='.$datetime.'&stacked='.$graph["stacked"].'&pure=1" border="1" alt="">';
 		array_push ($table->data, $data);
 		
 		break;
diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php
index 181bb5770c..a3b4d8594c 100644
--- a/pandora_console/operation/reporting/reporting_xml.php
+++ b/pandora_console/operation/reporting/reporting_xml.php
@@ -182,7 +182,7 @@ foreach ($contents as $content) {
 	case 1:
 	case 'simple_graph':	
 		$data["title"] = __('Simple graph');
-		$data["objdata"]["img"] = 'reporting/fgraph.php?tipo=sparse&amp;id='.$content['id_agent_module'].'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;avg_only=1&amp;pure=1';
+		$data["objdata"]["img"] = 'include/fgraph.php?tipo=sparse&amp;id='.$content['id_agent_module'].'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;avg_only=1&amp;pure=1';
 	break;
 	case 2:
 	case 'custom_graph':
@@ -203,7 +203,7 @@ foreach ($contents as $content) {
 			array_push ($weights, $content2["weight"]);
 		}
 
-		$data["objdata"]["img"] = 'reporting/fgraph.php?tipo=combined&amp;id='.implode (',', $modules).'&amp;weight_l='.implode (',', $weights).'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;stacked='.$graph["stacked"].'&amp;pure=1';
+		$data["objdata"]["img"] = 'include/fgraph.php?tipo=combined&amp;id='.implode (',', $modules).'&amp;weight_l='.implode (',', $weights).'&amp;height=230&amp;width=720&amp;period='.$content['period'].'&amp;date='.$datetime.'&amp;stacked='.$graph["stacked"].'&amp;pure=1';
 	break;
 	case 3:
 	case 'SLA':
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index fe80c0a723..9aeea87423 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -77,7 +77,7 @@ foreach ($servers as $server) {
 		$data[2] .= print_help_tip (__("This is a master server"), true);
 
 	// Load
-	$data[3] = print_image ("reporting/fgraph.php?tipo=progress&percent=".$server["load"]."&height=20&width=60", true, array ("title" => $server["lag_txt"]));
+	$data[3] = print_image ("include/fgraph.php?tipo=progress&percent=".$server["load"]."&height=20&width=60", true, array ("title" => $server["lag_txt"]));
 	$data[4] = $server["modules"] . " ".__('of')." ". $server["modules_total"];
 	$data[5] = '<span style="white-space:nowrap;">'.$server["lag_txt"].'</span>';
 	$data[6] = $server['threads'].' : '.$server['queued_modules'];
diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php
index c2bf81c205..46fc9eab42 100644
--- a/pandora_console/operation/servers/view_server_detail.php
+++ b/pandora_console/operation/servers/view_server_detail.php
@@ -126,7 +126,7 @@ foreach ($recon_tasks as $task) {
 	if ($task["status"] <= 0 || $task["status"] > 100) {
 		$data[8] = "-";
 	} else {
-		$data[8] = print_image ("reporting/fgraph.php?tipo=progress&percent=".$task['status']."&height=20&width=100", true, array ("title" => __('Progress').':'.$task["status"].'%'));
+		$data[8] = print_image ("include/fgraph.php?tipo=progress&percent=".$task['status']."&height=20&width=100", true, array ("title" => __('Progress').':'.$task["status"].'%'));
 	}
 	
 	$data[9] = print_timestamp ($task["utimestamp"], true);
diff --git a/pandora_console/operation/users/user_statistics.php b/pandora_console/operation/users/user_statistics.php
index 76a955d2ad..ed53b58b56 100644
--- a/pandora_console/operation/users/user_statistics.php
+++ b/pandora_console/operation/users/user_statistics.php
@@ -18,10 +18,15 @@
 
 // Load global vars
 require_once ("include/config.php");
+require_once ("include/fgraph.php");
 
 check_login ();
 
 echo "<h2>".__('Users defined in Pandora')." &raquo; ".__('User activity statistics')."</h2>";
 
-print_image ("reporting/fgraph.php?tipo=user_activity", false, array ("border" => 0));
+if ($config['flash_charts']) {
+	echo graphic_user_activity ();
+} else {
+	print_image ("include/fgraph.php?tipo=user_activity", false, array ("border" => 0));
+}
 ?>
diff --git a/pandora_console/reporting/FreeSans.ttf b/pandora_console/reporting/FreeSans.ttf
deleted file mode 100644
index 5909637eef..0000000000
Binary files a/pandora_console/reporting/FreeSans.ttf and /dev/null differ