tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

PluginTools: Forwarded pfile to parse_configuration custom evals

Browse Source
This commit is contained in:
fbsanchez 2018-03-02 09:09:54 +01:00
parent 34ad5acffa
commit b9bd02c7d5
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -997,6 +997,7 @@ sub parse_arguments {
# $config : The configuration read to the point the regex matches # $config : The configuration read to the point the regex matches
# $exp : The matching regex which fires this action # $exp : The matching regex which fires this action
# $line : The complete line readed from the file # $line : The complete line readed from the file
# $file_pointer : A pointer to the file which is being parsed.
# $current_entity : The current_entity (optional) when regex matches # $current_entity : The current_entity (optional) when regex matches
# #
################################################################################ ################################################################################
@ -1033,17 +1034,12 @@ sub parse_configuration {
} }
my ($key,$value) = split /$separator/, $line, 2; my ($key,$value) = split /$separator/, $line, 2;
if (empty($value) && ($line =~ /^(\w+?)\r*\n*$/) && is_enabled($detect_entities)) { # Clear entity detection is only compatible with specific entities declaration
if (empty($value) && ($line =~ /^(\w+?)\r*\n*$/)
&& is_enabled($detect_entities)
&& in_array($entities_list, trim($key))) {
# possible Entity detected - compatibility vmware-plugin # possible Entity detected - compatibility vmware-plugin
$new_entity = $key;
if (!empty($entities_list)) {
if (in_array($entities_list, trim($key))) {
$new_entity = $key;
}
}
else {
$new_entity = $key;
}
} }
if (($line =~ /\[(.*?)\]\r*\n*$/) && is_enabled($detect_entities)) { if (($line =~ /\[(.*?)\]\r*\n*$/) && is_enabled($detect_entities)) {
# Entity detected # Entity detected
@ -1079,7 +1075,7 @@ sub parse_configuration {
$f = 1; $f = 1;
my $aux; my $aux;
eval { eval {
$aux = $item->{'target'}->($_config, $item->{'exp'}, $line, $current_entity); $aux = $item->{'target'}->($_config, $item->{'exp'}, $line, $_CFILE, $current_entity);
}; };
if (empty($_config)) { if (empty($_config)) {