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

Fix: Bad space into log

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-19 21:34:48 +01:00
parent 22767bac36
commit becd65f9d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/files.lib.php
View File

@ -538,13 +538,13 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
$newpathofdestfile=dol_osencode($destfile); $newpathofdestfile=dol_osencode($destfile);
$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @ $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
if (! $result) if (! $result)
{ {
if ($destexists) if ($destexists)
{ {
dol_syslog("files.lib.php::dol_move failed. We try to delete first and move after.", LOG_WARNING); dol_syslog("files.lib.php::dol_move failed. We try to delete first and move after.", LOG_WARNING);
// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions. // We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
dol_delete_file($destfile); dol_delete_file($destfile);
$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @ $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
} }
else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING); else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING);
@ -1301,7 +1301,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
if (empty($modulepart)) return 'ErrorBadParameter'; if (empty($modulepart)) return 'ErrorBadParameter';
if (empty($entity)) $entity=0; if (empty($entity)) $entity=0;
dol_syslog('modulepart='.$modulepart.' original_file= '.$original_file); dol_syslog('modulepart='.$modulepart.' original_file='.$original_file);
// We define $accessallowed and $sqlprotectagainstexternals // We define $accessallowed and $sqlprotectagainstexternals
$accessallowed=0; $accessallowed=0;
$sqlprotectagainstexternals=''; $sqlprotectagainstexternals='';