composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Add check to prevent setup crash when creating config

Browse Source 
In a4782942 a !empty() test was added but this was useless
The problem that was causing the issue was an undefined index when doing $aAvailableModules[$sModuleId]
This commit is contained in:
Pierre Goiffon
2021-05-03 16:56:33 +02:00
parent 3a06f2eaa9
commit 09b12bd06e
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
setup/runtimeenv.class.inc.php
View File

@@ -735,48 +735,49 @@ class RunTimeEnvironment
$oInstallRec->Set('parent_id', 0); // root module
$oInstallRec->Set('installed', $iInstallationTime);
$iMainItopRecord = $oInstallRec->DBInsertNoReload();
// Record installed modules and extensions
//
$aAvailableExtensions = array();
$aAvailableModules = $this->AnalyzeInstallation($oConfig, $this->GetBuildDir());
if (!empty($aSelectedModuleCodes)) {
foreach ($aSelectedModuleCodes as $sModuleId) {
$aModuleData = $aAvailableModules[$sModuleId];
$sName = $sModuleId;
$sVersion = $aModuleData['version_code'];
$aComments = array();
$aComments[] = $sShortComment;
if ($aModuleData['mandatory']) {
$aComments[] = 'Mandatory';
} else {
$aComments[] = 'Optional';
}
if ($aModuleData['visible']) {
$aComments[] = 'Visible (during the setup)';
} else {
$aComments[] = 'Hidden (selected automatically)';
}
$aDependencies = $aModuleData['dependencies'];
if (!empty($aDependencies)) {
foreach ($aDependencies as $sDependOn) {
$aComments[] = "Depends on module: $sDependOn";
}
}
$sComment = implode("\n", $aComments);
$oInstallRec = new ModuleInstallation();
$oInstallRec->Set('name', $sName);
$oInstallRec->Set('version', $sVersion);
$oInstallRec->Set('comment', $sComment);
$oInstallRec->Set('parent_id', $iMainItopRecord);
$oInstallRec->Set('installed', $iInstallationTime);
$oInstallRec->DBInsertNoReload();
foreach ($aSelectedModuleCodes as $sModuleId) {
if (!array_key_exists($sModuleId, $aAvailableModules)) {
continue;
}
$aModuleData = $aAvailableModules[$sModuleId];
$sName = $sModuleId;
$sVersion = $aModuleData['version_code'];
$aComments = array();
$aComments[] = $sShortComment;
if ($aModuleData['mandatory']) {
$aComments[] = 'Mandatory';
} else {
$aComments[] = 'Optional';
}
if ($aModuleData['visible']) {
$aComments[] = 'Visible (during the setup)';
} else {
$aComments[] = 'Hidden (selected automatically)';
}
$aDependencies = $aModuleData['dependencies'];
if (!empty($aDependencies)) {
foreach ($aDependencies as $sDependOn) {
$aComments[] = "Depends on module: $sDependOn";
}
}
$sComment = implode("\n", $aComments);
$oInstallRec = new ModuleInstallation();
$oInstallRec->Set('name', $sName);
$oInstallRec->Set('version', $sVersion);
$oInstallRec->Set('comment', $sComment);
$oInstallRec->Set('parent_id', $iMainItopRecord);
$oInstallRec->Set('installed', $iInstallationTime);
$oInstallRec->DBInsertNoReload();
}
if ($this->oExtensionsMap)
{
// Mark as chosen the selected extensions code passed to us