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

N°3012 - Fix blocking MTT/MTP when /extensions

Browse Source
This commit is contained in:
acognet
2020-05-27 10:13:44 +02:00
parent 59af58a173
commit 0e5a501b2a
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
setup/setuputils.class.inc.php
View File

@@ -1606,29 +1606,16 @@ JS
}
$sManualInstallModulesFullPath = APPROOT.$sExtensionsDir.DIRECTORY_SEPARATOR;
$aManualInstallModules = array_filter($aModules,
static function ($v, $k) use ($sManualInstallModulesFullPath) {
if (!isset($v['root_dir'])) // avoid index undefined for the _Root_ entry
{
return false;
}
// calling realpath to avoid problems with dir separator (almost everywhere we are adding '/' instead of DIRECTORY_SEPARATOR)
$return = utils::RealPath($v['root_dir'], $sManualInstallModulesFullPath);
if ($return === false)
{
return false;
}
return true;
},
ARRAY_FILTER_USE_BOTH);
if (empty($aManualInstallModules))
//simple test in order to prevent install iTop pro with module in extension folder
$fileInfo = scandir($sManualInstallModulesFullPath);
foreach ($fileInfo as $folder)
{
return '';
if ($folder != "." && $folder != ".." && is_dir($sManualInstallModulesFullPath.$folder) === true)
{
return "Some modules are present in the '$sExtensionsDir' directory, this is not allowed when using ".ITOP_APPLICATION;
}
}
return "Some modules are present in the '$sExtensionsDir' directory, this is not allowed when using ".ITOP_APPLICATION;
return '';
}
/**