tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'missing-id-module-macro' into 'develop'

Browse Source 
Recovered a reverted change

See merge request artica/pandorafms!1088
This commit is contained in:
vgilc 2017-12-21 10:39:02 +01:00
commit ea1ae1fa6b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1022,7 +1022,8 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_modulestatus_ => undef, _modulestatus_ => undef,
_moduletags_ => undef, _moduletags_ => undef,
'_moduledata_\S+_' => undef, '_moduledata_\S+_' => undef,
_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
_id_module_ => (defined ($module)) ? $module->{'id_agente_modulo'} : '',
_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'} : '',
_interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '', _interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '',