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