composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3468 - Fix extension.xml preventing extensions installation

Browse Source 
(cherry picked from commit 92c8af1b19)
This commit is contained in:
Eric
2021-01-26 16:08:30 +01:00
parent 656fa3208a
commit c8e8778d7b
2 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
setup/extensionsmap.class.inc.php
View File

@@ -61,24 +61,29 @@ class iTopExtension
* @var bool
*/
public $bVisible;
/**
* @var string[]
*/
public $aModules;
/**
* @var string[]
*/
public $aModuleVersion;
/**
* @var string[]
*/
public $aModuleInfo;
/**
* @var string
*/
public $sSourceDir;
/**
*
*
* @var string[]
*/
public $aMissingDependencies;
@@ -96,6 +101,7 @@ class iTopExtension
$this->sInstalledVersion = '';
$this->aModules = array();
$this->aModuleVersion = array();
$this->aModuleInfo = array();
$this->sSourceDir = '';
$this->bVisible = true;
$this->aMissingDependencies = array();
@@ -310,11 +316,11 @@ class iTopExtensionsMap
$sModuleVersion = '0.0.1';
}
if (($sParentExtensionId !== null) && (array_key_exists($sParentExtensionId, $this->aExtensions)) && ($this->aExtensions[$sParentExtensionId] instanceof iTopExtension))
{
if (($sParentExtensionId !== null) && (array_key_exists($sParentExtensionId, $this->aExtensions)) && ($this->aExtensions[$sParentExtensionId] instanceof iTopExtension)) {
// Already inside an extension, let's add this module the list of modules belonging to this extension
$this->aExtensions[$sParentExtensionId]->aModules[] = $sModuleName;
$this->aExtensions[$sParentExtensionId]->aModuleVersion[$sModuleName] = $sModuleVersion;
$this->aExtensions[$sParentExtensionId]->aModuleInfo[$sModuleName] = $aModuleInfo[2];
}
else
{
@@ -329,8 +335,6 @@ class iTopExtensionsMap
}
// Let's create a "fake" extension from this module (containing just this module) for backwards compatibility
$sExtensionId = $sModuleId;
$oExtension = new iTopExtension();
$oExtension->sCode = $sModuleName;
$oExtension->sLabel = $aModuleInfo[2]['label'];
@@ -341,9 +345,10 @@ class iTopExtensionsMap
$oExtension->sMoreInfoUrl = $aModuleInfo[2]['doc.more_information'];
$oExtension->aModules = array($sModuleName);
$oExtension->aModuleVersion[$sModuleName] = $sModuleVersion;
$oExtension->aModuleInfo[$sModuleName] = $aModuleInfo[2];
$oExtension->sSourceDir = $sSearchDir;
$oExtension->bVisible = $bVisible;
$this->AddExtension($oExtension);
$this->AddExtension($oExtension);
}
closedir($hDir);