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

2009-12-14 Raul Mateos <raulofpandora@gmail.com> 

* lib/PandoraFMS/Core.pm: Changed spaces for tabs.

	* lib/PandoraFMS/Config.pm: Updated build to last change. Changed spaces for tabs.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2193 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-12-13 23:38:31 +00:00
parent 027449f1bd
commit ebcf02486d
3 changed files with 179 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2009-12-14 Raul Mateos <raulofpandora@gmail.com>
* lib/PandoraFMS/Core.pm: Changed spaces for tabs.
* lib/PandoraFMS/Config.pm: Updated build to last change. Changed spaces
for tabs.
2009-12-07 Raul Mateos <raulofpandora@gmail.com>
* pandora_server_installer: Added variables and used in the code.

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -37,7 +37,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "3.0RC3";
my $pandora_build = "PS091119";
my $pandora_build = "PS091205";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

@ -396,7 +396,8 @@ sub pandora_execute_alert ($$$$$$$) {
AND talert_actions.id_alert_command = talert_commands.id
AND talert_compound_actions.id_alert_compound = ?
AND ((fires_min = 0 AND fires_max = 0)
OR (? >= fires_min AND ? <= fires_max))', $alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'});
OR (? >= fires_min AND ? <= fires_max))',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'});
}
# No actions defined