Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Cp7 m53 ongoing fixes #6369

Merged
merged 2 commits into from
Jun 14, 2018
Merged

Cp7 m53 ongoing fixes #6369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b80ac0
fix(install): module without cfg throw warnings
vhr Jun 14, 2018
c07b3fe
chore(base): ignore content of www/img/media folder
vhr Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ nbproject/
composer.lock
GPL_LIB/SmartyCache/*
www/install/tmp/*
!www/img/media/.keep
www/img/media/*
!www/install/tmp/.gitkeep
www/install/install.conf.php
4 changes: 4 additions & 0 deletions src/CentreonLegacy/Core/Module/Information.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ private function getAvailableList()

$configuration = $this->utils->requireConfiguration($modulePath . '/conf.php');

if (!isset($configuration[$moduleName])) {
continue;
}

$licenseFile = $modulePath . '/license/merethis_lic.zl';
$list[$moduleName] = $configuration[$moduleName];
$list[$moduleName]['license_expiration'] = $this->licenseObj->getLicenseExpiration($licenseFile);
Expand Down