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

2012-07-27 KIKUCHI Koichiro <koichiro@rworks.jp> 

* lib/PandoraFMS/Core.pm: fixed bug: added missing decode_entities for
	 SNMP alert evaluation. Also cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6818 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2012-07-27 03:10:13 +00:00
parent 99f4ca991d
commit d56491c1de
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2012-07-27 KIKUCHI Koichiro <koichiro@rworks.jp>
* lib/PandoraFMS/Core.pm: fixed bug: added missing decode_entities for
SNMP alert evaluation. Also cleaned source code style.
2012-07-25 Miguel de Dios <miguel.dedios@artica.es> 2012-07-25 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/DB.pm: cleaned source code style. * lib/PandoraFMS/DB.pm: cleaned source code style.

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

@ -1736,14 +1736,14 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
} }
# Trap value # Trap value
my $single_value = $alert->{'single_value'}; my $single_value = decode_entities($alert->{'single_value'});
if ($single_value ne '') { if ($single_value ne '') {
next if ($trap_value !~ m/^$single_value$/i); next if ($trap_value !~ m/^$single_value$/i);
$alert_data .= "Value: $trap_value "; $alert_data .= "Value: $trap_value ";
} }
# Agent IP # Agent IP
my $agent = $alert->{'agent'}; my $agent = decode_entities($alert->{'agent'});
if ($agent ne '') { if ($agent ne '') {
next if ($trap_agent !~ m/^$agent$/i ); next if ($trap_agent !~ m/^$agent$/i );
$alert_data .= "Agent: $agent"; $alert_data .= "Agent: $agent";