From d3bad3b4db2051e78f104986a4262b88b1e792a4 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 26 Nov 2009 09:49:30 +0000 Subject: [PATCH] 2009-11-26 Miguel de Dios * include/functions_alerts.php: add more values into function "get_alert_template_threshold_values", values as 1 week, 2 weeks, 1 month and 6 months. * godmode/alerts/configure_alert_template.php: change the default value to 1 day. Fixes: 2902458 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ .../godmode/alerts/configure_alert_template.php | 2 +- pandora_console/include/functions_alerts.php | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a43f1eaf49..273c56ce77 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2009-11-26 Miguel de Dios + + * include/functions_alerts.php: add more values into function + "get_alert_template_threshold_values", values as 1 week, 2 weeks, 1 month + and 6 months. + * godmode/alerts/configure_alert_template.php: change the default value + to 1 day. + Fixes: 2902458 + 2009-11-25 Miguel de Dios * include/functions_ui.php: fix the bug in the pagination that write wrong diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 446f7cc15e..fa8e11814e 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -217,7 +217,7 @@ $field3 = ''; $priority = 1; $min_alerts = 0; $max_alerts = 1; -$threshold = 300; +$threshold = 86400; $recovery_notify = false; $field2_recovery = ''; $field3_recovery = ''; diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index c62997eea6..9eae49e4be 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -350,6 +350,9 @@ function get_alert_template_threshold_values () { $times['43200'] = '12 '.__('hours'); $times['86400'] = '1 '.__('day'); $times['604800'] = '1 '.__('week'); + $times['1209600'] = '2 '.__('weeks'); + $times['18144000'] = '1 '.__('month'); + $times['108864000'] = '6 '.__('months'); $times['-1'] = __('Other value'); return $times;