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

Use new deleting method in ImageUploadRequest

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-07-20 05:55:34 +01:00
parent ad85f8be2f
commit 736d4cc59a
1 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -414,10 +414,7 @@ class SettingsController extends Controller
$setting = $request->handleImages($setting, 600, 'logo', '', 'logo'); $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
if ($request->input('clear_logo') == '1') { if ($request->input('clear_logo') == '1') {
$setting = $request->deleteExistingImage($setting, 'logo', 'logo');
if (($setting->logo) && (Storage::exists($setting->logo))) {
Storage::disk('public')->delete($setting->logo);
}
$setting->logo = null; $setting->logo = null;
$setting->brand = 1; $setting->brand = 1;
} }
@ -425,44 +422,40 @@ class SettingsController extends Controller
// Email logo upload // Email logo upload
$setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo'); $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
if ($request->input('clear_email_logo') == '1') { if ($request->input('clear_email_logo') == '1') {
$setting = $request->deleteExistingImage($setting, 'email_logo', 'email_logo');
if (($setting->email_logo) && (Storage::exists($setting->email_logo))) {
Storage::disk('public')->delete($setting->email_logo);
}
$setting->email_logo = null; $setting->email_logo = null;
// If they are uploading an image, validate it and upload it // If they are uploading an image, validate it and upload it
} }
// Label logo upload // Label logo upload
$setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo'); $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
if ($request->input('clear_label_logo') == '1') {
if (($setting->label_logo) && (Storage::exists($setting->label_logo))) { if ($request->input('clear_label_logo') == '1') {
Storage::disk('public')->delete($setting->label_logo); $setting = $request->deleteExistingImage($setting, '', 'label_logo');
}
$setting->label_logo = null; $setting->label_logo = null;
} }
// Favicon upload // Favicon upload
$setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon'); $setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');
if ('1' == $request->input('clear_favicon')) { if ('1' == $request->input('clear_favicon')) {
$setting = $request->deleteExistingImage($setting, '', 'favicon');
if (($setting->favicon) && (Storage::exists($setting->favicon))) {
Storage::disk('public')->delete($setting->favicon);
}
$setting->favicon = null; $setting->favicon = null;
} }
// Default avatar upload // Default avatar upload
$setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar'); $setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');
if (($request->input('clear_default_avatar') == '1') && ($setting->default_avatar!='default.png')) { if ($request->input('clear_default_avatar') == '1') {
// Don't delete the file, just update the field if this is the default
\Log::debug('Deleting default avatar'); if ($setting->default_avatar!='default.png') {
if (($setting->default_avatar) && (Storage::exists('avatars/'.$setting->default_avatar))) { $setting = $request->deleteExistingImage($setting, 'avatars', 'default_avatar');
Storage::disk('public')->delete('avatars/'.$setting->default_avatar);
} }
$setting->default_avatar = null; $setting->default_avatar = null;
} }
if ($request->input('restore_default_avatar') == '1') {
Setting::restoreDefaultAvatar();
$setting->default_avatar = 'default.png';
}
} }
if ($setting->save()) { if ($setting->save()) {