DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-04-22 15:02:51 +01:00
parent 7f38ca239e cfe39afc11
commit 5229dd65ce
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AssetModelsFilesController.php
View file

@ -38,7 +38,7 @@ class AssetModelsFilesController extends Controller
$file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file); $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file);
$model->logUpload($file_name, e($request->get('notes'))); $model->logUpload($file_name, $request->get('notes'));
} }
return redirect()->back()->with('success', trans('general.file_upload_success')); return redirect()->back()->with('success', trans('general.file_upload_success'));

2
app/Http/Controllers/Assets/AssetFilesController.php
View file

@ -38,7 +38,7 @@ class AssetFilesController extends Controller
foreach ($request->file('file') as $file) { foreach ($request->file('file') as $file) {
$file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file); $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
$asset->logUpload($file_name, e($request->get('notes'))); $asset->logUpload($file_name, $request->get('notes'));
} }
return redirect()->back()->with('success', trans('admin/hardware/message.upload.success')); return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));

7
app/Http/Requests/ImageUploadRequest.php
View file

@ -36,6 +36,7 @@ class ImageUploadRequest extends Request
return [ return [
'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif', 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif',
'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif', 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif',
'favicon' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,image/x-icon,image/vnd.microsoft.icon,ico',
]; ];
} }
@ -103,9 +104,9 @@ class ImageUploadRequest extends Request
\Log::info('File name will be: '.$file_name); \Log::info('File name will be: '.$file_name);
\Log::debug('File extension is: '.$ext); \Log::debug('File extension is: '.$ext);
if (($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) { if (($image->getMimeType() == 'image/vnd.microsoft.icon') || ($image->getMimeType() == 'image/x-icon') || ($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) {
// If the file is a webp or avif, we need to just move it since webp support // If the file is an icon, webp or avif, we need to just move it since gd doesn't support resizing
// needs to be compiled into gd for resizing to be available // icons or avif, and webp support and needs to be compiled into gd for resizing to be available
Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image)); Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image));
} elseif($image->getMimeType() == 'image/svg+xml') { } elseif($image->getMimeType() == 'image/svg+xml') {