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

Add log to debug travis error

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-10 15:49:13 +02:00
parent 753330e499
commit 1da99a8fcd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1168,18 +1168,20 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object); $reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
} }
if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok and replace, -1 = ko
{ {
if ($reshook < 0) return false; if ($reshook < 0) return false;
return true; return true;
} else { } else {
//print "x".$file." ".$disableglob;exit; //print "x".$file." ".$disableglob;exit;
dol_syslog("reshook=".$reshook);
$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset $file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
if (empty($disableglob) && !empty($file_osencoded)) if (empty($disableglob) && !empty($file_osencoded))
{ {
$ok = true; $ok = true;
$globencoded = str_replace('[', '\[', $file_osencoded); $globencoded = str_replace('[', '\[', $file_osencoded);
$globencoded = str_replace(']', '\]', $globencoded); $globencoded = str_replace(']', '\]', $globencoded);
dol_syslog("globencoded=".$globencoded);
$listofdir = glob($globencoded); $listofdir = glob($globencoded);
if (!empty($listofdir) && is_array($listofdir)) if (!empty($listofdir) && is_array($listofdir))
{ {
@ -1220,7 +1222,9 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
// If error because it does not exists, we should return true, and we should return false if this is a permission problem // If error because it does not exists, we should return true, and we should return false if this is a permission problem
} }
} }
} else dol_syslog("No files to delete found", LOG_DEBUG); } else {
dol_syslog("No files to delete found", LOG_DEBUG);
}
} else { } else {
$ok = false; $ok = false;
if ($nophperrors) $ok = @unlink($file_osencoded); if ($nophperrors) $ok = @unlink($file_osencoded);