Merge pull request #19060 from vincentjdc/original-file-hook-checkSecureAccess

Allow hook 'checkSecureAccess' to change original_file
This commit is contained in:
Laurent Destailleur 2021-10-21 22:39:29 +02:00 committed by GitHub
commit 88f870c6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2867,6 +2867,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
if ($fuser->admin) {
$accessallowed = 1; // If user is admin
}
$tmpmodulepart = explode('-', $modulepart);
if (!empty($tmpmodulepart[1])) {
$modulepart = $tmpmodulepart[0];
@ -2946,6 +2947,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
);
$reshook = $hookmanager->executeHooks('checkSecureAccess', $parameters, $object);
if ($reshook > 0) {
if (!empty($hookmanager->resArray['original_file'])) {
$original_file = $hookmanager->resArray['original_file'];
}
if (!empty($hookmanager->resArray['accessallowed'])) {
$accessallowed = $hookmanager->resArray['accessallowed'];
}