mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-05-05 10:11:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Leverage injected request object

Browse Source 
Laravel automatically injects the current Http [request object][1] to all Controller actions and Middleware. Leveraging this object improves consistency and testability.

[1]: https://laravel.com/docs/5.7/requests#accessing-the-request
This commit is contained in:
Laravel Shift
2019-05-09 00:05:13 +00:00
parent b0732954c4
commit 97e88dd68b
48 changed files with 393 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/UserController.php
+70 -70
View File
@@ -189,10 +189,10 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function editProfileForm($username, $id)
public function editProfileForm(Request $request, $username, $id)
{
abort_unless(auth()->user()->id == $id, 403);
$user = auth()->user();
abort_unless($request->user()->id == $id, 403);
$user = $request->user();
return view('user.edit_profile', ['user' => $user, 'route' => 'edit']);
}
@@ -208,8 +208,8 @@ class UserController extends Controller
*/
public function editProfile(Request $request, $username, $id)
{
abort_unless(auth()->user()->id == $id, 403);
$user = auth()->user();
abort_unless($request->user()->id == $id, 403);
$user = $request->user();
// Avatar
$max_upload = config('image.max_upload_size');
if ($request->hasFile('image') && $request->file('image')->getError() == 0) {
@@ -260,10 +260,10 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function settings($slug, $id)
public function settings(Request $request, $slug, $id)
{
abort_unless(auth()->user()->id == $id, 403);
$user = auth()->user();
abort_unless($request->user()->id == $id, 403);
$user = $request->user();
return view('user.settings', ['user' => $user, 'route' => 'settings']);
}
@@ -279,8 +279,8 @@ class UserController extends Controller
*/
public function changeSettings(Request $request, $username, $id)
{
abort_unless(auth()->user()->id == $id, 403);
$user = auth()->user();
abort_unless($request->user()->id == $id, 403);
$user = $request->user();
// General Settings
$user->censor = $request->input('censor');
@@ -319,9 +319,9 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function security($slug, $id)
public function security(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
return view('user.security', ['user' => $user]);
}
@@ -432,7 +432,7 @@ class UserController extends Controller
*/
public function makePrivate(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->private_profile = 1;
$user->save();
@@ -451,7 +451,7 @@ class UserController extends Controller
*/
public function makePublic(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->private_profile = 0;
$user->save();
@@ -470,7 +470,7 @@ class UserController extends Controller
*/
public function disableNotifications(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->block_notifications = 1;
$user->save();
@@ -489,7 +489,7 @@ class UserController extends Controller
*/
public function enableNotifications(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->block_notifications = 0;
$user->save();
@@ -508,7 +508,7 @@ class UserController extends Controller
*/
public function makeHidden(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->hidden = 1;
$user->save();
@@ -527,7 +527,7 @@ class UserController extends Controller
*/
public function makeVisible(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->hidden = 0;
$user->save();
@@ -546,7 +546,7 @@ class UserController extends Controller
*/
public function changePID(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->passkey = md5(uniqid().time().microtime());
$user->save();
@@ -1120,7 +1120,7 @@ class UserController extends Controller
*/
public function changeRID(Request $request, $username, $id)
{
$user = auth()->user();
$user = $request->user();
$user->rsskey = md5(uniqid().time().microtime());
$user->save();
@@ -1139,9 +1139,9 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function privacy($slug, $id)
public function privacy(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
$groups = Group::where('level', '>', 0)->orderBy('level', 'desc')->get();
return view('user.privacy', ['user' => $user, 'groups'=> $groups]);
@@ -1155,9 +1155,9 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function notification($slug, $id)
public function notification(Request $request, $slug, $id)
{
$user = auth()->user();
$user = $request->user();
$groups = Group::where('level', '>', 0)->orderBy('level', 'desc')->get();
return view('user.notification', ['user' => $user, 'groups'=> $groups]);
@@ -1171,11 +1171,11 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function clients($username, $id)
public function clients(Request $request, $username, $id)
{
$user = User::where('id', '=', $id)->firstOrFail();
abort_unless((auth()->user()->group->is_modo || auth()->user()->id == $user->id), 403);
abort_unless(($request->user()->group->is_modo || $request->user()->id == $user->id), 403);
$cli = Client::where('user_id', '=', $user->id)->get();
@@ -1267,9 +1267,9 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getWarnings($username, $id)
public function getWarnings(Request $request, $username, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
abort_unless($request->user()->group->is_modo, 403);
$user = User::findOrFail($id);
$warnings = Warning::where('user_id', '=', $user->id)->with(['torrenttitle', 'warneduser'])->latest('active')->paginate(25);
@@ -1294,10 +1294,10 @@ class UserController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function deactivateWarning($id)
public function deactivateWarning(Request $request, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
$staff = auth()->user();
abort_unless($request->user()->group->is_modo, 403);
$staff = $request->user();
$warning = Warning::findOrFail($id);
$warning->expires_on = Carbon::now();
$warning->active = 0;
@@ -1326,10 +1326,10 @@ class UserController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function deactivateAllWarnings($username, $id)
public function deactivateAllWarnings(Request $request, $username, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
$staff = auth()->user();
abort_unless($request->user()->group->is_modo, 403);
$staff = $request->user();
$user = User::findOrFail($id);
$warnings = Warning::where('user_id', '=', $user->id)->get();
@@ -1362,11 +1362,11 @@ class UserController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function deleteWarning($id)
public function deleteWarning(Request $request, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
abort_unless($request->user()->group->is_modo, 403);
$staff = auth()->user();
$staff = $request->user();
$warning = Warning::findOrFail($id);
// Send Private Message
@@ -1396,11 +1396,11 @@ class UserController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function deleteAllWarnings($username, $id)
public function deleteAllWarnings(Request $request, $username, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
abort_unless($request->user()->group->is_modo, 403);
$staff = auth()->user();
$staff = $request->user();
$user = User::findOrFail($id);
$warnings = Warning::where('user_id', '=', $user->id)->get();
@@ -1433,11 +1433,11 @@ class UserController extends Controller
*
* @return Illuminate\Http\RedirectResponse
*/
public function restoreWarning($id)
public function restoreWarning(Request $request, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
abort_unless($request->user()->group->is_modo, 403);
$staff = auth()->user();
$staff = $request->user();
$warning = Warning::findOrFail($id);
$warning->restore();
@@ -1460,7 +1460,7 @@ class UserController extends Controller
public function myFilter(Request $request, $username, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
if ($request->has('view') && $request->input('view') == 'seeds') {
$history = Peer::with(['torrent' => function ($query) {
@@ -1976,11 +1976,11 @@ class UserController extends Controller
* @param $id
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function wishes($slug, $id)
public function wishes(Request $request, $slug, $id)
{
$user = User::with('wishes')->where('id', '=', $id)->firstOrFail();
abort_unless((auth()->user()->group->is_modo || auth()->user()->id == $user->id), 403);
abort_unless(($request->user()->group->is_modo || $request->user()->id == $user->id), 403);
$wishes = $user->wishes()->latest()->paginate(25);
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $id)->first();
@@ -2000,11 +2000,11 @@ class UserController extends Controller
* @param $id
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function bookmarks($slug, $id)
public function bookmarks(Request $request, $slug, $id)
{
$user = User::with('bookmarks')->where('id', '=', $id)->firstOrFail();
abort_unless((auth()->user()->group->is_modo || auth()->user()->id == $user->id), 403);
abort_unless(($request->user()->group->is_modo || $request->user()->id == $user->id), 403);
$bookmarks = $user->bookmarks()->latest()->paginate(25);
$personal_freeleech = PersonalFreeleech::where('user_id', '=', $id)->first();
@@ -2025,10 +2025,10 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function downloads($slug, $id)
public function downloads(Request $request, $slug, $id)
{
$user = User::findOrFail($id);
if ((auth()->user()->id == $user->id || auth()->user()->group->is_modo)) {
if (($request->user()->id == $user->id || $request->user()->group->is_modo)) {
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
$his_downl = History::where('user_id', '=', $id)->sum('actual_downloaded');
@@ -2096,10 +2096,10 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function requested($slug, $id)
public function requested(Request $request, $slug, $id)
{
$user = User::findOrFail($id);
if ((auth()->user()->id == $user->id || auth()->user()->group->is_modo)) {
if (($request->user()->id == $user->id || $request->user()->group->is_modo)) {
$logger = 'user.private.requests';
$torrentRequests = TorrentRequest::with(['user', 'category'])->where('user_id', '=', $user->id)->latest()->paginate(25);
@@ -2130,11 +2130,11 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function unsatisfieds($username, $id)
public function unsatisfieds(Request $request, $username, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
$his_downl = History::where('user_id', '=', $id)->sum('actual_downloaded');
@@ -2178,11 +2178,11 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function torrents($username, $id)
public function torrents(Request $request, $username, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
$his_downl = History::where('user_id', '=', $id)->sum('actual_downloaded');
@@ -2210,10 +2210,10 @@ class UserController extends Controller
* @param $id
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function resurrections($slug, $id)
public function resurrections(Request $request, $slug, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
$resurrections = Graveyard::with(['torrent', 'user'])->where('user_id', '=', $user->id)->paginate(50);
@@ -2232,10 +2232,10 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function uploads($slug, $id)
public function uploads(Request $request, $slug, $id)
{
$user = User::findOrFail($id);
if (auth()->user()->id == $user->id || auth()->user()->group->is_modo) {
if ($request->user()->id == $user->id || $request->user()->group->is_modo) {
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
$his_downl = History::where('user_id', '=', $id)->sum('actual_downloaded');
@@ -2274,11 +2274,11 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function active($username, $id)
public function active(Request $request, $username, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
@@ -2310,11 +2310,11 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function seeds($username, $id)
public function seeds(Request $request, $username, $id)
{
$user = User::findOrFail($id);
abort_unless(auth()->user()->group->is_modo || auth()->user()->id == $user->id, 403);
abort_unless($request->user()->group->is_modo || $request->user()->id == $user->id, 403);
$his_upl = History::where('user_id', '=', $id)->sum('actual_uploaded');
$his_upl_cre = History::where('user_id', '=', $id)->sum('uploaded');
@@ -2345,9 +2345,9 @@ class UserController extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getBans($username, $id)
public function getBans(Request $request, $username, $id)
{
abort_unless(auth()->user()->group->is_modo, 403);
abort_unless($request->user()->group->is_modo, 403);
$user = User::findOrFail($id);
$bans = Ban::where('owned_by', '=', $user->id)->latest()->get();
@@ -2366,7 +2366,7 @@ class UserController extends Controller
*
* @return \ZipArchive
*/
public function downloadHistoryTorrents($username, $id)
public function downloadHistoryTorrents(Request $request, $username, $id)
{
// Extend The Maximum Execution Time
set_time_limit(300);
@@ -2384,7 +2384,7 @@ class UserController extends Controller
return back()->withErrors('Your Download Rights Have Been Revoked!');
}
abort_unless(auth()->user()->id == $user->id, 403);
abort_unless($request->user()->id == $user->id, 403);
// Define Dir Folder
$path = getcwd().'/files/tmp_zip/';
@@ -2447,9 +2447,9 @@ class UserController extends Controller
*
* @return void
*/
public function acceptRules()
public function acceptRules(Request $request)
{
$user = auth()->user();
$user = $request->user();
$user->read_rules = 1;
$user->save();
}