From c2050ebe53de8dc688e138a56adddee02866de5f Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 18 Feb 2013 11:44:10 +0000 Subject: [PATCH] 2013-02-18 Sergio Martin * lib/PandoraFMS/Core.pm lib/PandoraFMS/DataServer.pm: Fixed the exception of "status" field of the XML deleted from the supported tags in a previous fix for bug 3604850 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7669 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 +++++++ pandora_server/lib/PandoraFMS/Core.pm | 1 + pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index fa1fd13211..2f53097602 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2013-02-18 Sergio Martin + + * lib/PandoraFMS/Core.pm + lib/PandoraFMS/DataServer.pm: Fixed the exception of "status" + field of the XML deleted from the supported tags in a previous + fix for bug 3604850 + 2013-02-18 Sergio Martin * lib/PandoraFMS/PluginServer.pm: Clean the blank spaces diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 616bbdac6f..1595f93c9a 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -2268,6 +2268,7 @@ sub pandora_create_module_from_hash ($$$) { delete $parameters->{'data'}; delete $parameters->{'type'}; delete $parameters->{'datalist'}; + delete $parameters->{'status'}; my $module_id = db_process_insert($dbh, 'id_agente_modulo', 'tagente_modulo', $parameters); diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index ca444999ea..5965f91047 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -530,7 +530,7 @@ sub process_module_data ($$$$$$$$$) { my $tags = {'name' => 0, 'data' => 0, 'type' => 0, 'description' => 0, 'max' => 0, 'min' => 0, 'descripcion' => 0, 'post_process' => 0, 'module_interval' => 0, 'min_critical' => 0, 'max_critical' => 0, 'min_warning' => 0, 'max_warning' => 0, 'disabled' => 0, 'min_ff_event' => 0, - 'datalist' => 0, 'unit' => 0, 'timestamp' => 0, 'module_group' => 0, 'custom_id' => '', + 'datalist' => 0, 'status' => 0, 'unit' => 0, 'timestamp' => 0, 'module_group' => 0, 'custom_id' => '', 'str_warning' => '', 'str_critical' => '', 'critical_instructions' => '', 'warning_instructions' => '', 'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0, 'module_ff_interval' => 0};