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

Fix: Data in memory must always be encoded in utf8. PHP files functions need ISO, so we convert data just before and after using them.

Browse Source
This commit is contained in:
Laurent Destailleur
2009-10-04 15:52:16 +00:00
parent 84bc3f5b31
commit e192abc755
11 changed files with 83 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/lib/functions.lib.php
View File

@@ -698,13 +698,33 @@ function dol_date($fmt, $timestamp, $gm=0)
/**
* \brief Return string with formated size
* \param size Size to print
* \param shortvalue Tell if we want long value to use another unit (Ex: 1.5Kb instead of 1500b)
* \param shortunit Use short value of size unit
* \return string Link
*/
function dol_print_size($size)
function dol_print_size($size,$shortvalue=0,$shortunit=0)
{
global $langs;
$level=1024;
return $size.' '.$langs->trans("Bytes");
// Set value text
if (empty($shortvalue) || $size < ($level*10))
{
$ret=$size;
$textunitshort=$langs->trans("b");
$textunitlong=$langs->trans("Bytes");
}
else
{
$ret=round($size/$level,0);
$textunitshort=$langs->trans("Kb");
$textunitlong=$langs->trans("KiloBytes");
}
// Use long or short text unit
if (empty($shortunit)) { $ret.=' '.$textunitlong; }
else { $ret.=' '.$textunitshort; }
return $ret;
}
/**
@@ -2111,11 +2131,12 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow
function dol_delete_file($file)
{
$ok=true;
foreach (glob($file) as $filename)
$newfile=utf8_check($file)?utf8_decode($file):$file; // glob function accepts only ISO string
foreach (glob($newfile) as $filename)
{
$ok=unlink($filename);
if ($ok) dol_syslog("Removed file $filename",LOG_DEBUG);
else dol_syslog("Failed to remove file $filename",LOG_ERR);
if ($ok) dol_syslog("Removed file ".$filename,LOG_DEBUG);
else dol_syslog("Failed to remove file ".$filename,LOG_ERR);
}
return $ok;
}
@@ -2128,7 +2149,8 @@ function dol_delete_file($file)
*/
function dol_delete_dir($dir)
{
return rmdir($dir);
$newdir=utf8_check($dir)?utf8_decode($dir):$dir;
return rmdir($newdir);
}
/**
@@ -2140,7 +2162,8 @@ function dol_delete_dir($dir)
function dol_delete_dir_recursive($dir,$count=0)
{
//dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
if ($handle = opendir("$dir"))
$newdir=utf8_check($dir)?utf8_decode($dir):$dir;
if ($handle = opendir("$newdir"))
{
while (false !== ($item = readdir($handle)))
{