composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes:

Browse Source 
- properly detect missing dependencies when deploying extensions from the Hub (and not only when deploying a 2nd time an extension, cf bug n°1284).
- setup hangs when upgrading to 2.4.1 with some "old" extensions in the "extensions" folder.

SVN:trunk[5290]
This commit is contained in:
Denis Flaven
2018-01-23 10:37:50 +00:00
parent 93526c8a44
commit 63ba267da0
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,10 +115,21 @@ class iTopExtensionsMap
*/
protected $aExtensions;
public function __construct($sFromEnvironment = 'production', $bNormalizeOldExtensions = true)
/**
* The list of directories browsed using the ReadDir method when building the map
* @var string[]
*/
protected $aScannedDirs;
public function __construct($sFromEnvironment = 'production', $bNormalizeOldExtensions = true, $aExtraDirs = array())
{
$this->aExtensions = array();
$this->aScannedDirs = array();
$this->ScanDisk($sFromEnvironment);
foreach($aExtraDirs as $sDir)
{
$this->ReadDir($sDir, iTopExtension::SOURCE_REMOTE);
}
$this->CheckDependencies($sFromEnvironment);
if ($bNormalizeOldExtensions)
{
@@ -239,12 +250,17 @@ class iTopExtensionsMap
* @param string|null $sParentExtensionId Not null if the directory is under a declared extension
* @return boolean
*/
public function ReadDir($sSearchDir, $sSource, $sParentExtensionId = null)
protected function ReadDir($sSearchDir, $sSource, $sParentExtensionId = null)
{
if (!is_readable($sSearchDir)) return false;
$hDir = opendir($sSearchDir);
if ($hDir !== false)
{
if ($sParentExtensionId == null)
{
// We're not recursing, let's add the directory to the list of scanned dirs
$this->aScannedDirs[] = $sSearchDir;
}
$sExtensionId = null;
$aSubDirectories = array();
@@ -359,14 +375,7 @@ class iTopExtensionsMap
{
$aSearchDirs[] = APPROOT.'/datamodels/1.x';
}
if (is_dir(APPROOT.'/extensions'))
{
$aSearchDirs[] = APPROOT.'/extensions';
}
if (is_dir(APPROOT.'/data/'.$sFromEnvironment.'-modules'))
{
$aSearchDirs[] = APPROOT.'/data/'.$sFromEnvironment.'-modules';
}
$aSearchDirs = array_merge($aSearchDirs, $this->aScannedDirs);
try
{
@@ -1229,7 +1238,7 @@ class iTopExtensionsMap
'combodo-user-actions-configurator' =>
array (
'label' => 'User actions configurator',
'descripion' => 'Configure user actions to simplify and automate processes (e.g. create an incident from a CI).',
'description' => 'Configure user actions to simplify and automate processes (e.g. create an incident from a CI).',
'versions' =>
array (
'1.0.0' =>
@@ -1289,7 +1298,7 @@ class iTopExtensionsMap
'combodo-send-updates-by-email' =>
array (
'label' => 'Send updates by email',
'descripion' => 'Send an email to pre-configured contacts when a ticket log is updated.',
'description' => 'Send an email to pre-configured contacts when a ticket log is updated.',
'versions' =>
array (
'1.0.1' =>