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

Merge branch '2106-intracom-rebranding-3' into 'develop'

Browse Source 
[Rebranding] Remove delete environment vars and fixed pandora_db redefinitions

See merge request artica/pandorafms!1505
This commit is contained in:
vgilc 2018-05-30 11:22:02 +02:00
commit b54907aa2a
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,12 +676,6 @@ sub enterprise_load ($) {
# Ops # Ops
if ($@) { if ($@) {
# Remove the rebranding if open version
if ($^O ne 'MSWin32') {
`unset PANDORA_RB_PRODUCT_NAME`;
`unset PANDORA_RB_COPYRIGHT_NOTICE`;
}
# Enterprise.pm not found. # Enterprise.pm not found.
return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/); return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/);

8
pandora_server/util/pandora_db.pl
View File

@ -553,7 +553,7 @@ sub pandora_compactdb ($$) {
######################################################################## ########################################################################
# Check command line parameters. # Check command line parameters.
######################################################################## ########################################################################
sub pandora_init ($) { sub pandora_init_pdb ($) {
my $conf = shift; my $conf = shift;
log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n"); log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n");
@ -595,7 +595,7 @@ sub pandora_init ($) {
######################################################################## ########################################################################
# Read external configuration file. # Read external configuration file.
######################################################################## ########################################################################
sub pandora_load_config ($) { sub pandora_load_config_pdb ($) {
my $conf = shift; my $conf = shift;
# Read conf file # Read conf file
@ -1025,10 +1025,10 @@ sub pandoradb_main ($$$) {
} }
# Init # Init
pandora_init(\%conf); pandora_init_pdb(\%conf);
# Read config file # Read config file
pandora_load_config (\%conf); pandora_load_config_pdb (\%conf);
# Load enterprise module # Load enterprise module
if (enterprise_load (\%conf) == 0) { if (enterprise_load (\%conf) == 0) {