mirror of
https://github.com/Combodo/iTop.git
synced 2026-08-13 09:18:19 +02:00
N°9454 - Make MTT compatible with the dry run (#931)
* N°9454 - Make MTT compatible with the dry run * N°9454 - Make MTT compatible with the dry run * N°9454 - Cleaning up configuration handling * N°9454 - Cleanup code * N°9454 - Remove writable directories * Update setup/wizardsteps/WizStepLandingBeforeAudit.php Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * Update setup/runtimeenv.class.inc.php Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> * N°9454 - Secure target environment wizard step done form submission --------- Co-authored-by: Eric Espie <eric.espie@combodo.com> Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
This commit is contained in:
@@ -56,7 +56,7 @@ class InstallationFileService
|
||||
public function GetProductionEnv(): RunTimeEnvironment
|
||||
{
|
||||
if (is_null($this->oProductionEnv)) {
|
||||
$this->oProductionEnv = new RunTimeEnvironment();
|
||||
$this->oProductionEnv = new RunTimeEnvironment($this->sTargetEnvironment);
|
||||
}
|
||||
return $this->oProductionEnv;
|
||||
}
|
||||
@@ -258,8 +258,9 @@ class InstallationFileService
|
||||
public function ProcessDefaultModules(): void
|
||||
{
|
||||
$sProductionModuleDir = APPROOT.'data/'.$this->sTargetEnvironment.'-modules/';
|
||||
$oConfig = new Config(APPCONF.$this->sTargetEnvironment.'/'.ITOP_CONFIG_FILE);
|
||||
|
||||
$aAvailableModules = $this->GetProductionEnv()->AnalyzeInstallation(MetaModel::GetConfig(), $this->GetExtraDirs());
|
||||
$aAvailableModules = $this->GetProductionEnv()->AnalyzeInstallation($oConfig, $this->GetExtraDirs());
|
||||
|
||||
$this->aAutoSelectModules = [];
|
||||
foreach ($aAvailableModules as $sModuleId => $aModule) {
|
||||
|
||||
Reference in New Issue
Block a user