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

Merge branch '16.0' into task-16.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-06 19:44:35 +01:00 committed by GitHub
commit e8ee1d809d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2434,11 +2434,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
// Find the subdirectory name as the reference. For example original_file='10/myfile.pdf' -> refname='10' // Find the subdirectory name as the reference. For example original_file='10/myfile.pdf' -> refname='10'
if (empty($refname)) { if (empty($refname)) {
$refname = basename(dirname($original_file)."/"); $refname = basename(dirname($original_file)."/");
} if ($refname == 'thumbs') {
// If we get the thumbs directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10'
if ($refname == 'thumbs') { $refname = basename(dirname(dirname($original_file))."/");
// If we get the thumbns directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10' }
$refname = basename(dirname(dirname($original_file))."/");
} }
// Define possible keys to use for permission check // Define possible keys to use for permission check

4
htdocs/viewimage.php
View File

@ -228,6 +228,10 @@ $original_file = str_replace('..\\', '/', $original_file);
// Find the subdirectory name as the reference // Find the subdirectory name as the reference
$refname = basename(dirname($original_file)."/"); $refname = basename(dirname($original_file)."/");
if ($refname == 'thumbs') {
// If we get the thumbs directory, we must go one step higher. For example original_file='10/thumbs/myfile_small.jpg' -> refname='10'
$refname = basename(dirname(dirname($original_file))."/");
}
// Check that file is allowed for view with viewimage.php // Check that file is allowed for view with viewimage.php
if (!empty($original_file) && !dolIsAllowedForPreview($original_file)) { if (!empty($original_file) && !dolIsAllowedForPreview($original_file)) {