Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhance the csvclean to support the charset encoding

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-05 14:51:45 +02:00
parent 2b528c1385
commit 916a906d9b
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/lib/functions2.lib.php
View File

@@ -3080,19 +3080,28 @@ function removeEmoji($text, $allowedemoji = 1)
/**
* Clean a cell to respect rules of CSV file cells
*
* @param string $newvalue String to clean
* @param string $charset Input AND Output character set
* @param string $newvalue String to clean (must be UTF-8 encoded)
* @param string $charset Expected output character set ('UTF-8', 'ISO-8859-1', ...). Default '' will use the value into EXPORT_CSV_FORCE_CHARSET.
* @param string $separator CSV char separator (often ',' or ';'). Default '' will use the value into EXPORT_CSV_SEPARATOR_TO_USE.
* @return string Value cleaned
*/
function csvClean($newvalue, $charset, $separator = '')
function csvClean($newvalue, $charset = '', $separator = '')
{
global $langs;
$addquote = 0;
if (empty($charset)) {
$charset = getDolGlobalString('EXPORT_CSV_FORCE_CHARSET');
}
if (empty($separator)) {
$separator = getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
}
$newvalue = $langs->convToOutputCharset($newvalue, 'UTF-8', $charset); // newvalue is now encoded into $charset
// Rule Dolibarr: No HTML
//print $charset.' '.$newvalue."\n";
//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);