lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

going back to current version and use EXPORT_CSV_FORCE_CHARSET as a

Browse Source 
workaround for my dev environment.
This commit is contained in:
bgenere 2016-11-30 17:12:17 +01:00
parent 751651c4d4
commit 18c6bb141d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/modules/export/export_csv.modules.php
View File

@ -189,22 +189,18 @@ class ExportCsv extends ModeleExports
* @param Translate $outputlangs Object lang to translate values * @param Translate $outputlangs Object lang to translate values
* @param array $array_types Array with types of fields * @param array $array_types Array with types of fields
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*
* //TODO transnoentities send back UTF-8 so using an ISO charset at this point create an issue
* (get a blank screen and an empty file)
* my feeling is that we should not force charset till we are not writing the final result.
*/ */
function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types) function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
{ {
global $conf; global $conf;
if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET)) if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
{ {
$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET; $outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
} }
else else
{ {
$outputlangs->charset_output = $conf->file->character_set_client; $outputlangs->charset_output = 'ISO-8859-1';
} }
foreach($array_selected_sorted as $code => $value) foreach($array_selected_sorted as $code => $value)
@ -215,7 +211,6 @@ class ExportCsv extends ModeleExports
fwrite($this->handle,$newvalue.$this->separator); fwrite($this->handle,$newvalue.$this->separator);
} }
fwrite($this->handle,"\n"); fwrite($this->handle,"\n");
return 0; return 0;
} }
@ -228,10 +223,6 @@ class ExportCsv extends ModeleExports
* @param Translate $outputlangs Object lang to translate values * @param Translate $outputlangs Object lang to translate values
* @param array $array_types Array with types of fields * @param array $array_types Array with types of fields
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*
* //TODO transnoentities send back UTF-8 so using an ISO charset at this point create an issue
* (get a blank screen and an empty file)
* my feeling is that we should not force charset till we are not writing the final result.
*/ */
function write_record($array_selected_sorted,$objp,$outputlangs,$array_types) function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
{ {
@ -243,7 +234,7 @@ class ExportCsv extends ModeleExports
} }
else else
{ {
$outputlangs->charset_output = $conf->file->character_set_client; $outputlangs->charset_output = 'ISO-8859-1';
} }
$this->col=0; $this->col=0;
@ -313,6 +304,7 @@ class ExportCsv extends ModeleExports
global $conf; global $conf;
$addquote=0; $addquote=0;
// Rule Dolibarr: No HTML // Rule Dolibarr: No HTML
//print $charset.' '.$newvalue."\n"; //print $charset.' '.$newvalue."\n";
//$newvalue=dol_string_nohtmltag($newvalue,0,$charset); //$newvalue=dol_string_nohtmltag($newvalue,0,$charset);