tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed minor errors query view agents

Browse Source 
(cherry picked from commit 89e31494799ef6e2a98d4dc033df6a3438060702)
This commit is contained in:
daniel 2016-09-19 12:00:13 +02:00
parent 8a1deb4b87
commit 4846af1049
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -338,19 +338,28 @@ else {
$total_agents = db_get_sql ($sql); $total_agents = db_get_sql ($sql);
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
$order['field2'] = "";
/*
$sql = sprintf ('SELECT * $sql = sprintf ('SELECT *
FROM tagente FROM tagente
WHERE 1=1 WHERE 1=1
%s %s
ORDER BY %s %s, %s %s LIMIT %d, %d', $search_sql, $order['field'],$order['order'], $order['field2'], ORDER BY %s %s, %s %s LIMIT %d, %d', $search_sql, $order['field'],$order['order'], $order['field2'],
$order['order'], $offset, $config["block_size"]); $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; break;
case "postgresql": case "postgresql":
$sql = sprintf ('SELECT * $sql = sprintf ('SELECT *
FROM tagente FROM tagente
WHERE 1=1 WHERE 1=1
%s %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); $order['order'], $config["block_size"], $offset);
break; break;
case "oracle": case "oracle":
@ -361,7 +370,7 @@ else {
FROM tagente FROM tagente
WHERE 1=1 WHERE 1=1
%s %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); $sql = oracle_recode_query ($sql, $set);
break; break;
} }

2
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -819,7 +819,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
newdate = year + "/" + month + "/" + day; newdate = year + "/" + month + "/" + day;
if(!to){ 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'; 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';
} }