diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 209fde642e..8835fae988 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-03  Sancho Lerena <slerena@artica.es>
+
+	* reporting/fgraph.php: URL passed should don't get slashes or 
+	don't work, used unsafe_string() to remove it.
+
+	* datos_agente.php: was not showing async string data. Now it
+	uses a regexp to search for string types.
+
+	* logon_ok.php: Was using a wrong variable on message counter.
+
 2008-09-03  Evi Vanoost  <vanooste@rcbi.rochester.edu>
 
 	* reporting/fgraph.php: Fixed bug where a graph wouldn't return
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 8aea67d90b..4e3410d441 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -36,7 +36,7 @@ $resultado = get_db_sql ($sql);
 if ($resultado != 0) {
 	echo "<h2>". __('You have ') . ' 
 	<a href="index.php?sec=messages&sec2=operation/messages/message">'
-	.$row["count"] . ' <img src="images/email.png" border="0">'
+	.$resultado . ' <img src="images/email.png" border="0">'
 	.__(' unread message(s).') . '</a></h2>';
 }
 
diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php
index cdeddbc0d1..391f5f7ba0 100644
--- a/pandora_console/operation/agentes/datos_agente.php
+++ b/pandora_console/operation/agentes/datos_agente.php
@@ -53,9 +53,7 @@ function datos_raw ($id_agente_modulo, $periodo) {
 	$id_group = get_db_value ("id_grupo", "tagente", "id_agente", $id_agent);
 	// Different query for string data type
 	$id_tipo_modulo = dame_id_tipo_modulo_agentemodulo($id_agente_modulo);
-	if ( (dame_nombre_tipo_modulo ($id_tipo_modulo) == "generic_data_string" ) ||
-	     (dame_nombre_tipo_modulo ($id_tipo_modulo) == "remote_tcp_string" ) ||
- 	     (dame_nombre_tipo_modulo ($id_tipo_modulo) == "remote_snmp_string" )) {
+	if (preg_match("/string/", dame_nombre_tipo_modulo ($id_tipo_modulo) )) {
 		$sql1="SELECT * FROM tagente_datos_string WHERE id_agente_modulo = ".
 		$id_agente_modulo." AND id_agente = $id_agent AND utimestamp > '".$periodo."' 
 		ORDER BY timestamp DESC"; 
diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php
index 3b8d3b5caf..c2c48f89f4 100644
--- a/pandora_console/reporting/fgraph.php
+++ b/pandora_console/reporting/fgraph.php
@@ -2058,6 +2058,7 @@ $date = get_parameter ("date");
 $graphic_type = (string) get_parameter ('tipo');
 $mode = get_parameter ("mode", 1);
 $url = get_parameter ('url','');
+$url = unsafe_string ($url);
 
 if ($graphic_type) {
 	switch ($graphic_type) {