diff --git a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php index 5e0dccd80a..1fb6aa5b19 100644 --- a/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php +++ b/datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php @@ -132,34 +132,15 @@ class DataFeatureRemovalController extends Controller $aParams['aExtensions'] = $this->GetExtensionsTableDiff($aAddedExtensions, $aRemovedExtensions); new ContextTag(ContextTag::TAG_SETUP); - $aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot(). 'setup/wizard.php'; - $aParams['aSetupParams']= [ - 'choice[_0]' => "_0", - 'choice[_1]' => "_1", - "_class" => "WizStepModulesChoice", - "_state" => "4", + $aParams['sLaunchSetupUrl'] = utils::GetAbsoluteUrlAppRoot().'setup/wizard.php'; + $aParams['aSetupParams'] = [ + "_class" => "WizStepLandingBeforeAudit", "_params[authent]" => SetupUtils::CreateSetupToken(), - "_params[graphviz_path]" => "/usr/bin/dot", - "_params[previous_version_dir]" => "/var/www/html/iTopLegacy/", - "_params[db_server]" => "localhost", - "_params[db_user]" => "iTop", - "_params[db_pwd]" => "blob99", - "_params[db_name]" => "gabuzomeuuninstall", - "_params[db_prefix]" => "", - "_params[db_tls_enabled]" => "", - "_params[db_tls_ca]" => "", + '_params[previous_version_dir]' => APPROOT, "_params[install_mode]" => "upgrade", - "_params[display_license]" => "", - "_params[mode]" => "upgrade", - "_params[upgrade_type]" => "use-compatible", - "_params[source_dir]" => "/var/www/html/iTopLegacy/datamodels/2.x/", - "_params[datamodel_version]" => "3.3.0", - "_params[application_url]" => "https://odain.itop-saas.dev/iTopLegacy/", - "_params[use_symbolic_links]" => "", - "_params[force-uninstall]" => "", - "_params[additional_extensions_modules]" => "[]", - "_params[selected_components]" => '[{"_0":"_0","_1":"_1","_2":"_2","_3":"_3","_4":"_4"},{"_0":"_0"},{"_0":"_0","_0_0":"_0_0"},{"_0":"_0"},{"_0":"_0","_1":"_1"}]', - "_steps" => '[{"class":"WizStepWelcome","state":""},{"class":"WizStepInstallOrUpgrade","state":""},{"class":"WizStepDetectedInfo","state":""},{"class":"WizStepUpgradeMiscParams","state":""},{"class":"WizStepModulesChoice","state":"start_upgrade"},{"class":"WizStepModulesChoice","state":"1"},{"class":"WizStepModulesChoice","state":"2"},{"class":"WizStepModulesChoice","state":"3"}]', + '_params[source_dir]' => APPROOT.'datamodels/2.x/', + "_params[selected_components]" => '[{"_0":"_0","_1":"_1","_2":"_2","_3":"_3","_4":"_4"},{"_0":"_0"},{"_0":"_0","_0_0":"_0_0"},{"_0":"_0"},{"_0":"_0","_1":"_1"},{"_0":"_0","_1":"_1"}]', + '_steps' => '[{"class":"WizStepWelcome","state":""},{"class":"WizStepInstallOrUpgrade","state":""},{"class":"WizStepDetectedInfo","state":""},{"class":"WizStepUpgradeMiscParams","state":""},{"class":"WizStepModulesChoice","state":"start_upgrade"},{"class":"WizStepModulesChoice","state":"1"},{"class":"WizStepModulesChoice","state":"2"},{"class":"WizStepModulesChoice","state":"3"}]', "operation" => "next", ]; diff --git a/setup/wizardsteps/WizStepLandingBeforeAudit.php b/setup/wizardsteps/WizStepLandingBeforeAudit.php new file mode 100644 index 0000000000..fda42a2080 --- /dev/null +++ b/setup/wizardsteps/WizStepLandingBeforeAudit.php @@ -0,0 +1,47 @@ +