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

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

* 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 979aa8b2a8
commit 2634e18efb
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>
* operation/events/events.php: Fixed the successfully

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

@ -29,7 +29,7 @@ function validateAlert() {
require_once ("include/functions_alerts.php");
$result1 = validate_alert_agent_module ($ids);
$result2 = validate_alert_compound ($compound_ids);
$result == $result1 || $result2;
$result = $result1 || $result2;
print_result_message ($result,
__('Alert(s) validated'),
@ -65,4 +65,4 @@ function printFormFilterAlert($id_group, $filter, $free_search, $url) {
print_table ($table);
echo '</form>';
}
?>
?>

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")) {
forceExecution($id_group);
}
if ($alert_validate) {
validateAlert();
}
$idAgent = get_parameter_get('id_agente', 0);
@ -84,6 +81,10 @@ else {
print_page_header (__('Alert detail'), "images/bricks.png", false, "alert_validation");
}
if ($alert_validate) {
validateAlert();
}
if ($free_search != '') {
$whereAlertSimple = 'AND (' .
'id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE "%' . $free_search . '%") OR ' .