From 4846af1049ff1395800642e852ac7005d10d43e4 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 19 Sep 2016 12:00:13 +0200
Subject: [PATCH] fixed minor errors query view agents

(cherry picked from commit 89e31494799ef6e2a98d4dc033df6a3438060702)
---
 .../godmode/agentes/modificar_agente.php            | 13 +++++++++++--
 pandora_console/include/graphs/flot/pandora.flot.js |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index f56bc2faf7..3d86d83c9c 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -338,19 +338,28 @@ else {
 		$total_agents = db_get_sql ($sql);
 		switch ($config["dbtype"]) {
 			case "mysql":
+				$order['field2'] = "";
+				/*
 				$sql = sprintf ('SELECT *
 					FROM tagente
 					WHERE 1=1
 						%s
 					ORDER BY %s %s, %s %s LIMIT %d, %d', $search_sql, $order['field'],$order['order'], $order['field2'],
 					$order['order'], $offset, $config["block_size"]);
+				*/
+				$sql = sprintf ('SELECT *
+					FROM tagente
+					WHERE 1=1
+						%s
+					ORDER BY %s %s %s LIMIT %d, %d', $search_sql, $order['field'], $order['field2'],
+					$order['order'], $offset, $config["block_size"]);
 				break;
 			case "postgresql":
 				$sql = sprintf ('SELECT *
 					FROM tagente
 					WHERE 1=1
 						%s
-					ORDER BY %s %s, %s %s LIMIT %d OFFSET %d', $search_sql, $order['field'],$order['order'], $order['field2'],
+					ORDER BY %s %s %s LIMIT %d OFFSET %d', $search_sql, $order['field'], $order['field2'],
 					$order['order'], $config["block_size"], $offset);
 				break;
 			case "oracle":
@@ -361,7 +370,7 @@ else {
 					FROM tagente
 					WHERE 1=1
 						%s
-					ORDER BY %s %s, %s %s', $search_sql, $order['field'],$order['order'], $order['field2'], $order['order']);
+					ORDER BY %s %s %s', $search_sql, $order['field'], $order['field2'], $order['order']);
 				$sql = oracle_recode_query ($sql, $set);
 				break;
 		}
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 0f6ee15339..7f73456536 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -819,7 +819,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
 				newdate = year + "/" + month + "/" + day;
 
 			if(!to){
-				to= '12:00';
+				to= '23:59';
 			}
 			window.location='index.php?sec=eventos&sec2=operation/events/events&id_agent='+id_agent+'&date_from='+newdate+'&time_from='+from+'&date_to='+newdate+'&time_to='+to+'&status=-1';
 		}