composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

The new 2.0 setup is under way... disabled copy and backup

Browse Source 
SVN:trunk[2190]
This commit is contained in:
Romain Quetiez
2012-09-19 09:24:29 +00:00
parent e463bd8b48
commit d18ff8339a
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
setup/wizardsteps.class.inc.php
View File

@@ -1131,7 +1131,6 @@ EOF
$sMode = $this->oWizard->GetParameter('mode', 'install');
$sBackupDestination = '';
$sConfigurationFile = '';
$sSourceEnvironment = 'production';
$sDBName = $this->oWizard->GetParameter('db_name');
if ($sMode == 'upgrade')
{
@@ -1144,7 +1143,6 @@ EOF
if ($aPreviousInstance['found'])
{
$sConfigurationFile = $aPreviousInstance['configuration_file'];
$sSourceEnvironment = $aPreviousInstance['source_environment'];
}
}
}
@@ -1168,13 +1166,8 @@ EOF
// 'destination' => '',
// ),
),
'backup' => array (
'destination' => $sBackupDestination,
'configuration_file' => $sConfigurationFile,
),
),
'source_dir' => 'datamodel',
'source_env' => $sSourceEnvironment,
'target_env' => 'production',
'workspace_dir' => '',
'database' => array (
@@ -1195,6 +1188,14 @@ EOF
'sample_data' => ($this->oWizard->GetParameter('sample_data', '') == 'yes') ? true : false ,
'options' => json_decode($this->oWizard->GetParameter('misc_options')),
);
if ($sBackupDestination != '')
{
$aInstallParams['backup'] = array (
'destination' => $sBackupDestination,
'configuration_file' => $sConfigurationFile,
);
}
$sJSONData = json_encode($aInstallParams);
$oPage->add('<input type="hidden" id="installer_parameters" value="'.htmlentities($sJSONData, ENT_QUOTES, 'UTF-8').'"/>');