tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problem in tree view to metaconsola, not open popup 

(cherry picked from commit 33bf0a4e7b)
This commit is contained in:
m-lopez-f 2015-01-28 11:29:05 +01:00
parent f38f5f052d
commit d2238434f0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_modules.php
View File

@ -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);
}
?>
?>