From 2fc77b91f24fa17d548b3633aede879a16a560cf Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 2 Feb 2012 13:52:06 +0000
Subject: [PATCH] // Add PS_CONFIGURATION_AGREMENT to store if user is agree to
 send us some informations about its server stats

---
 install-dev/controllers/http/process.php | 29 ++++++++++++------------
 install-dev/models/install.php           | 19 ++++++++--------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index ee2752cf9..9e4050aab 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -145,20 +145,21 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		$this->initializeContext();
 
 		$success = $this->model_install->configureShop(array(
-			'shop_name' =>		$this->session->shop_name,
-			'shop_activity' =>	$this->session->shop_activity,
-			'shop_country' =>	$this->session->shop_country,
-			'shop_timezone' =>	$this->session->shop_timezone,
-			'use_smtp' =>		$this->session->use_smtp,
-			'smtp_server' =>	$this->session->smtp_server,
-			'smtp_login' =>		$this->session->smtp_login,
-			'smtp_password' =>	$this->session->smtp_password,
-			'smtp_encryption' =>$this->session->smtp_encryption,
-			'smtp_port' =>		$this->session->smtp_port,
-			'admin_firstname' =>$this->session->admin_firstname,
-			'admin_lastname' =>	$this->session->admin_lastname,
-			'admin_password' =>	$this->session->admin_password,
-			'admin_email' =>	$this->session->admin_email,
+			'shop_name' =>				$this->session->shop_name,
+			'shop_activity' =>			$this->session->shop_activity,
+			'shop_country' =>			$this->session->shop_country,
+			'shop_timezone' =>			$this->session->shop_timezone,
+			'use_smtp' =>				$this->session->use_smtp,
+			'smtp_server' =>			$this->session->smtp_server,
+			'smtp_login' =>				$this->session->smtp_login,
+			'smtp_password' =>			$this->session->smtp_password,
+			'smtp_encryption' =>		$this->session->smtp_encryption,
+			'smtp_port' =>				$this->session->smtp_port,
+			'admin_firstname' =>		$this->session->admin_firstname,
+			'admin_lastname' =>			$this->session->admin_lastname,
+			'admin_password' =>			$this->session->admin_password,
+			'admin_email' =>			$this->session->admin_email,
+			'configuration_agrement' =>	$this->session->configuration_agrement,
 		));
 
 		if (!$success || $this->model_install->getErrors())
diff --git a/install-dev/models/install.php b/install-dev/models/install.php
index 354166f29..ce3c21000 100644
--- a/install-dev/models/install.php
+++ b/install-dev/models/install.php
@@ -348,15 +348,16 @@ class InstallModelInstall extends InstallAbstractModel
 		Configuration::loadConfiguration();
 
 		// Set default configuration
-		Configuration::updateGlobalValue('PS_SHOP_DOMAIN', 			Tools::getHttpHost());
-		Configuration::updateGlobalValue('PS_SHOP_DOMAIN_SSL', 		Tools::getHttpHost());
-		Configuration::updateGlobalValue('PS_INSTALL_VERSION', 		_PS_INSTALL_VERSION_);
-		Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', 		$this->language->getLanguageIso());
-		Configuration::updateGlobalValue('PS_SHOP_NAME', 			$data['shop_name']);
-		Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', 		$data['shop_activity']);
-		Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT',		Country::getByIso($data['shop_country']));
-		Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', 		$data['shop_country']);
-		Configuration::updateGlobalValue('PS_TIMEZONE', 			$data['shop_timezone']);
+		Configuration::updateGlobalValue('PS_SHOP_DOMAIN', 				Tools::getHttpHost());
+		Configuration::updateGlobalValue('PS_SHOP_DOMAIN_SSL', 			Tools::getHttpHost());
+		Configuration::updateGlobalValue('PS_INSTALL_VERSION', 			_PS_INSTALL_VERSION_);
+		Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', 			$this->language->getLanguageIso());
+		Configuration::updateGlobalValue('PS_SHOP_NAME', 				$data['shop_name']);
+		Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', 			$data['shop_activity']);
+		Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT',			Country::getByIso($data['shop_country']));
+		Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', 			$data['shop_country']);
+		Configuration::updateGlobalValue('PS_TIMEZONE', 				$data['shop_timezone']);
+		Configuration::updateGlobalValue('PS_CONFIGURATION_AGREMENT',	(int)$data['configuration_agrement']);
 
 		// Set mails configuration
 		Configuration::updateGlobalValue('PS_MAIL_METHOD', 			($data['use_smtp']) ? 2 : 1);