From 3d306aacc5968d73a04f61ddfba8142a21bcdf79 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Mar 2024 11:52:51 +0000 Subject: [PATCH 1/4] Fixed mismatched HTML tag Signed-off-by: snipe --- resources/views/partials/bootstrap-table.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 430f9566c..95f2785b6 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -73,7 +73,7 @@ return newParams; }, formatLoadingMessage: function () { - return '

{{ trans('general.loading') }}

'; + return '

{{ trans('general.loading') }}

'; }, icons: { advancedSearchIcon: 'fas fa-search-plus', @@ -86,7 +86,6 @@ clearSearch: 'fa-times' }, exportOptions: export_options, - exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ], onLoadSuccess: function () { $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call From 3b66912742d33c489d97195f5160ad007359cebb Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Mar 2024 12:25:02 +0000 Subject: [PATCH 2/4] Fixed #14460 - added support for avif Signed-off-by: snipe --- app/Http/Requests/ImageUploadRequest.php | 15 ++++----------- .../partials/forms/edit/image-upload.blade.php | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index d9947efe7..c9b7a6cdd 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -34,8 +34,8 @@ class ImageUploadRequest extends Request { return [ - 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp', - 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp', + 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif', + 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif', ]; } @@ -103,15 +103,13 @@ class ImageUploadRequest extends Request \Log::info('File name will be: '.$file_name); \Log::debug('File extension is: '.$ext); - if ($image->getMimeType() == 'image/webp') { + if (($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) { // If the file is a webp, we need to just move it since webp support // needs to be compiled into gd for resizing to be available - - \Log::debug('This is a webp, just move it'); Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image)); + } elseif($image->getMimeType() == 'image/svg+xml') { // If the file is an SVG, we need to clean it and NOT encode it - \Log::debug('This is an SVG'); $sanitizer = new Sanitizer(); $dirtySVG = file_get_contents($image->getRealPath()); $cleanSVG = $sanitizer->sanitize($dirtySVG); @@ -123,9 +121,6 @@ class ImageUploadRequest extends Request } } else { - \Log::debug('Not an SVG or webp - resize'); - \Log::debug('Trying to upload to: '.$path.'/'.$file_name); - try { $upload = Image::make($image->getRealPath())->setFileInfoFromPath($image->getRealPath())->resize(null, $w, function ($constraint) { $constraint->aspectRatio(); @@ -147,10 +142,8 @@ class ImageUploadRequest extends Request // Remove Current image if exists if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) { - \Log::debug('A file already exists that we are replacing - we should delete the old one.'); try { Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname}); - \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.'); } catch (\Exception $e) { \Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?'); } diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php index 8e8419b4c..2e9ac3855 100644 --- a/resources/views/partials/forms/edit/image-upload.blade.php +++ b/resources/views/partials/forms/edit/image-upload.blade.php @@ -28,7 +28,7 @@ From 7787fe42c86a99d30bc05b1a14eaa4facc2a30ee Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Mar 2024 12:30:28 +0000 Subject: [PATCH 3/4] Added avif to helpers Signed-off-by: snipe --- app/Helpers/Helper.php | 6 +++++- app/Http/Requests/UploadFileRequest.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 0f3e27175..e3f2b036e 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -842,7 +842,7 @@ class Helper $filetype = @finfo_file($finfo, $file); finfo_close($finfo); - if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif')) { + if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif')) { return $filetype; } @@ -1106,6 +1106,8 @@ class Helper 'jpeg' => 'far fa-image', 'gif' => 'far fa-image', 'png' => 'far fa-image', + 'webp' => 'far fa-image', + 'avif' => 'far fa-image', // word 'doc' => 'far fa-file-word', 'docx' => 'far fa-file-word', @@ -1141,6 +1143,8 @@ class Helper case 'jpeg': case 'gif': case 'png': + case 'webp': + case 'avif': return true; break; default: diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.php index 74d33d58e..ee5624e3d 100644 --- a/app/Http/Requests/UploadFileRequest.php +++ b/app/Http/Requests/UploadFileRequest.php @@ -27,7 +27,7 @@ class UploadFileRequest extends Request $max_file_size = \App\Helpers\Helper::file_upload_max_size(); return [ - 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp|max:'.$max_file_size, + 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp,avif|max:'.$max_file_size, ]; } From 321414f6e35489d4c5331b484aaa787b6c2f61ad Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 20 Mar 2024 12:38:48 +0000 Subject: [PATCH 4/4] Updated comment Signed-off-by: snipe --- app/Http/Requests/ImageUploadRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php index c9b7a6cdd..25156181e 100644 --- a/app/Http/Requests/ImageUploadRequest.php +++ b/app/Http/Requests/ImageUploadRequest.php @@ -104,7 +104,7 @@ class ImageUploadRequest extends Request \Log::debug('File extension is: '.$ext); if (($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) { - // If the file is a webp, we need to just move it since webp support + // If the file is a webp or avif, we need to just move it since webp support // needs to be compiled into gd for resizing to be available Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image));