From d2238434f06fc8cbff3035a3fab80f688612c5a5 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Wed, 28 Jan 2015 11:29:05 +0100
Subject: [PATCH] Fixed problem in tree view to metaconsola, not open popup

(cherry picked from commit 33bf0a4e7b455367155905d3e3033990a12c9269)
---
 pandora_console/include/functions_modules.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 5c757042f1..1f772319e0 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1547,7 +1547,7 @@ function modules_get_next_data ($id_agent_module, $utimestamp = 0, $string = 0)
  *
  * @return array The module value and the timestamp
  */
-function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0) {
+function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0, $trash, $conexion = false, $order = 'ASC') {
 	$module = db_get_row('tagente_modulo', 'id_agente_modulo',
 		$id_agent_module);
 	
@@ -1571,8 +1571,8 @@ function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0) {
 				FROM tagente_datos_string
 				WHERE id_agente_modulo = %d
 					AND utimestamp > %d AND utimestamp <= %d
-				ORDER BY utimestamp ASC",
-			$id_agent_module, $datelimit, $date);
+				ORDER BY utimestamp %s",
+			$id_agent_module, $datelimit, $date, $order);
 			break;
 		//log4x
 		case 24:
@@ -1580,20 +1580,20 @@ function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0) {
 				FROM tagente_datos_log4x
 				WHERE id_agente_modulo = %d
 					AND utimestamp > %d AND utimestamp <= %d
-				ORDER BY utimestamp ASC",
-			$id_agent_module, $datelimit, $date);
+				ORDER BY utimestamp %s",
+			$id_agent_module, $datelimit, $date, $order);
 			break;
 		default:
 			$sql = sprintf ("SELECT datos AS data, utimestamp
 				FROM tagente_datos
 				WHERE id_agente_modulo = %d
 					AND utimestamp > %d AND utimestamp <= %d
-				ORDER BY utimestamp ASC",
-			$id_agent_module, $datelimit, $date);
+				ORDER BY utimestamp %s",
+			$id_agent_module, $datelimit, $date, $order);
 			break;
 	}
 	
-	$values = db_get_all_rows_sql ($sql, $search_in_history_db, false);
+	$values = db_get_all_rows_sql ($sql, $search_in_history_db, false, $conexion);
 	
 	if ($values === false) {
 		return array ();
@@ -2038,4 +2038,4 @@ function modules_change_relation_lock ($id_relation) {
 	return ($result !== false ? $new_value : $old_value);
 }
 
-?>
\ No newline at end of file
+?>