Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix error management: When an error is returned by hooks into

Browse Source 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
This commit is contained in:
Laurent Destailleur
2014-08-28 15:14:06 +02:00
parent d3a3e8786e
commit 1505ade3db
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -597,7 +597,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
global $conf, $db, $user, $langs; global $conf, $db, $user, $langs;
global $object, $hookmanager; global $object, $hookmanager;
$error=0; $reshook=0;
$file_name = $dest_file; $file_name = $dest_file;
if (empty($nohook)) if (empty($nohook))
@@ -663,8 +663,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
} }
// Security: // Security:
// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans // On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
// les noms de fichiers.
if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file)) if (preg_match('/^\./',$dest_file) || preg_match('/\.\./',$dest_file) || preg_match('/[<>|]/',$dest_file))
{ {
dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING); dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
@@ -677,7 +676,13 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
$reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object); $reshook=$hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
} }
if (empty($reshook)) if ($reshook < 0) // At least one blocking error returned by one hook
{
$errmsg = join(',', $hookmanager->errors);
if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
return $errmsg;
}
elseif (empty($reshook))
{ {
// The file functions must be in OS filesystem encoding. // The file functions must be in OS filesystem encoding.
$src_file_osencoded=dol_osencode($src_file); $src_file_osencoded=dol_osencode($src_file);
@@ -710,8 +715,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
return -3; // Unknown error return -3; // Unknown error
} }
} }
else
return $reshook; return 1; // Success
} }
/** /**