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

2011-04-20 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/Core.pm: Added _policy_ macro to alerts (Enterprise).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4269 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-04-20 14:57:49 +00:00
parent 02b4d22ad9
commit 833ef3149a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added _policy_ macro to alerts (Enterprise).
2011-04-19 Ramon Novoa <rnovoa@artica.es> 2011-04-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm, * lib/PandoraFMS/DB.pm,

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

@ -639,7 +639,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
_module_ => (defined ($module)) ? $module->{'nombre'} : '', _module_ => (defined ($module)) ? $module->{'nombre'} : '',
_moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '', _moduledescription_ => (defined ($module)) ? $module->{'descripcion'} : '',
_id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '',
_id_alert_ => $alert->{'id'} _policy_ => (defined ($module)) ? enterprise_hook('get_policy_name', [$dbh, $module->{'id_policy_module'}]) : '',
); );
if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) { if ((defined ($extra_macros)) && (ref($extra_macros) eq "HASH")) {
@ -1495,8 +1495,13 @@ sub subst_alert_macros ($$) {
my ($string, $macros) = @_; my ($string, $macros) = @_;
while ((my $macro, my $value) = each (%{$macros})) { while ((my $macro, my $value) = each (%{$macros})) {
# Undefined macro value
next unless defined ($value);
# Macro data may contain HTML entities # Macro data may contain HTML entities
my $decoded_value = decode_entities ($value); my $decoded_value = decode_entities ($value);
$string =~ s/($macro)/$decoded_value/ig; $string =~ s/($macro)/$decoded_value/ig;
} }