kazhnuz/koblog
1
0
Fork 0
Code Issues 28 Pull requests 1 Projects 3 Releases Packages Wiki Activity Actions

Fix bug with mime type checker

Browse source
This commit is contained in:
dignajar 2020-07-24 10:37:30 +02:00
parent f33466af01
commit 86e0f69030
5 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bl-kernel/admin/themes/gris

@ -1 +1 @@
Subproject commit 09138280134ec8014982f260c1ebb6a5b0091fdc
Subproject commit c97e1681dda9576128298d299e42973646df2475

10
bl-kernel/ajax/logo-upload.php
View file

@ -32,10 +32,12 @@ if (!in_array($fileExtension, $GLOBALS['ALLOWED_IMG_EXTENSION'])) {
// File MIME Type
$fileMimeType = Filesystem::mimeType($_FILES['inputFile']['tmp_name']);
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
if ($fileMimeType!==false) {
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
}
}
// Final filename

10
bl-kernel/ajax/profile-picture-upload.php
View file

@ -37,10 +37,12 @@ if (!in_array($fileExtension, $GLOBALS['ALLOWED_IMG_EXTENSION']) ) {
// Check file MIME Type
$fileMimeType = Filesystem::mimeType($_FILES['profilePictureInputFile']['tmp_name']);
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
if ($fileMimeType!==false) {
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
}
}
// Tmp filename

10
bl-kernel/ajax/upload-images.php
View file

@ -65,10 +65,12 @@ foreach ($_FILES['images']['name'] as $uuid=>$filename) {
// Check file MIME Type
$fileMimeType = Filesystem::mimeType($_FILES['images']['tmp_name'][$uuid]);
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
if ($fileMimeType!==false) {
if (!in_array($fileMimeType, $GLOBALS['ALLOWED_IMG_MIMETYPES'])) {
$message = $L->g('File mime type is not supported. Allowed types:').' '.implode(', ',$GLOBALS['ALLOWED_IMG_MIMETYPES']);
Log::set($message, LOG_TYPE_ERROR);
ajaxResponse(1, $message);
}
}
// Move from PHP tmp file to Bludit tmp directory

17
bl-kernel/helpers/filesystem.class.php
View file

@ -303,12 +303,23 @@ class Filesystem {
| @file /home/diego/dog.jpg
| @return image/jpeg
|
| @file string Full path of the file
| @file [string] Full path of the file
|
| @return string
| @return [string|bool] Mime type as string or FALSE if not possible to get the mime type
*/
public static function mimeType($file) {
return mime_content_type($file);
if (function_exists('mime_content_type')) {
return mime_content_type($file);
}
if (function_exists('finfo_file')) {
$fileinfo = finfo_open(FILEINFO_MIME_TYPE);
$mimeType = finfo_file($fileinfo, $file);
finfo_close($fileinfo);
return $mimeType;
}
return false;
}
}