composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-03 11:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9998 fix remote uninstallable flag

Browse Source
This commit is contained in:
Timmy38
2026-08-31 14:40:36 +02:00
committed by GitHub
parent f3bad3538c
commit cfb04561ec
6 changed files with 196 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,18 +208,15 @@ class iTopExtensionsMap
*/
protected function AddExtension(iTopExtension $oNewExtension)
{
foreach ($this->aExtensions as $key => $oExtension) {
if ($oExtension->sCode == $oNewExtension->sCode) {
if (version_compare($oNewExtension->sVersion, $oExtension->sVersion, '>')) {
// This "new" extension is "newer" than the previous one, let's replace the previous one
unset($this->aExtensions[$key]);
$this->aExtensions[$oNewExtension->sCode.'/'.$oNewExtension->sVersion] = $oNewExtension;
$this->aExtensionsByCode[$oNewExtension->sCode] = $oNewExtension;
return;
} else {
// This "new" extension is not "newer" than the previous one, let's ignore it
return;
}
$oExtension = $this->GetFromExtensionCode($oNewExtension->sCode);
if (!is_null($oExtension)) {
if (version_compare($oNewExtension->sVersion, $oExtension->sVersion, '>') || $oExtension->bRemovedFromDisk) {
// This "new" extension is "newer" than the previous one, let's replace the previous one
// We should also replace the previous extension if it has been removed from disk
unset($this->aExtensions[$oExtension->sCode.'/'.$oExtension->sVersion]);
} else {
// This "new" extension is not "newer" than the previous one, let's ignore it
return;
}
}
// Finally it's not a duplicate, let's add it to the list
@@ -696,8 +693,10 @@ class iTopExtensionsMap
$oChoice = $this->GetFromExtensionCode($oExtension->sCode);
if ($oChoice) {
$oChoice->bInstalled = true;
$oExtension->bRemovedFromDisk = $oChoice->bRemovedFromDisk;
} else {
$oExtension->bRemovedFromDisk = true;
$this->aExtensionsByCode[$oExtension->sCode] = $oExtension;
}
$this->aInstalledExtensions[$oExtension->sCode.'/'.$oExtension->sVersion] = $oExtension;