tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '637-moduledata-new-macro-dev' into 'develop' 

changed macro name

See merge request !578
This commit is contained in:
vgilc 2017-06-12 15:46:35 +02:00
parent 9c0efdeeba 722ca036a4
commit ba9da1a14d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1007,6 +1007,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '', _moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
_modulestatus_ => undef, _modulestatus_ => undef,
_moduletags_ => undef, _moduletags_ => undef,
'_moduledata_\S+_' => undef,
_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
_id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '', _id_group_ => (defined ($group)) ? $group->{'id_grupo'} : '',
_id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '', _id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '',
@ -1020,7 +1021,6 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_name_tag_ => undef, _name_tag_ => undef,
_all_address_ => undef, _all_address_ => undef,
'_address_\d+_' => undef, '_address_\d+_' => undef,
'_data_module_\S+_ ' => undef,
); );
if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) { if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) {
@ -3584,7 +3584,7 @@ sub on_demand_macro($$$$$$) {
# Static macro. # Static macro.
return $macros->{$macro} if (defined($macros->{$macro})); return $macros->{$macro} if (defined($macros->{$macro}));
# Load on-demand macros. # Load on-demand macros.
return '' unless defined($pa_config) and defined($dbh); return '' unless defined($pa_config) and defined($dbh);
if ($macro eq '_agentstatus_') { if ($macro eq '_agentstatus_') {
@ -3639,7 +3639,7 @@ sub on_demand_macro($$$$$$) {
} }
return(defined($field_value)) ? $field_value : ''; return(defined($field_value)) ? $field_value : '';
} elsif ($macro =~ /_data_module_(\S+)_/) { } elsif ($macro =~ /_moduledata_(\S+)_/) {
my $field_number = $1; my $field_number = $1;
my $id_mod = get_db_value ($dbh, 'SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ? AND nombre = ?', $module->{'id_agente'}, $field_number); my $id_mod = get_db_value ($dbh, 'SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente = ? AND nombre = ?', $module->{'id_agente'}, $field_number);