From 3cc1f815ff808f6fbe80a8e5da7df05c18850f71 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 18 Jul 2018 17:56:35 +0200 Subject: [PATCH] Added extra compat. to print_module (plugintools) --- pandora_server/lib/PandoraFMS/PluginTools.pm | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index a68d86466d..d714e4dd9f 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -461,9 +461,7 @@ sub print_agent { # print_module ################################################################################ sub print_module { - my $conf = shift; - my $data = shift; - my $not_print_flag = shift; + my ($conf, $data, $not_print_flag) = @_; if ((ref($data) ne "HASH") || (!defined $data->{name})) { return undef; @@ -476,9 +474,21 @@ sub print_module { } $data->{value} = '' if empty($data->{value}); - $data->{tags} = $data->{tags}?$data->{tags}:($conf->{MODULE_TAG_LIST}?$conf->{MODULE_TAG_LIST}:undef); - $data->{interval} = $data->{interval}?$data->{interval}:($conf->{MODULE_INTERVAL}?$conf->{MODULE_INTERVAL}:undef); - $data->{module_group} = $data->{module_group}?$data->{module_group}:($conf->{MODULE_GROUP}?$conf->{MODULE_GROUP}:undef); + + $data->{tags} = ($data->{tags} ? + $data->{tags} : ($conf->{MODULE_TAG_LIST} ? + $conf->{MODULE_TAG_LIST} : ($conf->{module_tag_list} ? + $conf->{module_tag_list} : undef))); + + $data->{interval} = ($data->{interval} ? + $data->{interval} : ($conf->{MODULE_INTERVAL} ? + $conf->{MODULE_INTERVAL} : ($conf->{module_interval} ? + $conf->{module_interval} : undef))); + + $data->{module_group} = ($data->{module_group} ? + $data->{module_group} : ($conf->{MODULE_GROUP} ? + $conf->{MODULE_GROUP} : ( $conf->{module_group} ? + $conf->{module_group} : undef))); # Global instructions (if defined)