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

Update export_csv.modules.php

Browse Source
This commit is contained in:
BENKE Charlie 2016-06-03 23:58:37 +02:00
parent 41856a920e
commit 2a8f17bc40
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,8 +299,10 @@ class ExportCsv extends ModeleExports
*/ */
function csv_clean($newvalue, $charset) function csv_clean($newvalue, $charset)
{ {
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,1,$charset); $newvalue=dol_string_nohtmltag($newvalue,1,$charset);
@ -308,10 +310,14 @@ class ExportCsv extends ModeleExports
// Rule 1 CSV: No CR, LF in cells // Rule 1 CSV: No CR, LF in cells
$oldvalue=$newvalue; $oldvalue=$newvalue;
$newvalue=str_replace("\r",'',$newvalue); $newvalue=str_replace("\r",'\r',$newvalue);
$newvalue=str_replace("\n",'\n',$newvalue); $newvalue=str_replace("\n",'\n',$newvalue);
if($oldvalue != $newvalue) if ($conf->global->USE_STRICT_CSV_RULES && $oldvalue != $newvalue)
{
// If strict use of CSV rules, we just add quote
$newvalue=$oldvalue;
$addquote=1; $addquote=1;
}
// Rule 2 CSV: If value contains ", we must escape with ", and add " // Rule 2 CSV: If value contains ", we must escape with ", and add "
if (preg_match('/"/',$newvalue)) if (preg_match('/"/',$newvalue))