tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-05-03 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* operation/agentes/alerts_status.php
	operation/agentes/alerts_status.functions.php: Fixed



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2652 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-05-03 09:02:18 +00:00
parent 0454e4b9e1
commit c61965981f
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-05-03 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/alerts_status.php
operation/agentes/alerts_status.functions.php: Fixed
typo fix for bug: 2989944
2010-05-03 Sergio Martin <sergio.martin@artica.es> 2010-05-03 Sergio Martin <sergio.martin@artica.es>
* operation/events/events.php: Fixed the successfully * operation/events/events.php: Fixed the successfully

2
pandora_console/operation/agentes/alerts_status.functions.php
View File

@ -29,7 +29,7 @@ function validateAlert() {
require_once ("include/functions_alerts.php"); require_once ("include/functions_alerts.php");
$result1 = validate_alert_agent_module ($ids); $result1 = validate_alert_agent_module ($ids);
$result2 = validate_alert_compound ($compound_ids); $result2 = validate_alert_compound ($compound_ids);
$result == $result1 || $result2; $result = $result1 || $result2;
print_result_message ($result, print_result_message ($result,
__('Alert(s) validated'), __('Alert(s) validated'),

7
pandora_console/operation/agentes/alerts_status.php
View File

@ -44,9 +44,6 @@ $url = 'index.php?sec='.$sec.'&sec2='.$sec2.'&refr='.$config["refr"].'&filter='.
if ($flag_alert == 1 && give_acl($config['id_user'], $id_group, "AW")) { if ($flag_alert == 1 && give_acl($config['id_user'], $id_group, "AW")) {
forceExecution($id_group); forceExecution($id_group);
} }
if ($alert_validate) {
validateAlert();
}
$idAgent = get_parameter_get('id_agente', 0); $idAgent = get_parameter_get('id_agente', 0);
@ -84,6 +81,10 @@ else {
print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation"); print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation");
} }
if ($alert_validate) {
validateAlert();
}
if ($free_search != '') { if ($free_search != '') {
$whereAlertSimple = 'AND (' . $whereAlertSimple = 'AND (' .
'id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE "%' . $free_search . '%") OR ' . 'id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE "%' . $free_search . '%") OR ' .