tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-23 22:05:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-12-13 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  pandora_server.spec,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm: Updated version strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5252 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-12-13 14:13:29 +00:00
parent 9aaf58de26
commit b58d8925ea
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2011-12-13 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/control,
DEBIAN/make_deb_package.sh,
pandora_server.spec,
lib/PandoraFMS/Config.pm,
lib/PandoraFMS/Core.pm: Updated version strings.
2011-12-12 Sergio Martin <sergio.martin@artica.es> 2011-12-12 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Tools.pm * lib/PandoraFMS/Tools.pm

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 4.0 Version: final
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="4.0" pandora_version="final"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

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

@ -41,8 +41,8 @@ our @EXPORT = qw(
); );
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "4.0"; my $pandora_version = "final";
my $pandora_build = "110923"; my $pandora_build = "111213";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

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

@ -661,6 +661,7 @@ sub pandora_execute_alert ($$$$$$$$;$) {
# Check the action threshold (template_action_threshold takes precedence over action_threshold) # Check the action threshold (template_action_threshold takes precedence over action_threshold)
my $threshold = 0; my $threshold = 0;
$action->{'last_execution'} = 0 unless defined ($action->{'last_execution'});
$threshold = $action->{'action_threshold'} if (defined ($action->{'action_threshold'}) && $action->{'action_threshold'} > 0); $threshold = $action->{'action_threshold'} if (defined ($action->{'action_threshold'}) && $action->{'action_threshold'} > 0);
$threshold = $action->{'module_action_threshold'} if (defined ($action->{'module_action_threshold'}) && $action->{'module_action_threshold'} > 0); $threshold = $action->{'module_action_threshold'} if (defined ($action->{'module_action_threshold'}) && $action->{'module_action_threshold'} > 0);
if (time () >= ($action->{'last_execution'} + $threshold)) { if (time () >= ($action->{'last_execution'} + $threshold)) {
@ -1774,7 +1775,10 @@ sub subst_alert_macros ($$) {
my $macro_regexp = join('|', grep { defined $macros->{$_} } keys %{$macros}); my $macro_regexp = join('|', grep { defined $macros->{$_} } keys %{$macros});
# Macro data may contain HTML entities # Macro data may contain HTML entities
$string =~ s/($macro_regexp)/decode_entities($macros->{$1})/ige; {
no warnings;
$string =~ s/($macro_regexp)/decode_entities($macros->{$1})/ige;
}
return $string; return $string;
} }

2
pandora_server/pandora_server.spec
View File

@ -2,7 +2,7 @@
# Pandora FMS Server # Pandora FMS Server
# #
%define name pandorafms_server %define name pandorafms_server
%define version 4.0 %define version final
%define release 1 %define release 1
Summary: Pandora FMS Server Summary: Pandora FMS Server