Skip to content
Snippets Groups Projects
Commit d9249469 authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

evo: choice of utf8 in the export

parent ed0ae172
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ class ExportControler extends ExportFunctions ...@@ -75,6 +75,7 @@ class ExportControler extends ExportFunctions
$this->configuration = $configuration->$collection; $this->configuration = $configuration->$collection;
$this->delimiter = end($configuration->CSVOPTIONS->DELIMITER); $this->delimiter = end($configuration->CSVOPTIONS->DELIMITER);
$this->enclosure = end($configuration->CSVOPTIONS->ENCLOSURE); $this->enclosure = end($configuration->CSVOPTIONS->ENCLOSURE);
$this->isUtf8 = end($configuration->CSVOPTIONS->IS_UTF8);
} }
private function retrieve_datas() private function retrieve_datas()
...@@ -153,6 +154,9 @@ class ExportControler extends ExportFunctions ...@@ -153,6 +154,9 @@ class ExportControler extends ExportFunctions
if ($this->retrieve_encoding($column_value) === false) { if ($this->retrieve_encoding($column_value) === false) {
$column_value = utf8_encode($column_value); $column_value = utf8_encode($column_value);
} }
if ($this->isUtf8 <> "TRUE") {
$column_value = utf8_decode($column_value);
}
$column_value = $this->unprotect_string($column_value); $column_value = $this->unprotect_string($column_value);
$this->object_export->$line_name->$column_name = $column_value; $this->object_export->$line_name->$column_name = $column_value;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment