From 3a7d93b3b6a642d68744f87e9d58834eb64fba26 Mon Sep 17 00:00:00 2001 From: ramonn Date: Wed, 4 Mar 2009 09:08:10 +0000 Subject: [PATCH] 2009-03-04 Ramon Novoa * lib/PandoraFMS/DB.pm: Fixed alert recovery custom fields. field3_recovery was not being properly set. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/DB.pm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index cf403a36c4..07054d2080 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2009-03-04 Ramon Novoa + + * lib/PandoraFMS/DB.pm: Fixed alert recovery custom fields. + field3_recovery was not being properly set. + 2009-02-20 Evi Vanoost * bin/pandora_snmpconsole: Fixed SNMP console going down while diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm index 62842debd2..86608a6080 100644 --- a/pandora_server/lib/PandoraFMS/DB.pm +++ b/pandora_server/lib/PandoraFMS/DB.pm @@ -594,7 +594,7 @@ sub execute_alert ($$$$$$$$$) { # Recovery fields, thanks to Kato Atsushi if ($alert_mode == 0){ $field2 = $alert->{'field2_recovery'} ne "" ? $alert->{'field2_recovery'} : "[RECOVER]" . $field2; - $field2 = $alert->{'field3_recovery'} ne "" ? $alert->{'field2_recovery'} : "[RECOVER]" . $field3; + $field3 = $alert->{'field3_recovery'} ne "" ? $alert->{'field3_recovery'} : "[RECOVER]" . $field3; } # Alert macros