Remove Fast Setup button from "Application Update" screen

Setup fast track (keep current options)
Setup fast track (fix setup token)
2026-06-20 06:46:36 +02:00 · 2026-06-19 13:40:32 +02:00 · 2026-06-19 13:23:42 +02:00 · 2026-06-19 13:23:39 +02:00 · 2026-06-19 13:21:50 +02:00 · 2026-06-19 11:53:02 +02:00
35 changed files with 278 additions and 159 deletions
--- a/core/ormpassword.class.inc.php
+++ b/core/ormpassword.class.inc.php
@@ -52,7 +52,7 @@ class ormPassword
 	public function SetPassword($sClearTextPassword)
 	{
 		$iHashAlgo = MetaModel::GetConfig()->GetPasswordHashAlgo();
-		$this->m_sHashed = password_hash($sClearTextPassword, $iHashAlgo);
+		$this->m_sHashed = password_hash($sClearTextPassword ?? '', $iHashAlgo);
 	}

 	/**
@@ -99,10 +99,10 @@ class ormPassword
 		$aInfo = password_get_info($this->m_sHashed);
 		if (is_null($aInfo["algo"]) || $aInfo["algo"] === 0) {
 			// - Unknown algorithm, assume it's a legacy password
-			$sHashedPwd = $this->ComputeHash($sClearTextPassword);
+			$sHashedPwd = $this->ComputeHash($sClearTextPassword ?? '');
 			$bResult = hash_equals($this->m_sHashed, $sHashedPwd);
 		} else {
-			$bResult = password_verify($sClearTextPassword, $this->m_sHashed);
+			$bResult = password_verify($sClearTextPassword ?? '', $this->m_sHashed);
 		}
 		return $bResult;
 	}
--- a/css/setup.css
+++ b/css/setup.css
--- a/datamodels/2.x/itop-core-update/src/Controller/AjaxController.php
+++ b/datamodels/2.x/itop-core-update/src/Controller/AjaxController.php
@@ -14,13 +14,11 @@ use Combodo\iTop\CoreUpdate\Service\CoreUpdater;
 use Combodo\iTop\DBTools\Service\DBToolsUtils;
 use Combodo\iTop\FilesInformation\Service\FileNotExistException;
 use Combodo\iTop\FilesInformation\Service\FilesInformation;
-use Config;
 use ContextTag;
 use Dict;
 use Exception;
 use IssueLog;
 use MetaModel;
-use RunTimeEnvironment;
 use SecurityException;
 use SetupUtils;
 use utils;
@@ -232,29 +230,6 @@ class AjaxController extends Controller
 		$this->DisplayJSONPage($aParams, $iResponseCode);
 	}

-	public function OperationRebuildToolkitEnvironment()
-	{
-		$sTransactionId = utils::GetNewTransactionId();
-		$aParams = [];
-		$aParams['sTransactionId'] = $sTransactionId;
-		$aParams['bStatus'] = true;
-
-		$iResponseCode = 200;
-		try {
-			$aParams['sAjaxURL'] = utils::GetAbsoluteUrlAppRoot().'/pages/UI.php';
-			$oConfig = new Config(APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE);
-			$oEnvironment = new RunTimeEnvironment(ITOP_DEFAULT_ENV);
-			$oEnvironment->WriteConfigFileSafe($oConfig);
-			$oEnvironment->CompileFrom(ITOP_DEFAULT_ENV);
-		} catch (Exception $e) {
-			IssueLog::Error('RebuildToolkitEnvironment: '.$e->getMessage());
-			$aParams['sError'] = $e->getMessage();
-			$iResponseCode = 500;
-			$aParams['bStatus'] = false;
-		}
-		$this->DisplayJSONPage($aParams, $iResponseCode);
-	}
-
 	/**
 	 * @throws \SecurityException if CSRF token invalid
 	 *
--- a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.html.twig
+++ b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.html.twig
@@ -90,13 +90,6 @@
            {% UIForm Standard {'sId':'launch-setup-form', Action:sLaunchSetupUrl} %}
                {% UIButton ForDestructiveAction {'sLabel':'iTopUpdate:UI:SetupLaunch'|dict_s, 'sName':'launch-setup', 'sValue':'launch-setup', 'bIsSubmit':true, 'sId':'launch-setup'} %}
            {% EndUIForm %}
-            {% UIAlert ForInformation {sId:'fast-setup-alert', AddCSSClass:'ibo-is-hidden'} %}
-                {% UIContentBlock Standard {sId:'fast-setup-content', aContainerClasses:['ibo-fast-setup-content']} %}
-                    {{ 'iTopUpdate:UI:SetupMessage:Compile'|dict_s }}
-                {% EndUIContentBlock %}
-            {% EndUIAlert %}
-            {% UIButton ForDestructiveAction {sLabel:'iTopUpdate:UI:FastSetupLaunch'|dict_s, sName:'launch-fast-setup', sValue:'launch-fast-setup', sId:'launch-fast-setup'} %}
-            {% UISpinner Standard {sId:'fast-setup-wait', IsHidden:true} %}
        {% EndUIFieldSet %}
    {% endif %}

--- a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig
+++ b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig
@@ -116,51 +116,4 @@ $("#launch-setup-form").on("submit", function () {
    return window.confirm("{{ 'iTopUpdate:UI:SetupLaunchConfirm'|dict_s }}");
 });

-$("#launch-fast-setup").on("click", function(e) {
-    var oMessage = $("#fast-setup-alert");
-    var oContent = $("#fast-setup-content");
-    oMessage.removeClass("ibo-is-hidden");
-    oMessage.removeClass("ibo-is-failure");
-    oMessage.removeClass("ibo-is-success");
-    oMessage.addClass("ibo-is-information");
-    oContent.html("{{ 'iTopUpdate:UI:SetupMessage:Compile'|dict_s }}");
-
-    let fast_setup_wait = $("#fast-setup-wait");
-    fast_setup_wait.removeClass("ibo-is-hidden");
-    $(this).prop("disabled", true);
-
-    $.ajax({
-        method: "POST",
-        url: "{{ sAjaxURL|raw }}",
-        data: {
-            route: "core_update_ajax.rebuild_toolkit_environment"
-        },
-        dataType: "json",
-        complete: function(jqXHR, textStatus) {
-            $("#fast-setup-wait").addClass("ibo-is-hidden");
-            $("#launch-fast-setup").prop("disabled", false);
-            fast_setup_wait.addClass("ibo-is-hidden");
-        },
-        success: function (data) {
-            oMessage.removeClass("ibo-is-information");
-
-            if (data.bStatus) {
-                oMessage.removeClass("ibo-is-failure");
-                oMessage.addClass("ibo-is-success");
-                oContent.html("{{ 'iTopUpdate:UI:SetupMessage:UpdateDone'|dict_s }}");
-            } else {
-                oMessage.removeClass("ibo-is-success");
-                oMessage.addClass("ibo-is-failure");
-                oContent.html(data.sError);
-            }
-        },
-        error: function(jqXHR, textStatus, errorThrown) {
-            oMessage.removeClass("ibo-is-information");
-            oMessage.removeClass("ibo-is-success");
-            oMessage.addClass("ibo-is-failure");
-            oContent.html(textStatus + ' ' + errorThrown);
-        }
-    });
-
-});

--- a/dictionaries/ui/layouts/extensions-details/cs.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/cs.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/da.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/da.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/de.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/de.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('DE DE', 'German', 'Deutsch', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/en.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/en.dictionary.itop.extensions-details.php
@@ -10,11 +10,17 @@

 Dict::Add('EN US', 'English', 'English', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall',
--- a/dictionaries/ui/layouts/extensions-details/es_cr.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/es_cr.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/fr.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/fr.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('FR FR', 'French', 'Français', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installé',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'Cette extension fait partie de l\'installation actuelle.',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'va être installé',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'Cette extension sera installée lors de l\'installation.',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'pas installé',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'Cette extension ne fait pas partie de l\'installation actuelle.',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'va être désinstallé',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'Cette extension sera désinstallée lors de l\'installation.',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'non désinstallable',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Une fois cette extension installée, elle ne devrait pas être désinstallée.',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'supprimé du disque',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'Le dossier local de l\'extension a été supprimé du disque. Cela forcera la désinstallation de cette extension.',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'À propos de  %1$s',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'Plus d\'informations',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Forcer la désinstallation',
--- a/dictionaries/ui/layouts/extensions-details/hu.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/hu.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/it.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/it.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/ja.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/ja.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('JA JP', 'Japanese', '日本語', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/nl.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/nl.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/pl.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/pl.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('PL PL', 'Polish', 'Polski', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/pt_br.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/pt_br.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/ru.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/ru.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/sk.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/sk.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/tr.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/tr.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/dictionaries/ui/layouts/extensions-details/zh_cn.dictionary.itop.extensions-details.php
+++ b/dictionaries/ui/layouts/extensions-details/zh_cn.dictionary.itop.extensions-details.php
@@ -12,11 +12,17 @@
 */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Layout:ExtensionsDetails:BadgeInstalled' => 'installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeInstalled+' => 'This extension is part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled' => 'to be installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeInstalled+' => 'This extension will be installed during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotInstalled' => 'not installed~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotInstalled+' => 'This extension is not part of the current installation.~~',
 	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled' => 'to be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+' => 'This extension will be uninstalled during the setup.~~',
 	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable' => 'cannot be uninstalled~~',
+	'UI:Layout:ExtensionsDetails:BadgeNotUninstallable+' => 'Once this extension has been installed, it should not be uninstalled.~~',
 	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk' => 'missing from disk~~',
+	'UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+' => 'The local extension folder has been removed from the disk. This will force the uninstallation of this extension.~~',
 	'UI:Layout:ExtensionsDetails:MenuAboutTitle' => 'About %1$s~~',
 	'UI:Layout:ExtensionsDetails:MenuAbout' => 'More informations~~',
 	'UI:Layout:ExtensionsDetails:MenuForce' => 'Force uninstall~~',
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -124,6 +124,7 @@ require_once('./xmldataloader.class.inc.php');
 // Never cache this page
 header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
 header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+$oCtx = new ContextTag(ContextTag::TAG_SETUP);

 /**
 * Main program
--- a/setup/unattended-install/unattended-install.php
+++ b/setup/unattended-install/unattended-install.php
@@ -3,21 +3,6 @@
 require_once(dirname(__FILE__, 3).'/approot.inc.php');
 require_once(__DIR__.'/InstallationFileService.php');

-function fatalHandler()
-{
-	$error = error_get_last();
-	if ($error) {
-		if ($error['type'] === E_ERROR) {
-			// fatal error has occured
-			echo "PHP Fatal captured: {$error["message"]}";
-			SetupLog::Error("Fatal error during setup", null, $error);
-			exit(-1);
-		}
-	}
-}
-
-register_shutdown_function("fatalHandler");
-
 function PrintUsageAndExit()
 {
 	echo <<<EOF
--- a/setup/wizard.php
+++ b/setup/wizard.php
@@ -61,6 +61,7 @@ if (!function_exists('json_decode')) {
 //N°3671 setup context: force $bForceTrustProxy to be persisted in next calls
 utils::GetAbsoluteUrlAppRoot(true);
 $oWizard = new WizardController('WizStepWelcome');
+$oCtx = new ContextTag(ContextTag::TAG_SETUP);
 //N°3952
 if (SetupUtils::IsSessionSetupTokenValid()) {
 	// Normal operation
--- a/setup/wizardcontroller.class.inc.php
+++ b/setup/wizardcontroller.class.inc.php
@@ -196,6 +196,8 @@ class WizardController
 		SetupLog::Info("=== Setup screen: ".$oStep->GetTitle().' ('.get_class($oStep).')');
 		$oPage = new SetupPage($oStep->GetTitle());
 		$oPage->LinkScriptFromAppRoot('setup/setup.js');
+		$oStep->PreFormDisplay($oPage);
+
 		$oPage->add('<form id="wiz_form" class="ibo-setup--wizard" method="post">');
 		$oPage->add('<div class="ibo-setup--wizard--content">');
 		$oStep->Display($oPage);
@@ -263,8 +265,8 @@ EOF
 		$oPage->output();
 	}
 	/**
-	 * Make the wizard run: Start, Next or Back depending WizardUpdateButtons();
-on the page's parameters
+	 * Make the wizard run: 'Start', 'Next' or 'Back' depending WizardUpdateButtons();
+	 * on the page's parameters
 	 */
 	public function Run()
 	{
--- a/setup/wizardsteps/WizStepLandingBeforeAudit.php
+++ b/setup/wizardsteps/WizStepLandingBeforeAudit.php
@@ -52,6 +52,17 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
 	 */
 	public function UpdateWizardStateAndGetNextStep($bMoveForward = true): WizardState
 	{
+		if ($this->oWizard->GetParameter('skip_wizard', false)) {
+			$oRuntimeEnv = new RunTimeEnvironment();
+			$sBuildConfigFile = APPCONF.$oRuntimeEnv->GetBuildEnv().'/'.ITOP_CONFIG_FILE;
+			$oConfig = new Config($sBuildConfigFile);
+			$oExtensionMap = iTopExtensionsMap::GetExtensionsMap($oRuntimeEnv->GetBuildEnv());
+			$aExtensionsFromDatabase = $oExtensionMap->GetChoicesFromDatabase($oConfig);
+			$this->oWizard->SetParameter('selected_extensions', json_encode($aExtensionsFromDatabase));
+			$adModulesFromDatabase = ModuleInstallationRepository::GetInstance()->ReadComputeInstalledModules($oConfig);
+			$this->oWizard->SetParameter('selected_modules', json_encode(array_keys($adModulesFromDatabase)));
+		}
+
 		$aWizardSteps = $this->GetWizardSteps();
 		$this->oWizard->SetWizardSteps($aWizardSteps);
 		$this->sCurrentState = count($aWizardSteps) - 1;
--- a/setup/wizardsteps/WizStepModulesChoice.php
+++ b/setup/wizardsteps/WizStepModulesChoice.php
@@ -869,18 +869,18 @@ EOF

 		$sTooltip = '';
 		if ($aFlags['missing']) {
-			$sTooltip .= '<div class="ibo-badge ibo-block ibo-is-red" title="The local extension folder has been removed from the disk. This will force the uninstallation of this extension." >source removed</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--missing-from-disk" class="ibo-badge ibo-block ibo-is-red" title="The local extension folder has been removed from the disk. This will force the uninstallation of this extension." >source removed</div>';
 		}
 		if ($aFlags['installed']) {
-			$sTooltip .= '<div class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--installed" class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div>';

-			$sTooltip .= '<div class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--to-be-uninstalled" class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>';
 		} else {
-			$sTooltip .= '<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div>';
-			$sTooltip .= '<div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>';
 		}
 		if (!$aFlags['uninstallable']) {
-			$sTooltip .= '<div class="ibo-badge ibo-block ibo-is-orange" title="Once this extension has been installed, it should not be uninstalled." >cannot be uninstalled</div>';
+			$sTooltip .= '<div id="badge--'.$sId.'--not-uninstallable" class="ibo-badge ibo-block ibo-is-orange" title="Once this extension has been installed, it should not be uninstalled." >cannot be uninstalled</div>';
 		}

 		$sMetadata = '';
--- a/setup/wizardsteps/WizStepWelcome.php
+++ b/setup/wizardsteps/WizStepWelcome.php
@@ -24,6 +24,15 @@
 class WizStepWelcome extends WizardStep
 {
 	protected $bCanMoveForward;
+	private array $aInfo;
+	private array $aWarnings;
+	private array $aErrors;
+
+	public function __construct(WizardController $oWizard, $sCurrentState)
+	{
+		parent::__construct($oWizard, $sCurrentState);
+		$this->CheckInstallation();
+	}

 	public function GetTitle()
 	{
@@ -66,39 +75,14 @@ class WizStepWelcome extends WizardStep
 EOF
 		);
 		$oPage->add('<h1>'.ITOP_APPLICATION.' Installation Wizard</h1>');
-		$aResults = SetupUtils::CheckPhpAndExtensions();
-		$this->bCanMoveForward = true;
-		$aInfo = [];
-		$aWarnings = [];
-		$aErrors = [];
-		foreach ($aResults as $oCheckResult) {
-			switch ($oCheckResult->iSeverity) {
-				case CheckResult::ERROR:
-					$aErrors[] = $oCheckResult->sLabel;
-					$this->bCanMoveForward = false;
-					break;
-
-				case CheckResult::WARNING:
-					$aWarnings[] = $oCheckResult->sLabel;
-					break;
-
-				case CheckResult::INFO:
-					$aInfo[] = $oCheckResult->sLabel;
-					break;
-
-				case CheckResult::TRACE:
-					SetupLog::Ok($oCheckResult->sLabel);
-					break;
-			}
-		}
 		$sStyle = 'style="display:none;overflow:auto;"';
 		$sToggleButtons = '<button type="button" id="show_details" class="ibo-button ibo-is-alternative ibo-is-neutral" onclick="$(\'#details\').toggle(); $(this).toggle(); $(\'#hide_details\').toggle();"><span class="ibo-button--icon fa fa-caret-down"></span><span class="ibo-button--label">Show details</span></button><button type="button" id="hide_details" class="ibo-button ibo-is-alternative ibo-is-neutral" style="display:none;" onclick="$(\'#details\').toggle(); $(this).toggle(); $(\'#show_details\').toggle();"><span class="ibo-button--icon fa fa-caret-up"></span><span class="ibo-button--label">Hide details</span></button>';
-		if (count($aErrors) > 0) {
+		if (count($this->aErrors) > 0) {
 			$sStyle = 'style="overflow:auto;"';
-			$sTitle = count($aErrors).' Error(s), '.count($aWarnings).' Warning(s).';
+			$sTitle = count($this->aErrors).' Error(s), '.count($this->aWarnings).' Warning(s).';
 			$sH2Class = 'text-error';
-		} elseif (count($aWarnings) > 0) {
-			$sTitle = count($aWarnings).' Warning(s) '.$sToggleButtons;
+		} elseif (count($this->aWarnings) > 0) {
+			$sTitle = count($this->aWarnings).' Warning(s) '.$sToggleButtons;
 			$sH2Class = 'text-warning';
 		} else {
 			$sTitle = 'Ok. '.$sToggleButtons;
@@ -110,13 +94,13 @@ EOF
 		<div id="details" $sStyle>
 HTML
 		);
-		foreach ($aErrors as $sText) {
+		foreach ($this->aErrors as $sText) {
 			$oPage->error($sText);
 		}
-		foreach ($aWarnings as $sText) {
+		foreach ($this->aWarnings as $sText) {
 			$oPage->warning($sText);
 		}
-		foreach ($aInfo as $sText) {
+		foreach ($this->aInfo as $sText) {
 			$oPage->ok($sText);
 		}
 		$oPage->add('</div>');
@@ -127,8 +111,68 @@ HTML
 		$oPage->add_ready_script('CheckDirectoryConfFilesPermissions("'.utils::GetItopVersionWikiSyntax().'")');
 	}

+	/**
+	 * Add post display stuff to the setup screen
+	 * @param \SetupPage $oPage
+	 *
+	 * @return void
+	 */
+	public function PostFormDisplay(SetupPage $oPage)
+	{
+		if ($this->bCanMoveForward) {
+			$sBuildConfigFile = APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE;
+			if (file_exists($sBuildConfigFile)) {
+				$oPage->add(
+					<<<HTML
+					<form method="post">
+						<input type="hidden" name="_class" value="WizStepLandingBeforeAudit"/>
+						<input type="hidden" name="operation" value="next"/>
+						<input type="hidden" name="_params[skip_wizard]" value="1"/>
+						<table style="width:100%;" class="ibo-setup--wizard--buttons-container">
+						<tr>
+							<td style="text-align: right"><button type="submit" class="ibo-button ibo-is-regular ibo-is-secondary">Keep current choices</button></td>
+						</tr>
+						</table>
+					</form>
+HTML
+				);
+			}
+		}
+	}
+
 	public function CanMoveForward()
 	{
 		return $this->bCanMoveForward;
 	}
+
+	/**
+	 */
+	public function CheckInstallation(): void
+	{
+		$aResults = SetupUtils::CheckPhpAndExtensions();
+		$this->bCanMoveForward = true;
+		$this->aInfo = [];
+		$this->aWarnings = [];
+		$this->aErrors = [];
+		foreach ($aResults as $oCheckResult) {
+			switch ($oCheckResult->iSeverity) {
+				case CheckResult::ERROR:
+					$this->aErrors[] = $oCheckResult->sLabel;
+					$this->bCanMoveForward = false;
+					break;
+
+				case CheckResult::WARNING:
+					$this->aWarnings[] = $oCheckResult->sLabel;
+					break;
+
+				case CheckResult::INFO:
+					$this->aInfo[] = $oCheckResult->sLabel;
+					break;
+
+				case CheckResult::TRACE:
+					SetupLog::Ok($oCheckResult->sLabel);
+					break;
+			}
+		}
+	}
 }
--- a/setup/wizardsteps/WizardStep.php
+++ b/setup/wizardsteps/WizardStep.php
@@ -76,6 +76,10 @@ abstract class WizardStep
 	{
 	}

+	public function PreFormDisplay(SetupPage $oPage)
+	{
+	}
+
 	protected function CheckDependencies()
 	{
 		if (is_null($this->bDependencyCheck)) {
--- a/sources/Application/TwigBase/Controller/Controller.php
+++ b/sources/Application/TwigBase/Controller/Controller.php
@@ -20,6 +20,8 @@

 namespace Combodo\iTop\Application\TwigBase\Controller;

+require_once APPROOT.'setup/setuppage.class.inc.php';
+
 use ApplicationMenu;
 use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
 use Combodo\iTop\Application\WebPage\AjaxPage;
--- a/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php
+++ b/sources/Application/UI/Base/Layout/Extension/ExtensionDetailsUIBlockFactory.php
@@ -13,6 +13,13 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
 	/** @inheritDoc */
 	public const UI_BLOCK_CLASS_NAME = ExtensionDetails::class;

+	private const BADGE_ID_INSTALLED = 'installed';
+	private const BADGE_ID_NOT_INSTALLED = 'not-installed';
+	private const BADGE_ID_TO_BE_INSTALLED = 'to-be-installed';
+	private const BADGE_ID_TO_BE_UNINSTALLED = 'to-be-uninstalled';
+	private const BADGE_ID_NOT_UNINSTALLABLE = 'not-uninstallable';
+	private const BADGE_ID_MISSING_FROM_DISK = 'missing-from-disk';
+
 	public static function MakeInstalled(string $sCode, string $sLabel, string $sDescription = '', array $aMetaData = [], array $aExtraFlags = [], string $sAbout = '')
 	{
 		$aBadges = [];
@@ -21,11 +28,19 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
 		$bSelected = $aExtraFlags['selected'] ?? true;
 		$bDisabled = $aExtraFlags['disabled'] ?? false;
 		$bRemote = $aExtraFlags['remote'] ?? false;
-		self::AddExtraBadges($aBadges, $bUninstallable, $bMissingFromDisk);
-		$oBadgeInstalled = BadgeUIBlockFactory::MakeGreen(Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled'));
+		self::AddExtraBadges($aBadges, $bUninstallable, $bMissingFromDisk, $sCode);
+		$oBadgeInstalled = BadgeUIBlockFactory::MakeGreen(
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled'),
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeInstalled+'),
+			self::GetBadgeId($sCode, self::BADGE_ID_INSTALLED)
+		);
 		$oBadgeInstalled->AddCSSClass('checked');
 		$aBadges[] = $oBadgeInstalled;
-		$oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeRed(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeUninstalled'));
+		$oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeRed(
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeUninstalled'),
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeUninstalled+'),
+			self::GetBadgeId($sCode, self::BADGE_ID_TO_BE_UNINSTALLED)
+		);
 		$oBadgeToBeUninstalled->AddCSSClass('unchecked');
 		$aBadges[] = $oBadgeToBeUninstalled;

@@ -56,11 +71,19 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
 		$bUninstallable = $aExtraFlags['uninstallable'] ?? true;
 		$bSelected = $aExtraFlags['selected'] ?? false;
 		$bDisabled = $aExtraFlags['disabled'] ?? false;
-		self::AddExtraBadges($aBadges, $bUninstallable, false);
-		$oBadgeInstalled = BadgeUIBlockFactory::MakeGrey(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled'));
+		self::AddExtraBadges($aBadges, $bUninstallable, false, $sCode);
+		$oBadgeInstalled = BadgeUIBlockFactory::MakeGrey(
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled'),
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeNotInstalled+'),
+			self::GetBadgeId($sCode, self::BADGE_ID_NOT_INSTALLED)
+		);
 		$oBadgeInstalled->AddCSSClass('unchecked');
 		$aBadges[] = $oBadgeInstalled;
-		$oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan(Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled'));
+		$oBadgeToBeUninstalled = BadgeUIBlockFactory::MakeCyan(
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled'),
+			Dict::S('UI:Layout:ExtensionsDetails:BadgeToBeInstalled+'),
+			self::GetBadgeId($sCode, self::BADGE_ID_TO_BE_INSTALLED)
+		);
 		$oBadgeToBeUninstalled->AddCSSClass('checked');
 		$aBadges[] = $oBadgeToBeUninstalled;
 		$oExtensionDetails = new ExtensionDetails($sCode, $sLabel, $sDescription, $aMetaData, $aBadges, $sAbout);
@@ -76,13 +99,35 @@ class ExtensionDetailsUIBlockFactory extends AbstractUIBlockFactory
 		return $oExtensionDetails;
 	}

-	private static function AddExtraBadges(array &$aBadges, bool $bUninstallable, bool $bMissingFromDisk)
+	private static function AddExtraBadges(array &$aBadges, bool $bUninstallable, bool $bMissingFromDisk, string $sCode)
 	{
 		if (!$bUninstallable) {
-			$aBadges[] = BadgeUIBlockFactory::MakeOrange(Dict::S('UI:Layout:ExtensionsDetails:BadgeNotUninstallable'));
+			$aBadges[] = BadgeUIBlockFactory::MakeOrange(
+				Dict::S('UI:Layout:ExtensionsDetails:BadgeNotUninstallable'),
+				Dict::S('UI:Layout:ExtensionsDetails:BadgeNotUninstallable+'),
+				self::GetBadgeId($sCode, self::BADGE_ID_NOT_UNINSTALLABLE)
+			);
 		}
 		if ($bMissingFromDisk) {
-			$aBadges[] = BadgeUIBlockFactory::MakeRed(Dict::S('UI:Layout:ExtensionsDetails:BadgeMissingFromDisk'));
+			$aBadges[] = BadgeUIBlockFactory::MakeRed(
+				Dict::S('UI:Layout:ExtensionsDetails:BadgeMissingFromDisk'),
+				Dict::S('UI:Layout:ExtensionsDetails:BadgeMissingFromDisk+'),
+				self::GetBadgeId($sCode, self::BADGE_ID_MISSING_FROM_DISK)
+			);
 		}
 	}
+
+	/**
+	 * Generate a badge ID for an extension
+	 *
+	 * @param string $sExtensionCode The extension code
+	 * @param string $sBadgeType The badge type (one of the BADGE_ID_* constants)
+	 *
+	 * @return string The badge ID in the format: badge--{extensionCode}--{badgeType}
+	 */
+	public static function GetBadgeId(string $sExtensionCode, string $sBadgeType): string
+	{
+		return 'badge--'.$sExtensionCode.'--'.$sBadgeType;
+	}
+
 }
--- a/sources/Core/AttributeDefinition/AttributeOneWayPassword.php
+++ b/sources/Core/AttributeDefinition/AttributeOneWayPassword.php
@@ -81,7 +81,7 @@ class AttributeOneWayPassword extends AttributeDefinition implements iAttributeN
 		if (is_object($oPassword)) {
 			$oPassword = clone $proposedValue;
 		} else {
-			$oPassword = new ormPassword('', '');
+			$oPassword = new ormPassword();
 			$oPassword->SetPassword($proposedValue);
 		}

--- a/tests/php-unit-tests/unitary-tests/core/ormPasswordTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/ormPasswordTest.php
@@ -52,4 +52,11 @@ class ormPasswordTest extends ItopDataTestCase
 			],
 		];
 	}
+
+	public function testSetPasswordNullShouldNotCrash()
+	{
+		$oPassword = new ormPassword();
+		$oPassword->SetPassword(null);
+		static::assertTrue($oPassword->CheckPassword(null));
+	}
 }
--- a/tests/php-unit-tests/unitary-tests/datamodels/2.x/combodo-data-feature-removal/simulate-audit-from-setup.php
+++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/combodo-data-feature-removal/simulate-audit-from-setup.php
@@ -44,7 +44,7 @@ $aAddedExtensions = [];
 if (mb_strlen($sAddedExtensions) > 0) {
 	$aAddedExtensions = explode(',', $sAddedExtensions);
 }
-$oExtensionMap = new iTopExtensionsMap();
+$oExtensionMap = iTopExtensionsMap::GetExtensionsMap();
 foreach ($aAddedExtensions as $iIndex => $sExtensionCode) {
 	if (mb_strlen($sExtensionCode) <= 0) {
 		unset($aAddedExtensions[$iIndex]);
--- a/tests/php-unit-tests/unitary-tests/setup/WizStepModulesChoiceTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/WizStepModulesChoiceTest.php
@@ -1004,7 +1004,7 @@ class WizStepModulesChoiceTest extends ItopTestCase
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-ext-not-installed"><b>My extension</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-ext-not-installed--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-ext-not-installed--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						<span>v1.2.3</span><span>Local extensions folder</span>
@@ -1048,7 +1048,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-ext-installed"><b>My extension</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
+						<div id="badge--itop-ext-installed--installed" class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div id="badge--itop-ext-installed--to-be-uninstalled" class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						<span>v1.2.3</span><span>Local extensions folder</span>
@@ -1093,7 +1093,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-ext-installed"><b>My extension</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div><div class="ibo-badge ibo-block ibo-is-orange" title="Once this extension has been installed, it should not be uninstalled." >cannot be uninstalled</div>
+						<div id="badge--itop-ext-installed--installed" class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div id="badge--itop-ext-installed--to-be-uninstalled" class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div><div id="badge--itop-ext-installed--not-uninstallable" class="ibo-badge ibo-block ibo-is-orange" title="Once this extension has been installed, it should not be uninstalled." >cannot be uninstalled</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						<span>v1.2.3</span><span>Local extensions folder</span>
@@ -1137,7 +1137,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-ext-not-installed"><b>My extension</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-ext-not-installed--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-ext-not-installed--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						<span>v1.2.3</span><span>Local extensions folder</span>
@@ -1175,7 +1175,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-alt-nothing"><b>No Change</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-alt-nothing--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-alt-nothing--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						
@@ -1221,7 +1221,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-alt-something"><b>Change</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
+						<div id="badge--itop-alt-something--installed" class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div id="badge--itop-alt-something--to-be-uninstalled" class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						
@@ -1242,7 +1242,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-alt-nothing"><b>No Change</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-alt-nothing--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-alt-nothing--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						
@@ -1302,7 +1302,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-alt-something"><b>Change</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
+						<div id="badge--itop-alt-something--installed" class="ibo-badge ibo-block checked ibo-is-green" title="This extension is part of the current installation." >installed</div><div id="badge--itop-alt-something--to-be-uninstalled" class="ibo-badge ibo-block unchecked ibo-is-red" title="This extension will be uninstalled during the setup." >to be uninstalled</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						
@@ -1319,7 +1319,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-ext-not-installed"><b>My extension</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-ext-not-installed--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-ext-not-installed--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
 						
@@ -1344,7 +1344,7 @@ HTML,
 					<div class="ibo-extension-details--information--label">
 						<label for="itop-alt-nothing"><b>No Change</b></label>
 						
-						<div class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
+						<div id="badge--itop-alt-nothing--to-be-installed" class="ibo-badge ibo-block checked ibo-is-cyan" title="This extension will be installed during the setup." >to be installed</div><div id="badge--itop-alt-nothing--not-installed" class="ibo-badge ibo-block unchecked ibo-is-blue-grey" title="This extension is not part of the current installation." >not installed</div>
 					</div>
 					<div class="ibo-extension-details--information--metadata">
Author	SHA1	Message	Date
Eric Espie	94e4425106	Remove Fast Setup button from "Application Update" screen	2026-06-19 13:40:32 +02:00
Eric Espie	81386abe5a	Setup fast track (keep current options)	2026-06-19 13:23:42 +02:00
Eric Espie	6e918ce12c	Setup fast track (fix setup token)	2026-06-19 13:23:39 +02:00
Eric Espie	1479b4d5ff	Setup fast track # Conflicts: # setup/wizardsteps/WizStepLandingBeforeAudit.php # setup/wizardsteps/WizStepWelcome.php	2026-06-19 13:21:50 +02:00
Eric Espie	a23b9aa596	N°9709 - XML load failing on empty one way password	2026-06-19 11:53:02 +02:00
Anne-Cath	017481af21	ci: fix setup css	2026-06-18 17:48:42 +02:00
Eric Espie	4f70441618	N°9678 - Fix extension map initialization	2026-06-18 17:31:13 +02:00
Eric Espie	fb6a332bd0	N°9684 - Add setup page class inclusion in Controller.php	2026-06-18 17:22:05 +02:00
Timmy38	a9af4fc060	N°9701 Add id to badges	2026-06-18 11:05:09 +02:00
odain	6a8dc159c1	revert `75433d3390`: Enhance unattended CLI to log fatal error	2026-06-17 15:38:22 +02:00