From 1c27ebd6eb555164dc590d5c3aa43eea212430ac Mon Sep 17 00:00:00 2001 From: ramonn Date: Fri, 8 Jul 2011 08:58:32 +0000 Subject: [PATCH] 2011-07-08 Ramon Novoa * lib/PandoraFMS/Core.pm: Fixed alert-only planned downtimes. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 ++++ pandora_server/lib/PandoraFMS/Core.pm | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index a2e92e149b..b9f1240577 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2011-07-08 Ramon Novoa + + * lib/PandoraFMS/Core.pm: Fixed alert-only planned downtimes. + 2011-07-08 Sergio Martin * util/recon_scripts/snmpdevices.pl: Fiexd bug in recon script diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 48cae902b4..6eb69219dc 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -926,7 +926,7 @@ sub pandora_planned_downtime ($$) { my @downtime_agents = get_db_rows($dbh, 'SELECT * FROM tplanned_downtime_agents WHERE id_downtime = ' . $downtime->{'id'}); foreach my $downtime_agent (@downtime_agents) { - if ($downtime_agent->{'only_alerts'} == 0) { + if ($downtime->{'only_alerts'} == 0) { db_do ($dbh, 'UPDATE tagente SET disabled = 1 WHERE id_agente = ?', $downtime_agent->{'id_agent'}); } else { db_do ($dbh, 'UPDATE talert_template_modules SET disabled = 1 WHERE id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ?)', $downtime_agent->{'id_agent'}); @@ -947,7 +947,7 @@ sub pandora_planned_downtime ($$) { my @downtime_agents = get_db_rows($dbh, 'SELECT * FROM tplanned_downtime_agents WHERE id_downtime = ' . $downtime->{'id'}); foreach my $downtime_agent (@downtime_agents) { - if ($downtime_agent->{'only_alerts'} == 0) { + if ($downtime->{'only_alerts'} == 0) { db_do ($dbh, 'UPDATE tagente SET disabled = 0 WHERE id_agente = ?', $downtime_agent->{'id_agent'}); } else { db_do ($dbh, 'UPDATE talert_template_modules SET disabled = 0 WHERE id_agent_module IN (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ?)', $downtime_agent->{'id_agent'});