From d24045acba2cfb1d40c706d77bb3ba2fdfe79992 Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Sat, 9 Jun 2018 21:29:44 -0400 Subject: [PATCH] (Update) Aborts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace `abort(403, 'Unauthorized action.’);` use with a graceful toastr error. --- app/Http/Controllers/AlbumController.php | 2 +- app/Http/Controllers/CommentController.php | 4 ++-- app/Http/Controllers/ForumController.php | 2 +- app/Http/Controllers/ImageController.php | 4 ++-- app/Http/Controllers/RequestController.php | 2 +- app/Http/Controllers/TorrentController.php | 14 +++++++------- app/Http/Controllers/UserController.php | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/AlbumController.php b/app/Http/Controllers/AlbumController.php index 5613838f0..d9f1cc7f7 100644 --- a/app/Http/Controllers/AlbumController.php +++ b/app/Http/Controllers/AlbumController.php @@ -134,7 +134,7 @@ class AlbumController extends Controller return redirect()->route('home') ->with(Toastr::success('Album has successfully been deleted', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } } \ No newline at end of file diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 84080c3fe..18b47c43e 100755 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -417,7 +417,7 @@ class CommentController extends Controller return back()->with(Toastr::success('Comment Has Been Edited.', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -437,7 +437,7 @@ class CommentController extends Controller return back()->with(Toastr::success('Comment Has Been Deleted.', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } } diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 6dc7df5fd..02d906c0a 100755 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -494,7 +494,7 @@ class ForumController extends Controller return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id]) ->with(Toastr::success('Topic Successfully Edited', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 4603e0541..e9457f330 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -99,7 +99,7 @@ class ImageController extends Controller return redirect()->route('show_album', ['id' => $request->input('new_album')]); } } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -141,7 +141,7 @@ class ImageController extends Controller return redirect()->route('show_album', ['id' => $image->album_id]) ->with(Toastr::success('Image has successfully been deleted', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } } \ No newline at end of file diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php index d4a7bc046..af27ca3c7 100644 --- a/app/Http/Controllers/RequestController.php +++ b/app/Http/Controllers/RequestController.php @@ -743,7 +743,7 @@ class RequestController extends Controller ->with(Toastr::error("Nothing To Unclaim.", 'Whoops!', ['options'])); } } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } } diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php index 67896d766..dd2643e77 100755 --- a/app/Http/Controllers/TorrentController.php +++ b/app/Http/Controllers/TorrentController.php @@ -449,7 +449,7 @@ class TorrentController extends Controller 'torrent' => $torrent ]); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -514,7 +514,7 @@ class TorrentController extends Controller ->with(Toastr::success('Successfully Edited!!!', 'Yay!', ['options'])); } } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -886,7 +886,7 @@ class TorrentController extends Controller return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]) ->with(Toastr::success('Torrent Has Been Bumped To Top Successfully!', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -949,7 +949,7 @@ class TorrentController extends Controller return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]) ->with(Toastr::success('Torrent Sticky Status Has Been Adjusted!', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -990,7 +990,7 @@ class TorrentController extends Controller return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]) ->with(Toastr::success('Torrent FL Has Been Adjusted!', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -1036,7 +1036,7 @@ class TorrentController extends Controller ->with(Toastr::error('Torrent Is Already Featured!', 'Whoops!', ['options'])); } } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -1076,7 +1076,7 @@ class TorrentController extends Controller return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]) ->with(Toastr::success('Torrent DoubleUpload Has Been Adjusted!', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6ce989408..41ac14626 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -411,7 +411,7 @@ class UserController extends Controller return view('user.warninglog', ['warnings' => $warnings, 'warningcount' => $warningcount, 'user' => $user]); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -444,7 +444,7 @@ class UserController extends Controller return redirect()->route('warninglog', ['username' => $warning->warneduser->username, 'id' => $warning->warneduser->id]) ->with(Toastr::success('Warning Was Successfully Deactivated', 'Yay!', ['options'])); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -462,7 +462,7 @@ class UserController extends Controller $torrents = Torrent::withAnyStatus()->sortable(['created_at' => 'desc'])->where('user_id', $user->id)->paginate(50); return view('user.uploads', ['user' => $user, 'torrents' => $torrents]); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -480,7 +480,7 @@ class UserController extends Controller $active = Peer::sortable(['created_at' => 'desc'])->where('user_id', $user->id)->with('torrent')->distinct('hash')->paginate(50); return view('user.active', ['user' => $user, 'active' => $active]); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } @@ -510,7 +510,7 @@ class UserController extends Controller 'his_downl_cre' => $his_downl_cre ]); } else { - abort(403, 'Unauthorized action.'); + return back()->with(Toastr::error('You Are Not Authorized To Perform This Action!', 'Error 403', ['options'])); } } } \ No newline at end of file