tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-03-05 Vanessa Gil <vanessa.gil@artica.es>

Browse Source 
* operation/search_alerts.php: Fixed sql error.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5692 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-03-05 12:10:02 +00:00
parent 4f99067b37
commit 2d505719a4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-05 Vanessa Gil <vanessa.gil@artica.es>
* operation/search_alerts.php: Fixed sql error.
2012-03-05 Sergio Martin <sergio.martin@artica.es> 2012-03-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php * include/functions_graph.php

6
pandora_console/operation/search_alerts.php
View File

@ -25,7 +25,8 @@ $extra_sql = enterprise_hook('policies_get_agents_sql_condition');
if ($extra_sql === ENTERPRISE_NOT_HOOK) { if ($extra_sql === ENTERPRISE_NOT_HOOK) {
$extra_sql = ''; $extra_sql = '';
}else if ($extra_sql != '') { }else if ($extra_sql != '') {
$extra_sql .= ' OR '; //$extra_sql .= ' OR ';
$extra_sql = ' OR '.$extra_sql;
} }
$searchAlerts = check_acl($config['id_user'], 0, "AR"); $searchAlerts = check_acl($config['id_user'], 0, "AR");
@ -253,7 +254,8 @@ else {
array_push($table->data, array( array_push($table->data, array(
$disabledCell, $disabledCell,
print_agent_name ($alert["id_agente"], true, "upper"), //print_agent_name ($alert["id_agente"], true, "upper"),
agents_get_name($alert["id_agente"]),
$alert["module_name"], $alert["module_name"],
$alert["template_name"],$actionCell $alert["template_name"],$actionCell
)); ));