From 8001df3522700a25728cef2f5b3e76fa2dc1e309 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 5 Jan 2012 16:11:43 +0000
Subject: [PATCH] // Move log classes and add logger in new installer

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12205 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/{ => log}/AbstractLogger.php          |  0
 classes/{ => log}/FileLogger.php              |  0
 install-new/classes/model.php                 | 11 +++++++++++
 install-new/models/install.php                | 17 ++++-------------
 override/classes/{ => log}/AbstractLogger.php |  0
 override/classes/{ => log}/FileLogger.php     |  0
 6 files changed, 15 insertions(+), 13 deletions(-)
 rename classes/{ => log}/AbstractLogger.php (100%)
 rename classes/{ => log}/FileLogger.php (100%)
 rename override/classes/{ => log}/AbstractLogger.php (100%)
 rename override/classes/{ => log}/FileLogger.php (100%)

diff --git a/classes/AbstractLogger.php b/classes/log/AbstractLogger.php
similarity index 100%
rename from classes/AbstractLogger.php
rename to classes/log/AbstractLogger.php
diff --git a/classes/FileLogger.php b/classes/log/FileLogger.php
similarity index 100%
rename from classes/FileLogger.php
rename to classes/log/FileLogger.php
diff --git a/install-new/classes/model.php b/install-new/classes/model.php
index 24789d079..54aec03e4 100644
--- a/install-new/classes/model.php
+++ b/install-new/classes/model.php
@@ -32,6 +32,11 @@ abstract class InstallAbstractModel
 	 */
 	public $language;
 
+	/**
+	 * @var FileLogger
+	 */
+	public $logger;
+
 	/**
 	 * @var array List of errors
 	 */
@@ -40,6 +45,9 @@ abstract class InstallAbstractModel
 	public function __construct()
 	{
 		$this->language = InstallLanguages::getInstance();
+
+		$this->logger = new FileLogger();
+		$this->logger->setFilename(_PS_ROOT_DIR_.'/log/'.@date('Ymd').'_installation.log');
 	}
 
 	public function setError($errors)
@@ -48,7 +56,10 @@ abstract class InstallAbstractModel
 			$errors = array($errors);
 
 		foreach ($errors as $error)
+		{
 			$this->errors[] = $error;
+			$this->logger->logError($error);
+		}
 	}
 
 	public function getErrors()
diff --git a/install-new/models/install.php b/install-new/models/install.php
index 8dc7a0da0..214e4a153 100644
--- a/install-new/models/install.php
+++ b/install-new/models/install.php
@@ -377,21 +377,12 @@ class InstallModelInstall extends InstallAbstractModel
 		}
 
 		// Set localization configuration
-        $version = str_replace('.', '', _PS_VERSION_);
-        $version = substr($version, 0, 2);
-
-        $localization_file_content = @Tools::file_get_contents('http://api.prestashop.com/download/localization/'.$version.'/'.$data['shop_country'].'.xml');
-        if (!$localization_file_content)
-        {
-            $localization_file = _PS_ROOT_DIR_.'/localization/default.xml';
-            if (file_exists(_PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml'))
-                $localization_file = _PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml';
-
-            $localization_file_content = file_get_contents($localization_file);
-        }
+		$localization_file = _PS_ROOT_DIR_.'/localization/default.xml';
+		if (file_exists(_PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml'))
+			$localization_file = _PS_ROOT_DIR_.'/localization/'.$data['shop_country'].'.xml';
 
 		$locale = new LocalizationPackCore();
-		$locale->loadLocalisationPack($localization_file_content, '', true);
+		$locale->loadLocalisationPack(file_get_contents($localization_file), '', true);
 
 		// Create default employee
 		if (isset($data['admin_firstname']) && isset($data['admin_lastname']) && isset($data['admin_password']) && isset($data['admin_email']))
diff --git a/override/classes/AbstractLogger.php b/override/classes/log/AbstractLogger.php
similarity index 100%
rename from override/classes/AbstractLogger.php
rename to override/classes/log/AbstractLogger.php
diff --git a/override/classes/FileLogger.php b/override/classes/log/FileLogger.php
similarity index 100%
rename from override/classes/FileLogger.php
rename to override/classes/log/FileLogger.php