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

Fix support of MAIN_ALLOW_SVG_FILES_AS_IMAGES

Browse Source
This commit is contained in:
Laurent Destailleur 2022-07-05 10:37:28 +02:00
parent 23e693074e
commit ab3e01268d
3 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
htdocs/core/filemanagerdol/connectors/php/commands.php
View File

@ -237,63 +237,69 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
} }
*/ */
include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
$isImageValid = image_format_supported($sFileName) > 0 ? true : false; //var_dump($sFileName); var_dump(image_format_supported($sFileName));exit;
$isImageValid = (image_format_supported($sFileName) >= 0 ? true : false);
if (!$isImageValid) { if (!$isImageValid) {
$sErrorNumber = '202'; $sErrorNumber = '202';
} }
// Check if it is an allowed extension. // Check if it is an allowed extension.
if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType)) { if (!$sErrorNumber) {
$iCounter = 0; if (IsAllowedExt($sExtension, $resourceType)) {
$iCounter = 0;
while (true) { while (true) {
$sFilePath = $sServerDir.$sFileName; $sFilePath = $sServerDir.$sFileName;
if (is_file($sFilePath)) {
$iCounter++;
$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
$sErrorNumber = '201';
} else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_move_uploaded_file($oFile['tmp_name'], $sFilePath, 0, 0);
if (is_file($sFilePath)) { if (is_file($sFilePath)) {
if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload']) { $iCounter++;
break; $sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
$sErrorNumber = '201';
} else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_move_uploaded_file($oFile['tmp_name'], $sFilePath, 0, 0);
if (is_file($sFilePath)) {
if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload']) {
break;
}
$permissions = '0777';
if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload']) {
$permissions = (string) $Config['ChmodOnUpload'];
}
$permissionsdec = octdec($permissions);
dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
$oldumask = umask(0);
chmod($sFilePath, $permissionsdec);
umask($oldumask);
} }
$permissions = '0777'; break;
if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload']) {
$permissions = (string) $Config['ChmodOnUpload'];
}
$permissionsdec = octdec($permissions);
dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
$oldumask = umask(0);
chmod($sFilePath, $permissionsdec);
umask($oldumask);
} }
break;
} }
}
if (file_exists($sFilePath)) { if (file_exists($sFilePath)) {
//previous checks failed, try once again //previous checks failed, try once again
if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) { if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) {
@unlink($sFilePath); dol_syslog("commands.php IsImageValid is ko");
$sErrorNumber = '202'; @unlink($sFilePath);
} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true) { $sErrorNumber = '202';
@unlink($sFilePath); } elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true) {
$sErrorNumber = '202'; dol_syslog("commands.php DetectHtml is ko");
@unlink($sFilePath);
$sErrorNumber = '202';
}
} }
} else {
$sErrorNumber = '202';
} }
} else {
$sErrorNumber = '202';
} }
} else { } else {
$sErrorNumber = '202'; $sErrorNumber = '203';
} }

5
htdocs/core/filemanagerdol/connectors/php/config.php
View File

@ -159,7 +159,10 @@ $Config['FileTypesAbsolutePath']['File'] = ($Config['UserFilesAbsolutePath'] ==
$Config['QuickUploadPath']['File'] = $Config['UserFilesPath']; $Config['QuickUploadPath']['File'] = $Config['UserFilesPath'];
$Config['QuickUploadAbsolutePath']['File'] = $Config['UserFilesAbsolutePath']; $Config['QuickUploadAbsolutePath']['File'] = $Config['UserFilesAbsolutePath'];
$Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png'); $Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png', 'ai');
if (!empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
$Config['AllowedExtensions']['Image'][] = 'svg';
}
$Config['DeniedExtensions']['Image'] = array(); $Config['DeniedExtensions']['Image'] = array();
$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'].'image/'; $Config['FileTypesPath']['Image'] = $Config['UserFilesPath'].'image/';
$Config['FileTypesAbsolutePath']['Image'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/'; $Config['FileTypesAbsolutePath']['Image'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/';

8
htdocs/core/filemanagerdol/connectors/php/upload.php
View File

@ -42,14 +42,14 @@ function SendError($number, $text)
// Check if this uploader has been enabled. // Check if this uploader has been enabled.
if (!$Config['Enabled']) { if (empty($Config['Enabled'])) {
SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file'); SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
} }
$sCommand = 'QuickUpload'; $sCommand = 'QuickUpload';
// The file type (from the QueryString, by default 'File'). // The file type (from the QueryString, by default 'File', can be 'Image' or 'Media').
$sType = isset($_GET['Type']) ? $_GET['Type'] : 'File'; $sType = GETPOSTISSET('Type') ? GETPOST('Type') : 'File';
$sCurrentFolder = "/"; $sCurrentFolder = "/";
@ -71,5 +71,5 @@ if (!IsAllowedType($sType)) {
// Get the CKEditor Callback // Get the CKEditor Callback
$CKEcallback = $_GET['CKEditorFuncNum']; $CKEcallback = $_GET['CKEditorFuncNum'];
//modify the next line adding in the new param // Get uploaded filr and move it at correct place. Note: Some tests on file name are also included into this function
FileUpload($sType, $sCurrentFolder, $sCommand, $CKEcallback); FileUpload($sType, $sCurrentFolder, $sCommand, $CKEcallback);