From 00e071228ecad5cc7cba01df14f3b32f0290cb5d Mon Sep 17 00:00:00 2001
From: Timothee <timothee.callet@combodo.com>
Date: Thu, 4 Dec 2025 17:09:33 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B08864=20List=20forced=20uninstall?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/wizardsteps.class.inc.php | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index c990a4743..4f7247aaf 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -1400,18 +1400,22 @@ class WizStepModulesChoice extends WizardStep
 
 				$aExtensionsAdded = [];
 				$aExtensionsRemoved = [];
+				$aExtensionsNotUninstallable = [];
 				foreach ($this->oExtensionsMap->GetAllExtensionsWithPreviouslyInstalled() as $oExtension) {
 					/* @var \iTopExtension $oExtension */
 					$bSelected = in_array($oExtension->sCode, $aExtensions);
 					if($oExtension->bInstalled && !$bSelected){
-						$aExtensionsRemoved[] = $oExtension->sLabel;
+						$aExtensionsRemoved[$oExtension->sCode] = $oExtension->sLabel;
 					}
 					else if(!$oExtension->bInstalled && $bSelected) {
-						$aExtensionsAdded[] = $oExtension->sLabel;
+						$aExtensionsAdded[$oExtension->sCode] = $oExtension->sLabel;
+					}
+					if(!$oExtension->CanBeUninstalled()){
+						$aExtensionsNotUninstallable[$oExtension->sCode] = true;
 					}
 				}
 
-				$sExtensionsAdded = 'No extension added.';
+				$sExtensionsAdded = '<ul><li>No extension added.</li></ul>';
 				if (count($aExtensionsAdded) > 0) {
 					$sExtensionsAdded = '<ul>';
 					foreach ($aExtensionsAdded as $sExtensionCode) {
@@ -1420,16 +1424,19 @@ class WizStepModulesChoice extends WizardStep
 					$sExtensionsAdded .= '</ul>';
 				}
 
-				$sExtensionsRemoved = 'No extension removed.';
+				$sExtensionsRemoved = '<ul><li>No extension removed.</li></ul>';
 				if (count($aExtensionsRemoved) > 0) {
 					$sExtensionsRemoved = '<ul>';
-					foreach ($aExtensionsRemoved as $sExtensionCode) {
-						$sExtensionsRemoved .= '<li>'.$sExtensionCode.'</li>';
+					foreach ($aExtensionsRemoved as $sCode => $sExtensionCode) {
+						$sForcedUninstall = '';
+						if (isset($aExtensionsNotUninstallable[$sCode])) {
+							$sForcedUninstall = ' (forced uninstallation)';
+						}
+						$sExtensionsRemoved .= '<li>'.$sExtensionCode.$sForcedUninstall.'</li>';
 					}
 					$sExtensionsRemoved .= '</ul>';
 				}
 
-
 				$this->oWizard->SetParameter('selected_modules', json_encode(array_keys($aModules)));
 				$this->oWizard->SetParameter('selected_extensions', json_encode($aExtensions));
 				$this->oWizard->SetParameter('display_choices', $sDisplayChoices);
@@ -2253,10 +2260,10 @@ class WizStepSummary extends WizardStep
 		$oPage->add('<fieldset id="summary"><legend>Installation Parameters</legend>');
 		$oPage->add('<div id="params_summary">');
 
-		$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions Added</span>');
+		$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be installed</span>');
 		$oPage->add($this->oWizard->GetParameter('extensions_added'));
 		$oPage->add('</div>');
-		$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions Removed</span>');
+		$oPage->add('<div class="closed"><span class="title ibo-setup-summary-title">Extensions to be uninstalled</span>');
 		$oPage->add($this->oWizard->GetParameter('extensions_removed'));
 		$oPage->add('</div>');