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

Fix: Add option MAIN_FILESYSTEM_ENCODING to solve pb of file encoding.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-12-14 22:17:50 +00:00
parent 5e52c1e3f5
commit 60ac6c5705
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1978,14 +1978,14 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite)
return -1; return -1;
} }
// The file functions are ISO and data are stored in UTF8 in memory. // The file functions must be in OS filesystem encoding.
$src_file_iso=utf8_decode($src_file); $src_file_osencoded=dol_osencode($src_file);
$file_name_iso=utf8_decode($file_name); $file_name_osencoded=dol_osencode($file_name);
// Check if destination file already exists // Check if destination file already exists
if (! $allowoverwrite) if (! $allowoverwrite)
{ {
if (file_exists($file_name_iso)) if (file_exists($file_name_osencoded))
{ {
dol_syslog("Functions.lib::dol_move_uploaded_file File ".$file_name." already exists", LOG_WARNING); dol_syslog("Functions.lib::dol_move_uploaded_file File ".$file_name." already exists", LOG_WARNING);
return -2; return -2;
@ -1993,10 +1993,10 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite)
} }
// Move file // Move file
$return=move_uploaded_file($src_file_iso, $file_name_iso); $return=move_uploaded_file($src_file_osencoded, $file_name_osencoded);
if ($return) if ($return)
{ {
if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name, octdec($conf->global->MAIN_UMASK)); if (! empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG); dol_syslog("Functions.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
return 1; return 1;
} }
@ -3149,6 +3149,24 @@ function utf8_check($Str)
} }
/**
* \brief Return an UTF8 string encoded into OS filesystem encoding. This function is used to define
* value to pass to filesystem PHP functions.
* \param $str String to encode (UTF8)
* \return string Encoded string (UTF8, ISO-8859-1)
*/
function dol_osencode($str)
{
$tmp=ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1'; // By default for windows
if (empty($tmp)) $tmp='utf-8'; // By default for other
if (! empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp=$conf->global->MAIN_FILESYSTEM_ENCODING;
if ($tmp == 'iso-8859-1') return utf8_decode($str);
return $str;
}
/** /**
* \brief Return an id from a Code. Store Code-Id in a cache. * \brief Return an id from a Code. Store Code-Id in a cache.
* \param db Database handler * \param db Database handler

6
htdocs/lib/security.lib.php
View File

@ -466,7 +466,7 @@ function dol_encode($chain)
$output_tab[$i] = chr(ord(substr($chain,$i,1))+17); $output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
} }
$string_coded = base64_encode(implode ("",$output_tab)); $string_coded = base64_encode(implode("",$output_tab));
return $string_coded; return $string_coded;
} }
@ -484,7 +484,7 @@ function dol_decode($chain)
$output_tab[$i] = chr(ord(substr($chain,$i,1))-17); $output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
} }
$string_decoded = implode ("",$output_tab); $string_decoded = implode("",$output_tab);
return $string_decoded; return $string_decoded;
} }
@ -508,7 +508,7 @@ function dol_avscan_file($file)
$maxfilesize = 10485760; // archived files larger than this value (in bytes) will not be scanned $maxfilesize = 10485760; // archived files larger than this value (in bytes) will not be scanned
cl_setlimits($maxreclevel, $maxfiles, $maxratio, $archivememlim, $maxfilesize); cl_setlimits($maxreclevel, $maxfiles, $maxratio, $archivememlim, $maxfilesize);
$malware = cl_scanfile($file); $malware = cl_scanfile(dol_osencode($file));
} }
return $malware; return $malware;