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

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

* 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 77c33c75a9
commit 6104c80a98
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>
* include/functions_graph.php

8
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) {
$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");
@ -106,7 +107,7 @@ $alerts = false;
if($searchAlerts) {
$agents = array_keys(agents_get_group_agents(array_keys(users_get_groups($config["id_user"], 'AR', false))));
switch ($config["dbtype"]) {
case "mysql":
$whereAlerts = 'AND (
@ -253,7 +254,8 @@ else {
array_push($table->data, array(
$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["template_name"],$actionCell
));