DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Nicer handling of erroring when filename+log do not match

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-05-22 17:20:03 +01:00
parent c9f7847fb3
commit 3ab197075a
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/Http/Controllers/Users/UserFilesController.php
View file

@ -78,24 +78,29 @@ class UserFilesController extends Controller
*/
public function destroy($userId = null, $fileId = null)
{
$user = User::find($userId);
$destinationPath = config('app.private_uploads').'/users';
if ($user = User::find($userId)) {
if (isset($user->id)) {
$this->authorize('update', $user);
$log = Actionlog::find($fileId);
$full_filename = $destinationPath.'/'.$log->filename;
if (file_exists($full_filename)) {
unlink($destinationPath.'/'.$log->filename);
$this->authorize('delete', $user);
$rel_path = 'private_uploads/users';
if ($log = Actionlog::find($fileId)) {
$full_filename = $rel_path.'/'.$log->filename;
if (file_exists($full_filename)) {
Storage::delete($rel_path.'/'.$log->filename);
return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
}
$log->delete();
return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
}
$log->delete();
return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
return redirect()->back()->with('success', trans('admin/users/message.user_not_found', ['id' => $userId]));
}
// Prepare the error message
$error = trans('admin/users/message.user_not_found', ['id' => $userId]);
// Redirect to the licence management page
return redirect()->route('users.index')->with('error', $error);
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId]));
}