From c75cda2429fd91a60576172733ed043a773bc835 Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Thu, 3 Oct 2013 17:35:20 +0200
Subject: [PATCH] [*] BO : AdminImport, retrieve separators and lang selected

---
 .../controllers/import/helpers/form/form.tpl  |  8 ++---
 controllers/admin/AdminImportController.php   | 29 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index 8f43ea1d8..09a50329f 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -59,7 +59,7 @@
 				{if count($files_to_import)}
 					<select name="csv">
 						{foreach $files_to_import AS $filename}
-							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename}</option>
+							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{/if}
@@ -119,12 +119,12 @@
 			</div>
 			<label class="clear">{l s='Field separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value=";" name="separator"/>
+				<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
 				{l s='e.g. '}"1<span class="bold" style="color: red">;</span>Ipod<span class="bold" style="color: red">;</span>129.90<span class="bold" style="color: red">;</span>5"
 			</div>
 			<label class="clear">{l s='Multiple value separator'} </label>
 			<div class="margin-form">
-				<input type="text" size="2" value="," name="multiple_value_separator"/>
+				<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
 				{l s='e.g. '}"Ipod;red.jpg<span class="bold" style="color: red">,</span>blue.jpg<span class="bold" style="color: red">,</span>green.jpg;129.90"
 			</div>
 			<label for="truncate" class="clear">{l s='Delete all'} <span id="entitie">{l s='categories'}</span> {l s='before import?'} </label>
@@ -216,7 +216,7 @@
 			else
 			{
 				$(".import_supply_orders_details").hide();
-				$('input[name=multiple_value_separator]').val(',');
+				$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
 			}
 			if ($("#entity > option:selected").val() == 1)
 				$("label[for=match_ref], #match_ref, label[for=regenerate], #regenerate").show();
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 03e0bb0de..0c1dce392 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -426,7 +426,7 @@ class AdminImportControllerCore extends AdminController
 					
 			}
 
-		$this->separator = strval(trim(Tools::getValue('separator', ';')));
+		$this->separator = substr(strval(trim(Tools::getValue('separator', ';'))), 0, 1);
 
 		if (is_null(Tools::getValue('multiple_value_separator')) || trim(Tools::getValue('multiple_value_separator')) == '')
 			$this->multiple_value_separator = ',';
@@ -469,14 +469,26 @@ class AdminImportControllerCore extends AdminController
 		if (isset($this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))]))
 		{
 			$entity_selected = $this->entities[$this->l(Tools::ucfirst(Tools::getValue('import_type')))];
-			$this->context->cookie->entity_selected = $entity_selected;
+			$this->context->cookie->entity_selected = (int)$entity_selected;
 		}
 		elseif (isset($this->context->cookie->entity_selected))
 			$entity_selected = (int)$this->context->cookie->entity_selected;
 
 		$csv_selected = '';
 		if (isset($this->context->cookie->csv_selected))
-			$csv_selected = pSQL($this->context->cookie->csv_selected);
+			$csv_selected = base64_decode($this->context->cookie->csv_selected);
+
+		$id_lang_selected = '';
+		if (isset($this->context->cookie->iso_lang_selected) && $this->context->cookie->iso_lang_selected)
+			$id_lang_selected = (int)Language::getIdByIso(base64_decode($this->context->cookie->iso_lang_selected));
+
+		$separator_selected = '';
+		if (isset($this->context->cookie->separator_selected) && $this->context->cookie->separator_selected)
+			$separator_selected = base64_decode($this->context->cookie->separator_selected);
+
+		$multiple_value_separator_selected = '';
+		if (isset($this->context->cookie->multiple_value_separator_selected) && $this->context->cookie->multiple_value_separator_selected)
+			$multiple_value_separator_selected = base64_decode($this->context->cookie->multiple_value_separator_selected);
 
 		$this->tpl_form_vars = array(
 			'module_confirmation' => (Tools::getValue('import')) && (isset($this->warnings) && !count($this->warnings)),
@@ -484,9 +496,11 @@ class AdminImportControllerCore extends AdminController
 			'entities' => $this->entities,
 			'entity_selected' => $entity_selected,
 			'csv_selected' => $csv_selected,
+			'separator_selected' => $separator_selected,
+			'multiple_value_separator_selected' => $multiple_value_separator_selected,
 			'files_to_import' => $files_to_import,
 			'languages' => Language::getLanguages(false),
-			'id_language' => $this->context->language->id,
+			'id_language' => ($id_lang_selected) ? $id_lang_selected : $this->context->language->id,
 			'available_fields' => $this->getAvailableFields(),
 			'truncateAuthorized' => (Shop::isFeatureActive() && $this->context->employee->isSuperAdmin()) || !Shop::isFeatureActive(),
 			'PS_ADVANCED_STOCK_MANAGEMENT' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
@@ -512,9 +526,10 @@ class AdminImportControllerCore extends AdminController
 			$data[$i] = $this->generateContentTable($i, $nb_column, $handle, $this->separator);
 
 		$this->context->cookie->entity_selected = (int)Tools::getValue('entity');
-
-		if (Tools::getValue('csv'))
-			$this->context->cookie->csv_selected = Tools::getValue('csv');
+		$this->context->cookie->iso_lang_selected = base64_encode(Tools::getValue('iso_lang'));
+		$this->context->cookie->separator_selected = base64_encode(Tools::getValue('separator'));
+		$this->context->cookie->multiple_value_separator_selected = base64_encode(Tools::getValue('multiple_value_separator'));
+		$this->context->cookie->csv_selected = base64_encode(Tools::getValue('csv'));
 
 		$this->tpl_view_vars = array(
 			'import_matchs' => Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'),