DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed favicon upload

Browse source 
[ch309]
This commit is contained in:
snipe 2019-01-18 14:05:52 -08:00
parent 4129463923
commit fdd6ddf61b
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/Http/Controllers/SettingsController.php
View file

@ -440,8 +440,8 @@ class SettingsController extends Controller
// If they are uploading an image, validate it and upload it // If they are uploading an image, validate it and upload it
} elseif ($request->hasFile('email_logo')) { } elseif ($request->hasFile('email_logo')) {
$email_image = $request->file('email_logo'); $email_image = $email_upload = $request->file('email_logo');
$email_ext = $image->getClientOriginalExtension(); $email_ext = $email_image->getClientOriginalExtension();
$setting->email_logo = $email_file_name = 'email_logo.' . $email_ext; $setting->email_logo = $email_file_name = 'email_logo.' . $email_ext;
if ('svg' != $email_image->getClientOriginalExtension()) { if ('svg' != $email_image->getClientOriginalExtension()) {
@ -460,6 +460,7 @@ class SettingsController extends Controller
} }
} }
// If the user wants to clear the favicon... // If the user wants to clear the favicon...
if ('1' == $request->input('clear_favicon')) { if ('1' == $request->input('clear_favicon')) {
Storage::disk('public')->delete($setting->clear_favicon); Storage::disk('public')->delete($setting->clear_favicon);
@ -467,19 +468,28 @@ class SettingsController extends Controller
// If they are uploading an image, validate it and upload it // If they are uploading an image, validate it and upload it
} elseif ($request->hasFile('favicon')) { } elseif ($request->hasFile('favicon')) {
$favicon_image = $request->file('favicon');
$favicon_ext = $favicon_image->getClientOriginalExtension();
$setting->favicon = $favicon_file_name = 'favicon.' . $favicon_ext;
if ('svg' != $favicon_image->getClientOriginalExtension()) { $favicon_image = $favicon_upload = $request->file('favicon');
$favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 16, function($constraint) { $favicon_ext = $favicon_image->getClientOriginalExtension();
$setting->favicon = $favicon_file_name = 'favicon-uploaded.' . $favicon_ext;
if (('ico' != $favicon_image->getClientOriginalExtension()) && ('svg' != $favicon_image->getClientOriginalExtension())) {
$favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 36, function($constraint) {
$constraint->aspectRatio(); $constraint->aspectRatio();
$constraint->upsize(); $constraint->upsize();
}); });
// This requires a string instead of an object, so we use ($string)
Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
} else {
Storage::disk('public')->put($favicon_file_name, file_get_contents($request->file('favicon')));
} }
// This requires a string instead of an object, so we use ($string)
Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
// Remove Current image if exists // Remove Current image if exists
if (($setting->favicon) && (file_exists($favicon_file_name))) { if (($setting->favicon) && (file_exists($favicon_file_name))) {