Cp7 m53 ongoing fixes (#6369)

* fix(install): module without cfg throw warnings * chore(base): ignore content of www/img/media folder Resolve CP7M-53
centreon · Jun 14, 2018 · 3768925 · 3768925
1 parent 0e83e3a
commit 3768925
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/src/CentreonLegacy/Core/Module/Information.php b/src/CentreonLegacy/Core/Module/Information.php
@@ -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);