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

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-13 17:05:50 +01:00
parent 6cf50356a3
commit bbeddae5f5
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/filemanagerdol/connectors/php/connector.lib.php
View File

@ -329,7 +329,14 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
$sExtension = strtolower($sExtension); $sExtension = strtolower($sExtension);
// Check permission // Check permission
if (!$user->hasRight('website', 'write') && !$user->hasRight('mailing', 'write') || !empty($user->socid)) { $permissiontouploadmediaisok = 1;
if (!empty($user->socid)) {
$permissiontouploadmediaisok = 0;
}
/*if (!$user->hasRight('website', 'write') && !$user->hasRight('mailing', 'write')) {
$permissiontouploadmediaisok = 0;
}*/
if (!$permissiontouploadmediaisok) {
dol_syslog("connector.lib.php Try to upload a file with no permission"); dol_syslog("connector.lib.php Try to upload a file with no permission");
$sErrorNumber = '202'; $sErrorNumber = '202';
} }
@ -547,7 +554,9 @@ function GetParentFolder($folderPath)
*/ */
function CreateServerFolder($folderPath, $lastFolder = null) function CreateServerFolder($folderPath, $lastFolder = null)
{ {
global $user;
global $Config; global $Config;
$sParent = GetParentFolder($folderPath); $sParent = GetParentFolder($folderPath);
// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms // Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
@ -555,6 +564,17 @@ function CreateServerFolder($folderPath, $lastFolder = null)
$folderPath = str_replace('//', '/', $folderPath); $folderPath = str_replace('//', '/', $folderPath);
} }
$permissiontouploadmediaisok = 1;
if (!empty($user->socid)) {
$permissiontouploadmediaisok = 0;
}
/*if (!$user->hasRight('website', 'write') && !$user->hasRight('mailing', 'write')) {
$permissiontouploadmediaisok = 0;
}*/
if (!$permissiontouploadmediaisok) {
return 'Bad permissions to create a folder in media directory';
}
// Check if the parent exists, or create it. // Check if the parent exists, or create it.
if (!empty($sParent) && !file_exists($sParent)) { if (!empty($sParent) && !file_exists($sParent)) {
//prevents agains infinite loop when we can't create root folder //prevents agains infinite loop when we can't create root folder

1
htdocs/core/lib/functions2.lib.php
View File

@ -2902,5 +2902,6 @@ function acceptLocalLinktoMedia()
} }
} }
//return 1;
return $acceptlocallinktomedia; return $acceptlocallinktomedia;
} }