From e19922abd026b4c1f72ad447ad0237e51fea07d1 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 22 Jun 2024 18:49:35 +0100 Subject: [PATCH] Cleaned up UI controller Signed-off-by: snipe --- .../Controllers/Users/UsersController.php | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 1100b5f3f8..0be1d697f1 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -17,7 +17,9 @@ use App\Notifications\WelcomeNotification; use Illuminate\Support\Facades\Auth; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Password; +use Illuminate\Support\Facades\Storage; use Redirect; use Str; use Symfony\Component\HttpFoundation\StreamedResponse; @@ -336,16 +338,22 @@ class UsersController extends Controller $this->authorize('delete', User::class); - $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->first(); + if ($user = User::find($id)) { + + if ($user->delete()) { + + if (Storage::disk('public')->exists('avatars/' . $user->avatar)) { + try { + Storage::disk('public')->delete('avatars/' . $user->avatar); + } catch (\Exception $e) { + Log::debug($e); + } + } + return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete')); + } - if (($user) && ($user->deleted_at == '')) { - // Delete the user - $user->delete(); - return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete')); } - - return redirect()->route('users.index') - ->with('error', trans('admin/users/message.user_not_found', compact('id'))); + return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found')); }