From d18ff8339a431d8d5f3a8b939ead52978fd32113 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Wed, 19 Sep 2012 09:24:29 +0000
Subject: [PATCH] The new 2.0 setup is under way... disabled copy and backup

SVN:trunk[2190]
---
 setup/applicationinstaller.class.inc.php |  3 ++-
 setup/wizardsteps.class.inc.php          | 15 ++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/setup/applicationinstaller.class.inc.php b/setup/applicationinstaller.class.inc.php
index 23cc62e6a..70ed0a128 100644
--- a/setup/applicationinstaller.class.inc.php
+++ b/setup/applicationinstaller.class.inc.php
@@ -126,7 +126,8 @@ class ApplicationInstaller
 				$aPreinstall = $this->oParams->Get('preinstall');
 				$aCopies = $aPreinstall['copies'];
 
-				$sReport = self::DoCopy($aCopies);
+				// disabled - $sReport = self::DoCopy($aCopies);
+				$sReport = "copy disabled...";
 
 				$aResult = array(
 					'status' => self::OK,
diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index 0514a0ebe..c51f9ff8d 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -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').'"/>');