diff --git a/app/Http/Controllers/AchievementsController.php b/app/Http/Controllers/AchievementsController.php index 228023218..92170e6fd 100755 --- a/app/Http/Controllers/AchievementsController.php +++ b/app/Http/Controllers/AchievementsController.php @@ -12,8 +12,6 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\Auth; - class AchievementsController extends Controller { @@ -25,7 +23,7 @@ class AchievementsController extends Controller */ public function index() { - $user = Auth::user(); + $user = auth()->user(); $achievements = $user->unlockedAchievements(); $locked = $user->lockedAchievements(); $pending = $user->inProgressAchievements(); diff --git a/app/Http/Controllers/AnnounceController.php b/app/Http/Controllers/AnnounceController.php index c06b27f40..88de484b2 100644 --- a/app/Http/Controllers/AnnounceController.php +++ b/app/Http/Controllers/AnnounceController.php @@ -22,8 +22,6 @@ use App\Group; use Carbon\Carbon; use App\Services\Bencode; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Response; -use Illuminate\Support\Facades\Log; class AnnounceController extends Controller { @@ -45,43 +43,43 @@ class AnnounceController extends Controller // If Passkey Is Not Provided Return Error to Client if ($passkey == null) { - Log::notice('Client Attempted To Connect To Announce Without A Passkey'); + //info('Client Attempted To Connect To Announce Without A Passkey'); return response(Bencode::bencode(['failure reason' => 'Please Call Passkey']), 200, ['Content-Type' => 'text/plain']); } // If Infohash Is Not Provided Return Error to Client if (!$request->has('info_hash')) { - Log::notice('Client Attempted To Connect To Announce Without A Infohash'); + //info('Client Attempted To Connect To Announce Without A Infohash'); return response(Bencode::bencode(['failure reason' => 'Missing info_hash']), 200, ['Content-Type' => 'text/plain']); } // If Peerid Is Not Provided Return Error to Client if (!$request->has('peer_id')) { - Log::notice('Client Attempted To Connect To Announce Without A Peerid'); + //info('Client Attempted To Connect To Announce Without A Peerid'); return response(Bencode::bencode(['failure reason' => 'Missing peer_id']), 200, ['Content-Type' => 'text/plain']); } // If Port Is Not Provided Return Error to Client if (!$request->has('port')) { - Log::notice('Client Attempted To Connect To Announce Without A Specified Port'); + //info('Client Attempted To Connect To Announce Without A Specified Port'); return response(Bencode::bencode(['failure reason' => 'Missing port']), 200, ['Content-Type' => 'text/plain']); } // If "Left" Is Not Provided Return Error to Client if (!$request->has('left')) { - Log::notice('Client Attempted To Connect To Announce Without Supplying Any "Left" Information'); + //info('Client Attempted To Connect To Announce Without Supplying Any "Left" Information'); return response(Bencode::bencode(['failure reason' => 'Missing left']), 200, ['Content-Type' => 'text/plain']); } // If "Upload" Is Not Provided Return Error to Client if (!$request->has('uploaded')) { - Log::notice('Client Attempted To Connect To Announce Without Supplying Any "Upload" Information'); + //info('Client Attempted To Connect To Announce Without Supplying Any "Upload" Information'); return response(Bencode::bencode(['failure reason' => 'Missing upload']), 200, ['Content-Type' => 'text/plain']); } // If "Download" Is Not Provided Return Error to Client if (!$request->has('downloaded')) { - Log::notice('Client Attempted To Connect To Announce Without Supplying Any "Download" Information'); + //info('Client Attempted To Connect To Announce Without Supplying Any "Download" Information'); return response(Bencode::bencode(['failure reason' => 'Missing download']), 200, ['Content-Type' => 'text/plain']); } @@ -90,25 +88,25 @@ class AnnounceController extends Controller // If Passkey Doesnt Exsist Return Error to Client if (!$user) { - Log::notice('Client Attempted To Connect To Announce With A Invalid Passkey'); + //info('Client Attempted To Connect To Announce With A Invalid Passkey'); return response(Bencode::bencode(['failure reason' => 'Passkey is invalid']), 200, ['Content-Type' => 'text/plain']); } // If User Is Banned Return Error to Client if ($user->group->id == 5) { - Log::notice('A Banned User (' . $user->username . ') Attempted To Announce'); + //info('A Banned User (' . $user->username . ') Attempted To Announce'); return response(Bencode::bencode(['failure reason' => 'You are no longer welcome here']), 200, ['Content-Type' => 'text/plain']); } // If User Account Is Unactivated Return Error to Client if ($user->active == 0) { - Log::notice('A Unactivated User (' . $user->username . ') Attempted To Announce'); + //info('A Unactivated User (' . $user->username . ') Attempted To Announce'); return response(Bencode::bencode(['failure reason' => 'Your account is not activated']), 200, ['Content-Type' => 'text/plain']); } // If User Is Validating Return Error to Client if ($user->group->id == 1) { - Log::notice('A Validating User (' . $user->username . ') Attempted To Announce'); + //info('A Validating User (' . $user->username . ') Attempted To Announce'); return response(Bencode::bencode(['failure reason' => 'Your account is still validating']), 200, ['Content-Type' => 'text/plain']); } @@ -135,30 +133,30 @@ class AnnounceController extends Controller // If User Download Rights Are Disabled Return Error to Client if ($user->can_download == 0 && $left != 0) { - Log::notice('A User With Revoked Download Priviliges Attempted To Announce'); + //info('A User With Revoked Download Priviliges Attempted To Announce'); return response(Bencode::bencode(['failure reason' => 'You download priviliges are Revoked']), 200, ['Content-Type' => 'text/plain']); } // If User Client Is Sending Negitive Values Return Error to Client if ($uploaded < 0 || $downloaded < 0 || $left < 0) { - Log::notice('Client Attempted To Send Data With A Negitive Value'); + //info('Client Attempted To Send Data With A Negitive Value'); return response(Bencode::bencode(['failure reason' => 'Data from client is a negative value']), 200, ['Content-Type' => 'text/plain']); } // If User Client Does Not Support Compact Return Error to Client if (!$compact) { - Log::notice('Client Attempted To Connect To Announce But Doesnt Suppport Compact'); + //info('Client Attempted To Connect To Announce But Doesnt Suppport Compact'); return response(Bencode::bencode(['failure reason' => "Your client doesn't support compact, please update your client"]), 200, ['Content-Type' => 'text/plain']); } // If Infohash Is Not 20 Bytes Long Return Error to Client /*if (strlen($hash) != 20) { - Log::notice('sent invalid info_hash: ' . $hash); + info('sent invalid info_hash: ' . $hash); return response(Bencode::bencode(['failure reason' => "Invalid infohash: infohash is not 20 bytes long."]), 200, ['Content-Type' => 'text/plain']); } // If Peerid Is Not 20 Bytes Long Return Error to Client if (strlen($peer_id) != 20) { - Log::notice('sent invalid peer_id: ' . $peer_id); + info('sent invalid peer_id: ' . $peer_id); return response(Bencode::bencode(['failure reason' => "Invalid peerid: peerid is not 20 bytes long."]), 200, ['Content-Type' => 'text/plain']); }*/ // Check Info Hash Agaist Torrents Table @@ -166,19 +164,19 @@ class AnnounceController extends Controller // If Torrent Doesnt Exsist Return Error to Client if (!$torrent || $torrent->id < 0) { - Log::notice('Client Attempted To Connect To Announce But The Torrent Doesnt Exsist Using Hash ' . $hash); + //info('Client Attempted To Connect To Announce But The Torrent Doesnt Exsist Using Hash ' . $hash); return response(Bencode::bencode(['failure reason' => 'Torrent not found']), 200, ['Content-Type' => 'text/plain']); } // If Torrent Is Pending Moderation Return Error to Client if ($torrent->status == 0) { - Log::notice('Client Attempted To Connect To Announce But The Torrent Is Pending Moderation'); + //info('Client Attempted To Connect To Announce But The Torrent Is Pending Moderation'); return response(Bencode::bencode(['failure reason' => 'Torrent is still pending moderation']), 200, ['Content-Type' => 'text/plain']); } // If Torrent Is Rejected Return Error to Client if ($torrent->status == 2) { - Log::notice('Client Attempted To Connect To Announce But The Torrent Is Rejected'); + //info('Client Attempted To Connect To Announce But The Torrent Is Rejected'); return response(Bencode::bencode(['failure reason' => 'Torrent has been rejected']), 200, ['Content-Type' => 'text/plain']); } @@ -214,7 +212,7 @@ class AnnounceController extends Controller // If Users Peer Count On A Single Torrent Is Greater Than 3 Return Error to Client if ($limit > 3) { - Log::notice('Client Attempted To Connect To Announce But Has Hit Rate Limits'); + //info('Client Attempted To Connect To Announce But Has Hit Rate Limits'); return response(Bencode::bencode(['failure reason' => 'You have reached the rate limit']), 200, ['Content-Type' => 'text/plain']); } @@ -457,7 +455,7 @@ class AnnounceController extends Controller $blockedBrowsers = config('client-blacklist.browsers', []); foreach ($blockedBrowsers as $b) { if ($b == $client) { - Log::notice('Blacklist Browser Attempted To Connect To Announce'); + info('Blacklist Browser Attempted To Connect To Announce'); abort(405, "You Cannot Access This Through A Browser Bro!"); die(); } @@ -467,7 +465,7 @@ class AnnounceController extends Controller $blockedClients = config('client-blacklist.clients', []); foreach ($blockedClients as $blocked) { if ($blocked == $client) { - Log::notice('Blacklist Client Attempted To Connect To Announce'); + info('Blacklist Client Attempted To Connect To Announce'); return response(Bencode::bencode(['failure reason' => 'The Client You Are Trying To Use Has Been Blacklisted']), 200, ['Content-Type' => 'text/plain']); } } @@ -477,7 +475,7 @@ class AnnounceController extends Controller { // Check Announce Request Method if ($_SERVER['REQUEST_METHOD'] != 'GET') { - Log::notice('Announce Request Method Was Not GET'); + info('Announce Request Method Was Not GET'); return response(Bencode::bencode(['failure reason' => 'Invalid Request Type: Client Request Was Not A HTTP GET.']), 200, ['Content-Type' => 'text/plain']); } } diff --git a/app/Http/Controllers/BonusController.php b/app/Http/Controllers/BonusController.php index 6c2b0b6e0..23fabc1f5 100755 --- a/app/Http/Controllers/BonusController.php +++ b/app/Http/Controllers/BonusController.php @@ -12,6 +12,8 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use App\User; use App\BonExchange; use App\BonTransactions; @@ -19,13 +21,8 @@ use App\Shoutbox; use App\PrivateMessage; use App\PersonalFreeleech; use App\Torrent; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; use Carbon\Carbon; use \Toastr; -use Cache; class BonusController extends Controller { @@ -39,7 +36,7 @@ class BonusController extends Controller */ public function bonus() { - $user = Auth::user(); + $user = auth()->user(); $users = User::orderBy('username', 'ASC')->get(); $userbon = $user->getSeedbonus(); $activefl = PersonalFreeleech::where('user_id', '=', $user->id)->first(); @@ -101,7 +98,7 @@ class BonusController extends Controller */ public function exchange($id) { - $user = Auth::user(); + $user = auth()->user(); $userbon = $user->seedbonus; $BonExchange = new BonExchange(); @@ -185,25 +182,25 @@ class BonusController extends Controller * * @return void */ - public function gift() + public function gift(Request $request) { - $user = Auth::user(); + $user = auth()->user(); - if (Request::isMethod('post')) { - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST')) { + $v = validator($request->all(), [ 'to_username' => "required|exists:users,username|max:180", 'bonus_points' => "required|numeric|min:1|max:{$user->seedbonus}", 'bonus_message' => "required|string" ]); if ($v->passes()) { - $recipient = User::where('username', 'LIKE', Request::get('to_username'))->first(); + $recipient = User::where('username', 'LIKE', $request->input('to_username'))->first(); if (!$recipient || $recipient->id == $user->id) { return redirect('/bonus')->with(Toastr::error('Unable to find specified user', 'Whoops!', ['options'])); } - $value = Request::get('bonus_points'); + $value = $request->input('bonus_points'); $recipient->seedbonus += $value; $recipient->save(); @@ -216,7 +213,7 @@ class BonusController extends Controller 'cost' => $value, 'sender' => $user->id, 'receiver' => $recipient->id, - 'comment' => Request::get('bonus_message'), + 'comment' => $request->input('bonus_message'), 'torrent_id' => null ]); $transaction->save(); @@ -224,7 +221,7 @@ class BonusController extends Controller $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has gifted " . $value . "BON to [url={$appurl}/" . $recipient->username . "." . $recipient->id . "]" . $recipient->username . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); PrivateMessage::create(['sender_id' => $user->id, 'reciever_id' => $recipient->id, 'subject' => "You Have Recieved A Gift", 'message' => $transaction->comment]); @@ -244,13 +241,13 @@ class BonusController extends Controller * * @return void */ - public function tipUploader($slug, $id) + public function tipUploader(Request $request, $slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $torrent = Torrent::withAnyStatus()->findOrFail($id); $uploader = User::where('id', '=', $torrent->user_id)->first(); - $tip_amount = Request::get('tip'); + $tip_amount = $request->input('tip'); if ($tip_amount > $user->seedbonus) { return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your To Broke To Tip The Uploader!', 'Whoops!', ['options'])); } @@ -294,7 +291,7 @@ class BonusController extends Controller */ public function getDyingCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -315,7 +312,7 @@ class BonusController extends Controller */ public function getLegendaryCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -336,7 +333,7 @@ class BonusController extends Controller */ public function getOldCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -358,7 +355,7 @@ class BonusController extends Controller */ public function getHugeCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -378,7 +375,7 @@ class BonusController extends Controller */ public function getLargeCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -399,7 +396,7 @@ class BonusController extends Controller */ public function getRegularCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('peers') ->select('peers.hash')->distinct() @@ -420,7 +417,7 @@ class BonusController extends Controller */ public function getParticipaintSeedCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('history') ->select('history.seedtime')->distinct() @@ -441,7 +438,7 @@ class BonusController extends Controller */ public function getTeamPlayerSeedCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('history') ->select('history.seedtime')->distinct() @@ -462,7 +459,7 @@ class BonusController extends Controller */ public function getCommitedSeedCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('history') ->select('history.seedtime')->distinct() @@ -483,7 +480,7 @@ class BonusController extends Controller */ public function getMVPSeedCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('history') ->select('history.seedtime')->distinct() @@ -504,7 +501,7 @@ class BonusController extends Controller */ public function getLegendarySeedCount() { - $user = Auth::user(); + $user = auth()->user(); return DB::table('history') ->select('history.seedtime')->distinct() diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index ed2cb97e9..5db28375b 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -12,10 +12,6 @@ namespace App\Http\Controllers; -use App\Bookmark; -use App\Torrent; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; use \Toastr; class BookmarkController extends Controller @@ -30,7 +26,7 @@ class BookmarkController extends Controller */ public function bookmarks() { - $myBookmarks = Auth::user()->bookmarks; + $myBookmarks = auth()->user()->bookmarks; return view('bookmark.bookmarks', ['myBookmarks' => $myBookmarks]); } @@ -43,7 +39,7 @@ class BookmarkController extends Controller */ public function unBookmark($id) { - Auth::user()->bookmarks()->detach($id); + auth()->user()->bookmarks()->detach($id); return redirect()->back()->with(Toastr::success('Torrent Has Been Unbookmarked Successfully!', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/BugController.php b/app/Http/Controllers/BugController.php index af29b152b..0af08f43f 100755 --- a/app/Http/Controllers/BugController.php +++ b/app/Http/Controllers/BugController.php @@ -12,11 +12,10 @@ namespace App\Http\Controllers; -use App\Group; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Mail; use App\User; use App\Mail\Bug; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Mail; use \Toastr; class BugController extends Controller @@ -29,13 +28,13 @@ class BugController extends Controller * @access public * @return view::make bug.bug */ - public function bug() + public function bug(Request $request) { // Fetch owner account $user = User::where('id', '=', '3')->first(); - if (Request::getMethod() == 'POST') { - $input = Request::all(); + if ($request->isMethod('POST')) { + $input = $request->all(); Mail::to($user->email, $user->username)->send(new Bug($input)); diff --git a/app/Http/Controllers/CatalogController.php b/app/Http/Controllers/CatalogController.php index d26a5c9ac..4d6c5c558 100644 --- a/app/Http/Controllers/CatalogController.php +++ b/app/Http/Controllers/CatalogController.php @@ -15,7 +15,6 @@ namespace App\Http\Controllers; use App\CatalogTorrent; use App\Catalog; use App\Torrent; -use Illuminate\Support\Facades\Auth; class CatalogController extends Controller { @@ -43,7 +42,7 @@ class CatalogController extends Controller */ public function catalog($slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $catalog = Catalog::findOrFail($id); $records = CatalogTorrent::where('catalog_id', '=', $id)->orderBy('imdb', 'DESC')->get(); @@ -60,7 +59,7 @@ class CatalogController extends Controller */ public function torrents($imdb) { - $user = Auth::user(); + $user = auth()->user(); $torrents = Torrent::where('imdb', '=', $imdb)->orderBy('size', 'DESC')->get(); return view('catalogs.torrents', ['torrents' => $torrents, 'user' => $user]); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index cc44bd1da..1d852eaae 100755 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers; use App\Category; -use Illuminate\Support\Facades\Auth; class CategoryController extends Controller { @@ -28,9 +27,9 @@ class CategoryController extends Controller */ public function category($slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $category = Category::findOrFail($id); - $torrents = $category->torrents()->orderBy('created_at', 'DESC')->paginate(20); + $torrents = $category->torrents()->orderBy('created_at', 'DESC')->paginate(25); return view('category.category', ['torrents' => $torrents, 'user' => $user, 'category' => $category, 'categories' => Category::all()->sortBy('position')]); } diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 438f421f9..06554426c 100755 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; use App\User; use App\Article; use App\Comment; @@ -19,14 +20,6 @@ use App\Torrent; use App\Requests; use App\Shoutbox; use App\PrivateMessage; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Mail; -use \Toastr; -use Cache; - use App\Achievements\UserMadeComment; use App\Achievements\UserMadeTenComments; use App\Achievements\UserMade50Comments; @@ -39,9 +32,9 @@ use App\Achievements\UserMade600Comments; use App\Achievements\UserMade700Comments; use App\Achievements\UserMade800Comments; use App\Achievements\UserMade900Comments; - use App\Notifications\NewTorrentComment; use App\Notifications\NewRequestComment; +use \Toastr; class CommentController extends Controller { @@ -53,10 +46,10 @@ class CommentController extends Controller * @param $id * */ - public function article($slug, $id) + public function article(Request $request, $slug, $id) { $article = Article::findOrFail($id); - $user = Auth::user(); + $user = auth()->user(); // User's comment rights disbabled? if ($user->can_comment == 0) { @@ -64,14 +57,14 @@ class CommentController extends Controller } $comment = new Comment(); - $comment->content = Request::get('content'); + $comment->content = $request->input('content'); $comment->user_id = $user->id; $comment->article_id = $article->id; - $v = Validator::make($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'article_id' => 'required']); + $v = validator($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'article_id' => 'required']); $appurl = config('app.url'); if ($v->passes()) { Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on article [url={$appurl}/articles/" . $article->slug . "." . $article->id . "]" . $article->title . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); $comment->save(); Toastr::success('Your Comment Has Been Added!', 'Yay!', ['options']); } else { @@ -86,10 +79,10 @@ class CommentController extends Controller * @param $slug * @param $id */ - public function torrent($slug, $id) + public function torrent(Request $request, $slug, $id) { $torrent = Torrent::findOrFail($id); - $user = Auth::user(); + $user = auth()->user(); // User's comment rights disbabled? if ($user->can_comment == 0) { @@ -97,11 +90,11 @@ class CommentController extends Controller } $comment = new Comment(); - $comment->content = Request::get('content'); - $comment->anon = Request::get('anonymous'); + $comment->content = $request->input('content'); + $comment->anon = $request->input('anonymous'); $comment->user_id = $user->id; $comment->torrent_id = $torrent->id; - $v = Validator::make($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'torrent_id' => 'required', 'anon' => 'required']); + $v = validator($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'torrent_id' => 'required', 'anon' => 'required']); if ($v->passes()) { $comment->save(); Toastr::success('Your Comment Has Been Added!', 'Yay!', ['options']); @@ -129,10 +122,10 @@ class CommentController extends Controller $appurl = config('app.url'); if ($comment->anon == 0) { Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on Torrent [url={$appurl}/torrents/" . $torrent->slug . "." . $torrent->id . "]" . $torrent->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); } else { Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "An anonymous user has left a comment on torrent [url={$appurl}/torrents/" . $torrent->slug . "." . $torrent->id . "]" . $torrent->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); } } else { Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); @@ -146,10 +139,10 @@ class CommentController extends Controller * @param $slug * @param $id */ - public function request($id) + public function request(Request $request, $id) { $request = Requests::findOrFail($id); - $user = Auth::user(); + $user = auth()->user(); // User's comment rights disbabled? if ($user->can_comment == 0) { @@ -157,11 +150,11 @@ class CommentController extends Controller } $comment = new Comment(); - $comment->content = Request::get('content'); - $comment->anon = Request::get('anonymous'); + $comment->content = $request->input('content'); + $comment->anon = $request->input('anonymous'); $comment->user_id = $user->id; $comment->requests_id = $request->id; - $v = Validator::make($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'requests_id' => 'required']); + $v = validator($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'requests_id' => 'required']); if ($v->passes()) { $comment->save(); Toastr::success('Your Comment Has Been Added!', 'Yay!', ['options']); @@ -190,10 +183,10 @@ class CommentController extends Controller // Auto Shout if ($comment->anon == 0) { Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on Request [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); } else { Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "An anonymous user has left a comment on request [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); } } else { Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); @@ -210,7 +203,7 @@ class CommentController extends Controller public function quickthanks($id) { $torrent = Torrent::findOrFail($id); - $user = Auth::user(); + $user = auth()->user(); $uploader = $torrent->user; // User's comment rights disbabled? @@ -224,7 +217,7 @@ class CommentController extends Controller $comment->content = $thankArray[$selected]; $comment->user_id = $user->id; $comment->torrent_id = $torrent->id; - $v = Validator::make($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'torrent_id' => 'required']); + $v = validator($comment->toArray(), ['content' => 'required', 'user_id' => 'required', 'torrent_id' => 'required']); if ($v->passes()) { $comment->save(); Toastr::success('Your Comment Has Been Added!', 'Yay!', ['options']); @@ -251,7 +244,7 @@ class CommentController extends Controller // Auto Shout $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on Torrent [url={$appurl}/torrents/" . $torrent->slug . "." . $torrent->id . "]" . $torrent->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); } else { Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Whoops!', ['options']); } @@ -265,13 +258,13 @@ class CommentController extends Controller * * @param $comment_id */ - public function editComment($comment_id) + public function editComment(Request $request, $comment_id) { - $user = Auth::user(); + $user = auth()->user(); $comment = Comment::findOrFail($comment_id); if ($user->group->is_modo || $user->id == $comment->user_id) { - $content = Request::get('comment-edit'); + $content = $request->input('comment-edit'); $comment->content = $content; $comment->save(); @@ -289,7 +282,7 @@ class CommentController extends Controller */ public function deleteComment($comment_id) { - $user = Auth::user(); + $user = auth()->user(); $comment = Comment::findOrFail($comment_id); if ($user->group->is_modo || $user->id == $comment->user_id) { diff --git a/app/Http/Controllers/FollowController.php b/app/Http/Controllers/FollowController.php index 2f789930c..9aa911ce1 100644 --- a/app/Http/Controllers/FollowController.php +++ b/app/Http/Controllers/FollowController.php @@ -14,8 +14,6 @@ namespace App\Http\Controllers; use App\User; use App\Follow; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use \Toastr; class FollowController extends Controller @@ -29,11 +27,11 @@ class FollowController extends Controller */ public function follow(User $user) { - if (Auth::user()->id == $user->id) { + if (auth()->user()->id == $user->id) { return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error("Nice try, but sadly you can not follow yourself.", 'Whoops!', ['options'])); - } elseif (!Auth::user()->isFollowing($user->id)) { + } elseif (!auth()->user()->isFollowing($user->id)) { // Create a new follow instance for the authenticated user - Auth::user()->follows()->create([ + auth()->user()->follows()->create([ 'target_id' => $user->id, ]); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are now following ' . $user->username, 'Yay!', ['options'])); @@ -50,8 +48,8 @@ class FollowController extends Controller */ public function unfollow(User $user) { - if (Auth::user()->isFollowing($user->id)) { - $follow = Auth::user()->follows()->where('target_id', $user->id)->first(); + if (auth()->user()->isFollowing($user->id)) { + $follow = auth()->user()->follows()->where('target_id', $user->id)->first(); $follow->delete(); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are no longer following ' . $user->username, 'Yay!', ['options'])); diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 650311303..4bcb7645e 100755 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -12,22 +12,14 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Mail; use App\Forum; -use App\Mail\NewReply; use App\Post; use App\Topic; use App\User; use App\Shoutbox; use App\Like; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\DB; -use Decoda\Decoda; -use Cache; -use \Toastr; use App\Achievements\UserMadeFirstPost; use App\Achievements\UserMade25Posts; use App\Achievements\UserMade50Posts; @@ -40,6 +32,9 @@ use App\Achievements\UserMade600Posts; use App\Achievements\UserMade700Posts; use App\Achievements\UserMade800Posts; use App\Achievements\UserMade900Posts; +use App\Mail\NewReply; +use Decoda\Decoda; +use \Toastr; class ForumController extends Controller { @@ -51,15 +46,15 @@ class ForumController extends Controller * @return View page.torrents * */ - public function search() + public function search(Request $request) { - $user = Auth::user(); - $search = Request::get('name'); + $user = auth()->user(); + $search = $request->input('name'); $results = Topic::where([ - ['name', 'like', '%' . Request::get('name') . '%'], + ['name', 'like', '%' . $request->input('name') . '%'], ])->orderBy('created_at', 'DESC')->paginate(25); - $results->setPath('?name=' . Request::get('name')); + $results->setPath('?name=' . $request->input('name')); return view('forum.results', ['results' => $results, 'user' => $user]); } @@ -72,11 +67,11 @@ class ForumController extends Controller { $categories = Forum::orderBy('position', 'ASC')->get(); // Total Forums Count - $num_forums = DB::table('forums')->count(); + $num_forums = Forum::all()->count(); // Total Posts Count - $num_posts = DB::table('posts')->count(); + $num_posts = Post::all()->count(); // Total Topics Count - $num_topics = DB::table('topics')->count(); + $num_topics = Topic::all()->count(); return view('forum.index', ['categories' => $categories, 'num_posts' => $num_posts, 'num_forums' => $num_forums, 'num_topics' => $num_topics]); } @@ -145,7 +140,7 @@ class ForumController extends Controller $category = $forum->getCategory(); // Get all posts - $posts = $topic->posts()->paginate(15); + $posts = $topic->posts()->paginate(25); // First post $firstPost = Post::where('topic_id', '=', $topic->id)->first(); @@ -169,24 +164,24 @@ class ForumController extends Controller * @param $slug * @param $id */ - public function reply($slug, $id) + public function reply(Request $request, $slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $topic = Topic::findOrFail($id); $forum = $topic->forum; $category = $forum->getCategory(); // The user has the right to create a topic here? - if (!$category->getPermission()->reply_topic || ($topic->state == "close" && !Auth::user()->group->is_modo)) { + if (!$category->getPermission()->reply_topic || ($topic->state == "close" && !auth()->user()->group->is_modo)) { return redirect()->route('forum_index')->with(Toastr::error('You Cannot Reply To This Topic!', 'Whoops!', ['options'])); } $post = new Post(); - $post->content = Request::get('content'); + $post->content = $request->input('content'); $post->user_id = $user->id; $post->topic_id = $topic->id; - $v = Validator::make($post->toArray(), [ + $v = validator($post->toArray(), [ 'content' => 'required', 'user_id' => 'required', 'topic_id' => 'required' @@ -223,7 +218,7 @@ class ForumController extends Controller // Post To ShoutBox $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a reply on topic [url={$appurl}/forums/topic/" . $topic->slug . "." . $topic->id . "?page={$post->getPageNumber()}#post-{$post->id}" . "]" . $topic->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); // Mail Topic Creator Of New Reply if ($post->user_id != $topic->first_post_user_id) { @@ -256,9 +251,9 @@ class ForumController extends Controller * @param $slug * @param $id */ - public function newTopic($slug, $id) + public function newTopic(Request $request, $slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $forum = Forum::findOrFail($id); $category = $forum->getCategory(); @@ -269,8 +264,8 @@ class ForumController extends Controller // Preview The Post $parsedContent = null; - if (Request::getMethod() == 'POST' && Request::get('preview') == true) { - $code = new Decoda(Request::get('content')); + if ($request->isMethod('POST') && $request->input('preview') == true) { + $code = new Decoda($request->input('content')); $code->defaults(); $code->setXhtml(false); $code->setStrict(false); @@ -278,26 +273,26 @@ class ForumController extends Controller $parsedContent = $code->parse(); } - if (Request::getMethod() == 'POST' && Request::get('post') == true) { + if ($request->isMethod('POST') && $request->input('post') == true) { // Create The Topic $topic = new Topic(); - $topic->name = Request::get('title'); - $topic->slug = str_slug(Request::get('title')); + $topic->name = $request->input('title'); + $topic->slug = str_slug($request->input('title')); $topic->state = 'open'; $topic->first_post_user_id = $topic->last_post_user_id = $user->id; $topic->first_post_user_username = $topic->last_post_user_username = $user->username; $topic->views = 0; $topic->pinned = false; $topic->forum_id = $forum->id; - $v = Validator::make($topic->toArray(), $topic->rules); + $v = validator($topic->toArray(), $topic->rules); if ($v->passes()) { $topic->save(); $post = new Post(); - $post->content = Request::get('content'); + $post->content = $request->input('content'); $post->user_id = $user->id; $post->topic_id = $topic->id; - $v = Validator::make($post->toArray(), $post->rules); + $v = validator($post->toArray(), $post->rules); if ($v->passes()) { $post->save(); $topic->num_post = 1; @@ -315,7 +310,7 @@ class ForumController extends Controller // Post To ShoutBox $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has created a new topic [url={$appurl}/forums/topic/" . $topic->slug . "." . $topic->id . "]" . $topic->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); //Achievements $user->unlock(new UserMadeFirstPost(), 1); @@ -341,7 +336,7 @@ class ForumController extends Controller Toastr::error('A Error Has Occured With This Topic! Please Try Again!', 'Whoops!', ['options']); } } - return view('forum.new_topic', ['forum' => $forum, 'category' => $category, 'parsedContent' => $parsedContent, 'title' => Request::get('title'), 'content' => Request::get('content')]); + return view('forum.new_topic', ['forum' => $forum, 'category' => $category, 'parsedContent' => $parsedContent, 'title' => $request->input('title'), 'content' => $request->input('content')]); } /** @@ -350,16 +345,16 @@ class ForumController extends Controller * @param $slug * @param $id */ - public function editTopic($slug, $id) + public function editTopic(Request $request, $slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $topic = Topic::findOrFail($id); $categories = Forum::where('parent_id', '!=', 0)->get(); if ($user->group->is_modo) { - if (Request::isMethod('post')) { - $name = Request::get('name'); - $forum_id = Request::get('forum_id'); + if ($request->isMethod('POST')) { + $name = $request->input('name'); + $forum_id = $request->input('forum_id'); $topic->name = $name; $topic->forum_id = $forum_id; @@ -381,9 +376,9 @@ class ForumController extends Controller * @param $id * @param $postId */ - public function postEdit($slug, $id, $postId) + public function postEdit(Request $request, $slug, $id, $postId) { - $user = Auth::user(); + $user = auth()->user(); $topic = Topic::findOrFail($id); $forum = $topic->forum; $category = $forum->getCategory(); @@ -397,15 +392,15 @@ class ForumController extends Controller } // Post preview - if (Request::getMethod() == 'POST' && Request::get('preview') == true) { - $post->content = Request::get('content'); + if ($request->isMethod('POST') && $request->input('preview') == true) { + $post->content = $request->input('content'); $code = new Decoda($post->content); $code->defaults(); $parsedContent = $code->parse(); } - if (Request::isMethod('post') && Request::get('post') == true) { - $post->content = Request::get('content'); + if ($request->isMethod('POST') && $request->input('post') == true) { + $post->content = $request->input('content'); $post->save(); return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id]); } @@ -421,7 +416,7 @@ class ForumController extends Controller */ public function postDelete($slug, $id, $postId) { - $user = Auth::user(); + $user = auth()->user(); $topic = Topic::findOrFail($id); $post = Post::findOrFail($postId); @@ -478,7 +473,7 @@ class ForumController extends Controller */ public function deleteTopic($slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $topic = Topic::findOrFail($id); if ($user->group->is_modo == true) { $posts = $topic->posts(); @@ -624,7 +619,7 @@ class ForumController extends Controller public function likePost($postId) { $post = Post::findOrFail($postId); - $user = Auth::user(); + $user = auth()->user(); $like = $user->likes()->where('post_id', '=', $post->id)->where('like', '=', 1)->first(); $dislike = $user->likes()->where('post_id', '=', $post->id)->where('dislike', '=', 1)->first(); @@ -646,7 +641,7 @@ class ForumController extends Controller public function dislikePost($postId) { $post = Post::findOrFail($postId); - $user = Auth::user(); + $user = auth()->user(); $like = $user->likes()->where('post_id', '=', $post->id)->where('like', '=', 1)->first(); $dislike = $user->likes()->where('post_id', '=', $post->id)->where('dislike', '=', 1)->first(); diff --git a/app/Http/Controllers/GraveyardController.php b/app/Http/Controllers/GraveyardController.php index 2a5e6e04d..2d8b4eef8 100644 --- a/app/Http/Controllers/GraveyardController.php +++ b/app/Http/Controllers/GraveyardController.php @@ -12,9 +12,7 @@ namespace App\Http\Controllers; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Input; +use Illuminate\Http\Request; use App\Torrent; use App\History; use App\Graveyard; @@ -33,7 +31,7 @@ class GraveyardController extends Controller */ public function index() { - $user = Auth::user(); + $user = auth()->user(); $dead = Torrent::where('seeders', '=', '0')->orderBy('leechers', 'desc')->paginate(50); $deadcount = Torrent::where('seeders', '=', '0')->count(); $time = config('graveyard.time'); @@ -42,9 +40,9 @@ class GraveyardController extends Controller return view('graveyard.index', compact('dead', 'deadcount', 'user', 'time', 'tokens')); } - public function resurrect($id) + public function resurrect(Request $request, $id) { - $user = Auth::user(); + $user = auth()->user(); $torrent = Torrent::findOrFail($id); $resurrected = Graveyard::where('torrent_id', '=', $torrent->id)->first(); if ($resurrected) { @@ -54,7 +52,7 @@ class GraveyardController extends Controller $resurrection = Graveyard::create([ 'user_id' => $user->id, 'torrent_id' => $torrent->id, - 'seedtime' => Request::get('seedtime') + 'seedtime' => $request->input('seedtime') ]); return redirect()->route('graveyard')->with(Toastr::success('Torrent Resurrection Complete! You will be rewarded automatically once seedtime requirements are met.', 'Yay!', ['options'])); } else { diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php deleted file mode 100755 index bb50c0812..000000000 --- a/app/Http/Controllers/GroupController.php +++ /dev/null @@ -1,22 +0,0 @@ -first(); - if (Request::getMethod() == 'POST') { - $input = Request::all(); + if ($request->isMethod('POST')) { + $input = $request->all(); Mail::to($user->email, $user->username)->send(new Contact($input)); Toastr::success('Your Message Was Succefully Sent!', 'Yay!', ['options']); } diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index 81fca6e81..03e886fc5 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -12,17 +12,11 @@ namespace App\Http\Controllers; -use App\Mail\InviteUser; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Mail; use App\User; use App\Invite; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; -use Illuminate\Contracts\Auth\Authenticatable; -use App\Http\Requests\ValidateSecretRequest; -use Illuminate\Support\Facades\Input; +use App\Mail\InviteUser; use \Toastr; use Carbon\Carbon; use Ramsey\Uuid\Uuid; @@ -32,7 +26,7 @@ class InviteController extends Controller public function invite() { - $user = Auth::user(); + $user = auth()->user(); if (config('other.invite-only') == false) { Toastr::error('Invitations Are Disabled Due To Open Registration!', 'Whoops!', ['options']); } @@ -45,9 +39,9 @@ class InviteController extends Controller public function process(Request $request) { $current = new Carbon(); - $user = Auth::user(); - $exsist = Invite::where('email', '=', $request->get('email'))->first(); - $member = User::where('email', '=', $request->get('email'))->first(); + $user = auth()->user(); + $exsist = Invite::where('email', '=', $request->input('email'))->first(); + $member = User::where('email', '=', $request->input('email'))->first(); if ($exsist || $member) { return redirect()->route('invite')->with(Toastr::error('The email address your trying to send a invite to has already been sent one or is a user already.', 'Whoops!', ['options'])); } @@ -59,14 +53,14 @@ class InviteController extends Controller //create a new invite record $invite = Invite::create([ 'user_id' => $user->id, - 'email' => $request->get('email'), + 'email' => $request->input('email'), 'code' => $code, 'expires_on' => $current->copy()->addDays(14), - 'custom' => $request->get('message'), + 'custom' => $request->input('message'), ]); // send the email - Mail::to($request->get('email'))->send(new InviteUser($invite)); + Mail::to($request->input('email'))->send(new InviteUser($invite)); // subtract 1 invite $user->invites -= 1; @@ -80,11 +74,11 @@ class InviteController extends Controller public function inviteTree($username, $id) { - if (Auth::user()->group->is_modo) { + if (auth()->user()->group->is_modo) { $user = User::findOrFail($id); $records = Invite::with('sender')->where('user_id', $user->id)->orderBy('created_at', 'desc')->get(); } else { - $user = Auth::user(); + $user = auth()->user(); $records = Invite::with('sender')->where('user_id', $user->id)->orderBy('created_at', 'desc')->get(); } return view('user.invitetree', ['user' => $user, 'records' => $records]); diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php index d936e4767..e26bd132f 100644 --- a/app/Http/Controllers/LanguageController.php +++ b/app/Http/Controllers/LanguageController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Auth; use App\Language; class LanguageController extends Controller @@ -31,8 +30,8 @@ class LanguageController extends Controller $locale = config('app.locale'); } - if (Auth::check()) { - Auth::user()->setAttribute('locale', $locale)->save(); + if (auth()->check()) { + auth()->user()->setAttribute('locale', $locale)->save(); } else { $request->session()->put('locale', $locale); } diff --git a/app/Http/Controllers/LockAccountController.php b/app/Http/Controllers/LockAccountController.php index 6cf5ced25..7edbd07b4 100644 --- a/app/Http/Controllers/LockAccountController.php +++ b/app/Http/Controllers/LockAccountController.php @@ -42,7 +42,7 @@ class LockAccountController extends Controller 'password' => 'required|string', ]); - if (\Hash::check($password, \Auth::user()->password)) { + if (\Hash::check($password, auth()->user()->password)) { $request->session()->forget('locked'); return redirect()->route('home')->with(Toastr::success('Your Account Has Been Unlocked Successfully!', 'Yay!', ['options'])); } diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php index 077b536f1..4a1706f2c 100644 --- a/app/Http/Controllers/NotificationController.php +++ b/app/Http/Controllers/NotificationController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use App\Notifications; use \Toastr; use Carbon\Carbon; @@ -12,32 +11,32 @@ class NotificationController extends Controller { public function get() { - $notification = Auth::user()->notifications; + $notification = auth()->user()->notifications; return view('notification.notifications', ['notification' => $notification]); } public function read($id) { - Auth::user()->unreadNotifications()->findOrFail($id)->markAsRead(); + auth()->user()->unreadNotifications()->findOrFail($id)->markAsRead(); return redirect()->route('get_notifications')->with(Toastr::success('Notification Marked As Read!', 'Yay!', ['options'])); } public function massRead() { $current = new Carbon(); - Auth::user()->unreadNotifications()->update(['read_at' => $current]); + auth()->user()->unreadNotifications()->update(['read_at' => $current]); return redirect()->route('get_notifications')->with(Toastr::success('All Notifications Marked As Read!', 'Yay!', ['options'])); } public function delete($id) { - Auth::user()->notifications()->findOrFail($id)->delete(); + auth()->user()->notifications()->findOrFail($id)->delete(); return redirect()->route('get_notifications')->with(Toastr::success('Notification Deleted!', 'Yay!', ['options'])); } public function deleteAll() { - Auth::user()->notifications()->delete(); + auth()->user()->notifications()->delete(); return redirect()->route('get_notifications')->with(Toastr::success('All Notifications Deleted!', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php index f65331bce..01c862b8c 100644 --- a/app/Http/Controllers/PollController.php +++ b/app/Http/Controllers/PollController.php @@ -16,7 +16,6 @@ use App\Poll; use App\Option; use App\Voter; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use App\Http\Requests; use App\Http\Requests\StorePoll; use App\Http\Requests\VoteOnPoll; @@ -28,7 +27,7 @@ class PollController extends Controller /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * */ public function index() { @@ -40,10 +39,10 @@ class PollController extends Controller /** * Display the specified resource. * - * @param int $id - * @return \Illuminate\Http\Response + * @param int $slug + * */ - public function show(Request $request, $slug) + public function show($slug) { $poll = Poll::whereSlug($slug)->firstOrFail(); @@ -52,7 +51,7 @@ class PollController extends Controller public function vote(VoteOnPoll $request) { - $user = Auth::user(); + $user = auth()->user(); $poll = Option::findOrFail($request->input('option.0'))->poll; foreach ($request->input('option') as $option) { diff --git a/app/Http/Controllers/PrivateMessageController.php b/app/Http/Controllers/PrivateMessageController.php index 9a46067e2..58cdfff2b 100644 --- a/app/Http/Controllers/PrivateMessageController.php +++ b/app/Http/Controllers/PrivateMessageController.php @@ -12,11 +12,9 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; use App\PrivateMessage; use App\User; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Response; -use Illuminate\Support\Facades\Auth; use \Toastr; use Carbon\Carbon; @@ -32,7 +30,7 @@ class PrivateMessageController extends Controller */ public function searchPM(Request $request, $username, $id) { - $user = Auth::user(); + $user = auth()->user(); $search = $request->input('subject'); $pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->where([ ['subject', 'like', '%' . $search . '%'], @@ -50,15 +48,15 @@ class PrivateMessageController extends Controller */ public function getPrivateMessages(Request $request, $username, $id) { - $user = Auth::user(); - $pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->orderBy('created_at', 'desc')->paginate(20); + $user = auth()->user(); + $pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->orderBy('created_at', 'desc')->paginate(25); return view('pm.inbox', ['pms' => $pms, 'user' => $user]); } public function markAllAsRead(Request $request, $username, $id) { - $user = Auth::user(); + $user = auth()->user(); $pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->get(); foreach ($pms as $pm) { $pm->read = 1; @@ -75,9 +73,9 @@ class PrivateMessageController extends Controller * @return View pm.message * */ - public function getPrivateMessageById(Request $request, $username, $id, $pmid) + public function getPrivateMessageById($username, $id, $pmid) { - $user = Auth::user(); + $user = auth()->user(); $pm = PrivateMessage::where('id', $pmid)->firstOrFail(); // If the message is not read, change the the status @@ -97,7 +95,7 @@ class PrivateMessageController extends Controller */ public function getPrivateMessagesSent(Request $request) { - $user = Auth::user(); + $user = auth()->user(); $pms = PrivateMessage::where('sender_id', $request->user()->id) ->orderBy('created_at', 'desc') ->paginate(20); @@ -114,7 +112,7 @@ class PrivateMessageController extends Controller */ public function makePrivateMessage($username, $id) { - $user = Auth::user(); + $user = auth()->user(); $usernames = User::orderBy('username', 'ASC')->get(); return view('pm.send', ['usernames' => $usernames, 'user' => $user]); @@ -129,7 +127,7 @@ class PrivateMessageController extends Controller */ public function sendPrivateMessage(Request $request) { - $user = Auth::user(); + $user = auth()->user(); $attributes = [ 'sender_id' => $user->id, @@ -153,7 +151,7 @@ class PrivateMessageController extends Controller */ public function replyPrivateMessage(Request $request, $pmid) { - $user = Auth::user(); + $user = auth()->user(); $pm = PrivateMessage::where('id', $pmid)->firstOrFail(); @@ -178,9 +176,9 @@ class PrivateMessageController extends Controller * @return View pm.inbox * */ - public function deletePrivateMessage(Request $request, $pmid) + public function deletePrivateMessage($pmid) { - $user = Auth::user(); + $user = auth()->user(); $pm = PrivateMessage::where('id', $pmid)->firstOrFail(); $pm->delete(); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4f1a4dfbc..79fcdc991 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -13,9 +13,7 @@ namespace App\Http\Controllers; use App\Report; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Auth; +use Illuminate\Http\Request; use \Toastr; class ReportController extends Controller @@ -25,11 +23,11 @@ class ReportController extends Controller * * */ - public function postReport() + public function postReport(Request $request) { - $user = Auth::user(); + $user = auth()->user(); - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'type' => 'required', 'reporter_id' => 'required|numeric', 'title' => 'required', @@ -38,10 +36,10 @@ class ReportController extends Controller ]); $report = new Report(); - $report->type = Request::get('type'); + $report->type = $request->input('type'); $report->reporter_id = $user->id; - $report->title = Request::get('title'); - $report->message = Request::get('message'); + $report->title = $request->input('title'); + $report->message = $request->input('message'); $report->solved = 0; $report->save(); diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php index 42297b922..958a6f089 100644 --- a/app/Http/Controllers/RequestController.php +++ b/app/Http/Controllers/RequestController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; use App\BonTransactions; use App\Category; use App\Type; @@ -24,12 +25,6 @@ use App\User; use App\PrivateMessage; use App\Helpers\RequestViewHelper; use App\Repositories\RequestFacetedRepository; -use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; -use Illuminate\Http\Request as IlluminateRequest; use App\Achievements\UserFilled25Requests; use App\Achievements\UserFilled50Requests; use App\Achievements\UserFilled75Requests; @@ -37,7 +32,6 @@ use App\Achievements\UserFilled100Requests; use Carbon\Carbon; use Decoda\Decoda; use \Toastr; -use Cache; class RequestController extends Controller { @@ -60,7 +54,7 @@ class RequestController extends Controller */ public function requests() { - $user = Auth::user(); + $user = auth()->user(); $num_req = Requests::count(); $num_fil = Requests::whereNotNull('filled_by')->count(); $num_unfil = Requests::whereNull('filled_by')->count(); @@ -74,21 +68,21 @@ class RequestController extends Controller return view('requests.requests', ['requests' => $requests, 'repository' => $repository, 'user' => $user, 'num_req' => $num_req, 'num_fil' => $num_fil, 'num_unfil' => $num_unfil, 'total_bounty' => $total_bounty, 'claimed_bounty' => $claimed_bounty, 'unclaimed_bounty' => $unclaimed_bounty]); } - public function faceted(IlluminateRequest $request, Requests $requests) + public function faceted(Request $request, Requests $requests) { - $user = Auth::user(); - $search = $request->get('search'); - $imdb = $request->get('imdb'); - $tvdb = $request->get('tvdb'); - $tmdb = $request->get('tmdb'); - $mal = $request->get('mal'); - $categories = $request->get('categories'); - $types = $request->get('types'); - $myrequests = $request->get('myrequests'); - $unfilled = $request->get('unfilled'); - $claimed = $request->get('claimed'); - $pending = $request->get('pending'); - $filled = $request->get('filled'); + $user = auth()->user(); + $search = $request->input('search'); + $imdb = $request->input('imdb'); + $tvdb = $request->input('tvdb'); + $tmdb = $request->input('tmdb'); + $mal = $request->input('mal'); + $categories = $request->input('categories'); + $types = $request->input('types'); + $myrequests = $request->input('myrequests'); + $unfilled = $request->input('unfilled'); + $claimed = $request->input('claimed'); + $pending = $request->input('pending'); + $filled = $request->input('filled'); $terms = explode(' ', $search); $search = ''; @@ -98,51 +92,51 @@ class RequestController extends Controller $requests = $requests->newQuery(); - if ($request->has('search') && $request->get('search') != null) { + if ($request->has('search') && $request->input('search') != null) { $requests->where('name', 'like', $search); } - if ($request->has('imdb') && $request->get('imdb') != null) { + if ($request->has('imdb') && $request->input('imdb') != null) { $requests->where('imdb', $imdb); } - if ($request->has('tvdb') && $request->get('tvdb') != null) { + if ($request->has('tvdb') && $request->input('tvdb') != null) { $requests->where('tvdb', $tvdb); } - if ($request->has('tmdb') && $request->get('tmdb') != null) { + if ($request->has('tmdb') && $request->input('tmdb') != null) { $requests->where('tmdb', $tmdb); } - if ($request->has('mal') && $request->get('mal') != null) { + if ($request->has('mal') && $request->input('mal') != null) { $requests->where('mal', $mal); } - if ($request->has('categories') && $request->get('categories') != null) { + if ($request->has('categories') && $request->input('categories') != null) { $requests->whereIn('category_id', $categories); } - if ($request->has('types') && $request->get('types') != null) { + if ($request->has('types') && $request->input('types') != null) { $requests->whereIn('type', $types); } - if ($request->has('myrequests') && $request->get('myrequests') != null) { + if ($request->has('myrequests') && $request->input('myrequests') != null) { $requests->where('user_id', $myrequests); } - if ($request->has('unfilled') && $request->get('unfilled') != null) { + if ($request->has('unfilled') && $request->input('unfilled') != null) { $requests->where('filled_hash', null); } - if ($request->has('claimed') && $request->get('claimed') != null) { + if ($request->has('claimed') && $request->input('claimed') != null) { $requests->where('claimed', '!=', null)->where('filled_hash', null); } - if ($request->has('pending') && $request->get('pending') != null) { + if ($request->has('pending') && $request->input('pending') != null) { $requests->where('filled_hash', '!=', null)->where('approved_by', null); } - if ($request->has('filled') && $request->get('filled') != null) { + if ($request->has('filled') && $request->input('filled') != null) { $requests->where('filled_hash', '!=', null)->where('approved_by', '!=', null); } @@ -150,8 +144,8 @@ class RequestController extends Controller $rows = $requests->count(); if($request->has('page')){ - $page = $request->get('page'); - $qty = $request->get('qty'); + $page = $request->input('page'); + $qty = $request->input('qty'); $requests->skip(($page-1)*$qty); $active = $page; }else{ @@ -159,7 +153,7 @@ class RequestController extends Controller } if($request->has('qty')){ - $qty = $request->get('qty'); + $qty = $request->input('qty'); $requests->take($qty); }else{ $qty = 6; @@ -168,8 +162,8 @@ class RequestController extends Controller // pagination query ends if($request->has('sorting')){ - $sorting = $request->get('sorting'); - $order = $request->get('direction'); + $sorting = $request->input('sorting'); + $order = $request->input('direction'); $requests->orderBy($sorting,$order); } @@ -192,7 +186,7 @@ class RequestController extends Controller { // Find the torrent in the database $request = Requests::findOrFail($id); - $user = Auth::user(); + $user = auth()->user(); $requestClaim = RequestsClaims::where('request_id', '=', $id)->first(); $voters = $request->requestBounty()->get(); $comments = $request->comments()->orderBy('created_at', 'DESC')->paginate(6); @@ -222,13 +216,12 @@ class RequestController extends Controller * @access public * @return Redirect::to */ - public function addrequest() + public function addrequest(Request $request) { - $user = Auth::user(); + $user = auth()->user(); // Post the Request - if (Request::isMethod('post')) { - // Validator - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST')) { + $v = validator($request->all(), [ "name" => "required|max:180", "imdb" => "required|numeric", "tvdb" => "required|numeric", @@ -242,27 +235,27 @@ class RequestController extends Controller if ($v->passes()) { // Find the right category - $category = Category::findOrFail(Request::get('category_id')); + $category = Category::findOrFail($request->input('category_id')); // Holders for new data $requests = new Requests([ - 'name' => Request::get('name'), - 'description' => Request::get('description'), + 'name' => $request->input('name'), + 'description' => $request->input('description'), 'category_id' => $category->id, 'user_id' => $user->id, - 'imdb' => Request::get('imdb'), - 'tvdb' => Request::get('tvdb'), - 'tmdb' => Request::get('tmdb'), - 'mal' => Request::get('mal'), - 'type' => Request::get('type'), - 'bounty' => Request::get('bounty'), + 'imdb' => $request->input('imdb'), + 'tvdb' => $request->input('tvdb'), + 'tmdb' => $request->input('tmdb'), + 'mal' => $request->input('mal'), + 'type' => $request->input('type'), + 'bounty' => $request->input('bounty'), 'votes' => 1, ]); $requests->save(); $requestsBounty = new RequestsBounty([ 'user_id' => $user->id, - 'seedbonus' => Request::get('bounty'), + 'seedbonus' => $request->input('bounty'), 'requests_id' => $requests->id, ]); $requestsBounty->save(); @@ -270,19 +263,19 @@ class RequestController extends Controller $BonTransactions = new BonTransactions([ 'itemID' => 0, 'name' => 'request', - 'cost' => Request::get('bounty'), + 'cost' => $request->input('bounty'), 'sender' => $user->id, 'receiver' => 0, - 'comment' => "new request - " . Request::get('name') . "" + 'comment' => "new request - {$request->input('name')}" ]); $BonTransactions->save(); - $user->seedbonus -= Request::get('bounty'); + $user->seedbonus -= $request->input('bounty'); $user->save(); $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has created a new request [url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); return redirect('/requests')->with(Toastr::success('Request Added.', 'Yay!', ['options'])); } else { @@ -304,22 +297,22 @@ class RequestController extends Controller * @access public * @return Redirect::to */ - public function editrequest($id) + public function editrequest(Request $req, $id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); if ($user->group->is_modo || $user->id == $request->user_id) { // Post the Request - if (Request::isMethod('post')) { + if ($req->isMethod('POST')) { // Find the right category - $name = Request::get('name'); - $imdb = Request::get('imdb'); - $tvdb = Request::get('tvdb'); - $tmdb = Request::get('tmdb'); - $mal = Request::get('mal'); - $category = Request::get('category_id'); - $type = Request::get('type'); - $description = Request::get('description'); + $name = $req->input('name'); + $imdb = $req->input('imdb'); + $tvdb = $req->input('tvdb'); + $tmdb = $req->input('tmdb'); + $mal = $req->input('mal'); + $category = $req->input('category_id'); + $type = $req->input('type'); + $description = $req->input('description'); $request->name = $name; $request->imdb = $imdb; @@ -346,27 +339,27 @@ class RequestController extends Controller * @access public * @return Redirect::route */ - public function addBonus($id) + public function addBonus(Request $request, $id) { - $user = Auth::user(); + $user = auth()->user(); - if (Request::isMethod('POST') && $user->seedbonus >= 100) { - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST') && $user->seedbonus >= 100) { + $v = validator($request->all(), [ 'request_id' => "required|exists:requests,id", 'bonus_value' => "required|numeric|min:100|max:{$user->seedbonus}", ]); if ($v->passes()) { - $requests = Requests::findOrFail(Request::get('request_id')); + $requests = Requests::findOrFail($request->input('request_id')); $requests->votes += 1; - $requests->bounty += Request::get('bonus_value'); + $requests->bounty += $request->input('bonus_value'); $requests->created_at = Carbon::now(); $requests->save(); $requestsBounty = new RequestsBounty([ 'user_id' => $user->id, - 'seedbonus' => Request::get('bonus_value'), + 'seedbonus' => $request->input('bonus_value'), 'requests_id' => $requests->id, ]); $requestsBounty->save(); @@ -374,29 +367,29 @@ class RequestController extends Controller $BonTransactions = new BonTransactions([ 'itemID' => 0, 'name' => 'request', - 'cost' => Request::get('bonus_value'), + 'cost' => $request->input('bonus_value'), 'sender' => $user->id, 'receiver' => 0, 'comment' => "adding bonus to {$requests->name}" ]); $BonTransactions->save(); - $user->seedbonus -= Request::get('bonus_value'); + $user->seedbonus -= $request->input('bonus_value'); $user->save(); $appurl = config('app.url'); - Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has addded " . Request::get('bonus_value') . " BON bounty to request " . "[url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); - Cache::forget('shoutbox_messages'); + Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has addded " . $request->input('bonus_value') . " BON bounty to request " . "[url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); + cache()->forget('shoutbox_messages'); PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $requests->user_id, 'subject' => "Your Request " . $requests->name . " Has A New Bounty!", 'message' => $user->username . " Has Added A Bounty To " . "[url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your bonus has been successfully added.', 'Yay!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::success('Your bonus has been successfully added.', 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt unserstand your request.', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('The server doesnt unserstand your request.', 'Whoops!', ['options'])); } - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('Something went horribly wrong', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('Something went horribly wrong', 'Whoops!', ['options'])); } /** @@ -406,35 +399,35 @@ class RequestController extends Controller * @param $id ID of the request * */ - public function fillRequest($id) + public function fillRequest(Request $request, $id) { - $user = Auth::user(); + $user = auth()->user(); - if (Request::isMethod('POST')) { - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST')) { + $v = validator($request->all(), [ 'request_id' => "required|exists:requests,id", 'info_hash' => "required|exists:torrents,info_hash", ]); if ($v->passes()) { - $torrent = Torrent::where('info_hash', '=', Request::get('info_hash'))->firstOrFail(); + $torrent = Torrent::where('info_hash', '=', $request->input('info_hash'))->firstOrFail(); if ($user->id == $torrent->user_id) { - $this->addRequestModeration(Request::get('request_id'), Request::get('info_hash')); + $this->addRequestModeration($request->input('request_id'), $request->input('info_hash')); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); } elseif ($user->id != $torrent->user_id && Carbon::now()->addDay() > $torrent->created_at) { - $this->addRequestModeration(Request::get('request_id'), Request::get('info_hash')); + $this->addRequestModeration($request->input('request_id'), $request->input('info_hash')); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You cannot fill this request for some weird reason', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('You cannot fill this request for some weird reason', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt understand your request.', 'Whoops!', ['options'])); + return redirect()->route('request', ['id' => $request->input('request_id')])->with(Toastr::error('The server doesnt understand your request.', 'Whoops!', ['options'])); } } @@ -447,7 +440,7 @@ class RequestController extends Controller */ public function addRequestModeration($request_id, $info_hash) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($request_id); @@ -468,11 +461,11 @@ class RequestController extends Controller */ public function approveRequest($id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); - if ($user->id == $request->user_id || Auth::user()->group->is_modo) { + if ($user->id == $request->user_id || auth()->user()->group->is_modo) { $request->approved_by = $user->id; $request->approved_when = Carbon::now(); $request->save(); @@ -503,7 +496,7 @@ class RequestController extends Controller $appurl = config('app.url'); Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $fill_user->username . "." . $fill_user->id . "]" . $fill_user->username . "[/url] has filled [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url] and was awarded " . $fill_amount . " BON "]); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $request->filled_by, 'subject' => "Your Request Fullfill On " . $request->name . " Has Been Approved!", 'message' => $request->approved_by . " Has Approved Your Fullfillment On [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url] Enjoy The " . $request->bounty . " Bonus Points!"]); return redirect()->route('request', ['id' => $id])->with(Toastr::success("You have approved {$request->name} and the bounty has been awarded to {$fill_user->username}", "Yay!", ['options'])); } else { @@ -518,7 +511,7 @@ class RequestController extends Controller */ public function rejectRequest($id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); @@ -544,7 +537,7 @@ class RequestController extends Controller */ public function deleteRequest($id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); if ($user->group->is_modo || $request->user_id == $user->id) { @@ -562,16 +555,16 @@ class RequestController extends Controller * @method claimRequest * */ - public function claimRequest($id) + public function claimRequest(Request $req, $id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); if ($request->claimed == null) { $requestClaim = new RequestsClaims([ 'request_id' => $id, 'username' => $user->username, - 'anon' => Request::get('anon'), + 'anon' => $req->input('anon'), ]); $requestClaim->save(); @@ -591,7 +584,7 @@ class RequestController extends Controller */ public function unclaimRequest($id) { - $user = Auth::user(); + $user = auth()->user(); $request = Requests::findOrFail($id); $claimer = RequestsClaims::where('request_id', '=', $id)->first(); diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index f3db160f3..6b2f0c4ce 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -67,7 +67,7 @@ class RssController extends Controller if ($this->auth($passkey)) { $torrents = $this->getTorrents(); - return Response::view('rss.default', ['passkey' => $passkey, 'torrents' => $torrents])->header('Content-Type', 'text/xml'); + return view('rss.default', ['passkey' => $passkey, 'torrents' => $torrents])->header('Content-Type', 'text/xml'); } return abort(404); @@ -88,7 +88,7 @@ class RssController extends Controller public function getView() { - $user = Auth::user(); + $user = auth()->user(); $rssData = RSS::select('category')->where('user_id', '=', $user->id)->first(); diff --git a/app/Http/Controllers/ShoutboxController.php b/app/Http/Controllers/ShoutboxController.php index aef2b114c..84ade7ea1 100755 --- a/app/Http/Controllers/ShoutboxController.php +++ b/app/Http/Controllers/ShoutboxController.php @@ -12,15 +12,11 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; use App\Shoutbox; use App\PrivateMessage; use App\User; use App\Helpers\LanguageCensor; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Response; -use Cache; use Carbon\Carbon; use Decoda\Decoda; use \Toastr; @@ -32,25 +28,25 @@ class ShoutboxController extends Controller * * */ - public function send() + public function send(Request $request) { - $string = Request::get('message'); - $checkSendRate = Shoutbox::where('user', '=', Auth::user()->id)->where('created_at', '>=', Carbon::now()->subSeconds(2))->first(); + $string = $request->input('message'); + $checkSendRate = Shoutbox::where('user', '=', auth()->user()->id)->where('created_at', '>=', Carbon::now()->subSeconds(1))->first(); if ($checkSendRate) { - return 'Wait 2 Seconds Between Posts Please'; + return 'Wait 1 Seconds Between Posts Please'; } - if (Auth::user()->can_chat == 0) { + if (auth()->user()->can_chat == 0) { return 'Your Chat Banned'; } - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'message' => 'required|min:1|regex:/^[(a-zA-Z\-)]+$/u' ]); if ($v->fails()) { Toastr::error('There was a error with your input!', 'Error!', ['options']); } - if (Request::ajax()) { + if ($request->ajax()) { preg_match_all('/(#\w+)/', $string, $mentions); $mentionIDs = []; foreach ($mentions[0] as $mention) { @@ -61,20 +57,20 @@ class ShoutboxController extends Controller } $mentions = implode(',', $mentionIDs); if (! is_null($mentions)) { - $insertMessage = Shoutbox::create(['user' => Auth::user()->id, 'message' => $string, 'mentions' => $mentions]); + $insertMessage = Shoutbox::create(['user' => auth()->user()->id, 'message' => $string, 'mentions' => $mentions]); } else { - $insertMessage = Shoutbox::create(['user' => Auth::user()->id, 'message' => $string]); + $insertMessage = Shoutbox::create(['user' => auth()->user()->id, 'message' => $string]); } $flag = true; - if (Auth::user()->image != null) { - $avatar = ''; + if (auth()->user()->image != null) { + $avatar = ''; } else { $avatar = ''; } $flag = true; - if (Auth::user()->isOnline()) { + if (auth()->user()->isOnline()) { $online = ''; } else { $online = ''; @@ -83,22 +79,22 @@ class ShoutboxController extends Controller $appurl = config('app.url'); $data = '
  • ' . ($flag ? $avatar : "") . ' -

     username . '.' . Auth::user()->id . '\'>' - . Auth::user()->username . ' +

     username . '.' . Auth::user()->id . '\'>' + . auth()->user()->username . ' ' . ($flag ? $online : "") . '  ' . Carbon::now()->diffForHumans() . '

    ' . e($string) . '

    • '; - Cache::forget('shoutbox_messages'); - return Response::json(['success' => true, 'data' => $data]); + cache()->forget('shoutbox_messages'); + return response()->json(['success' => true, 'data' => $data]); } } public static function getMessages($after = null) { - $messages = Cache::remember('shoutbox_messages', 7200, function () { + $messages = cache()->remember('shoutbox_messages', 7200, function () { return Shoutbox::orderBy('id', 'desc')->take(150)->get(); }); @@ -118,10 +114,10 @@ class ShoutboxController extends Controller foreach ($messages as $message) { $class = ''; if (!empty($message->mentions)){ - if (in_array(Auth::user()->id, explode(',', $message->mentions))) { + if (in_array(auth()->user()->id, explode(',', $message->mentions))) { $class = 'mentioned'; $show = true; - } elseif (in_array(Auth::user()->id, explode(',', $message->user))){ + } elseif (in_array(auth()->user()->id, explode(',', $message->user))){ $class = 'mentions'; $show = true; } else { @@ -134,7 +130,7 @@ class ShoutboxController extends Controller } else { $show = true; } - if ($message->user == Auth::user()->id){ + if ($message->user == auth()->user()->id){ $show = true; } if ($message->user == '1'){ @@ -153,7 +149,7 @@ class ShoutboxController extends Controller $flag = true; $delete = ''; - if (Auth::user()->group->is_modo || $message->poster->id == Auth::user()->id) { + if (auth()->user()->group->is_modo || $message->poster->id == auth()->user()->id) { $appurl = config('app.url'); $delete = 'id . '\'>'; } @@ -189,13 +185,13 @@ class ShoutboxController extends Controller * * */ - public function pluck($after = null) + public function pluck(Request $request, $after = null) { - if (Request::ajax()) { + if ($request->ajax()) { $messagesNext = self::getMessages($after); $data = $messagesNext['data']; $next_batch = $messagesNext['next_batch']; - return Response::json(['success' => true, 'data' => $data, 'next_batch' => $next_batch]); + return response()->json(['success' => true, 'data' => $data, 'next_batch' => $next_batch]); } } @@ -207,9 +203,9 @@ class ShoutboxController extends Controller public function deleteShout($id) { $shout = Shoutbox::find($id); - if (Auth::user()->group->is_modo || Auth::user()->id == $shout->poster->id) { + if (auth()->user()->group->is_modo || auth()->user()->id == $shout->poster->id) { Shoutbox::where('id', '=', $id)->delete(); - Cache::forget('shoutbox_messages'); + cache()->forget('shoutbox_messages'); return redirect()->route('home')->with(Toastr::success('Shout Has Been Deleted.', 'Yay!', ['options'])); } else { return redirect()->route('home')->with(Toastr::error('This is not your shout to delete.', 'Whoops!', ['options'])); diff --git a/app/Http/Controllers/Staff/ArticleController.php b/app/Http/Controllers/Staff/ArticleController.php index 9c74a0211..1aebc553f 100755 --- a/app/Http/Controllers/Staff/ArticleController.php +++ b/app/Http/Controllers/Staff/ArticleController.php @@ -12,12 +12,9 @@ namespace App\Http\Controllers\Staff; -use App\Article; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; +use Illuminate\Http\Request; +use App\Article; use \Toastr; class ArticleController extends Controller @@ -41,22 +38,22 @@ class ArticleController extends Controller * @access public * @return Staff.article.add */ - public function add() + public function add(Request $request) { - if (Request::isMethod('post')) { - $input = Request::all(); + if ($request->isMethod('POST')) { + $input = $request->all(); $post = new Article(); $post->title = $input['title']; $post->slug = str_slug($post->title); $post->content = $input['content']; - $post->user_id = Auth::user()->id; + $post->user_id = auth()->user()->id; // Verify that an image was upload - if (Request::hasFile('image') && Request::file('image')->getError() == 0) { + if ($request->hasFile('image') && $request->file('image')->getError() == 0) { // The file is an image - if (in_array(Request::file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) { + if (in_array($request->file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) { // Move and add the name to the object that will be saved - $post->image = 'article-' . uniqid() . '.' . Request::file('image')->getClientOriginalExtension(); - Request::file('image')->move(getcwd() . '/files/img/', $post->image); + $post->image = 'article-' . uniqid() . '.' . $request->file('image')->getClientOriginalExtension(); + $request->file('image')->move(getcwd() . '/files/img/', $post->image); } else { // Image null or wrong format $post->image = null; @@ -66,15 +63,15 @@ class ArticleController extends Controller $post->image = null; } - $v = Validator::make($post->toArray(), $post->rules); + $v = validator($post->toArray(), $post->rules); if ($v->fails()) { // Delete the image because the validation failed - if (file_exists(Request::file('image')->move(getcwd() . '/files/img/' . $post->image))) { - unlink(Request::file('image')->move(getcwd() . '/files/img/' . $post->image)); + if (file_exists($request->file('image')->move(getcwd() . '/files/img/' . $post->image))) { + unlink($request->file('image')->move(getcwd() . '/files/img/' . $post->image)); } return redirect()->route('staff_article_index')->with(Toastr::error('Your article has failed to published!', 'Whoops!', ['options'])); } else { - Auth::user()->articles()->save($post); + auth()->user()->articles()->save($post); return redirect()->route('staff_article_index')->with(Toastr::success('Your article has successfully published!', 'Yay!', ['options'])); } } @@ -89,23 +86,23 @@ class ArticleController extends Controller * @param $id Id of article * @return Staff.article.edit */ - public function edit($slug, $id) + public function edit(Request $request, $slug, $id) { $post = Article::findOrFail($id); - if (Request::isMethod('post')) { - $input = Request::all(); + if ($request->isMethod('POST')) { + $input = $request->all(); $post->title = $input['title']; $post->slug = str_slug($post->title); $post->content = $input['content']; - $post->user_id = Auth::user()->id; + $post->user_id = auth()->user()->id; // Verify that an image was upload - if (Request::hasFile('image') && Request::file('image')->getError() == 0) { + if ($request->hasFile('image') && $request->file('image')->getError() == 0) { // The file is an image - if (in_array(Request::file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) { + if (in_array($request->file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) { // Move and add the name to the object that will be saved - $post->image = 'article-' . uniqid() . '.' . Request::file('image')->getClientOriginalExtension(); - Request::file('image')->move(getcwd() . '/files/img/', $post->image); + $post->image = 'article-' . uniqid() . '.' . $request->file('image')->getClientOriginalExtension(); + $request->file('image')->move(getcwd() . '/files/img/', $post->image); } else { // Image null or wrong format $post->image = null; @@ -115,7 +112,7 @@ class ArticleController extends Controller $post->image = null; } - $v = Validator::make($post->toArray(), $post->rules); + $v = validator($post->toArray(), $post->rules); if ($v->fails()) { return redirect()->route('staff_article_index')->with(Toastr::error('Your article changes have failed to publish!', 'Whoops!', ['options'])); } else { diff --git a/app/Http/Controllers/Staff/BackupController.php b/app/Http/Controllers/Staff/BackupController.php index 564694aa3..3ce7d47f5 100644 --- a/app/Http/Controllers/Staff/BackupController.php +++ b/app/Http/Controllers/Staff/BackupController.php @@ -12,11 +12,9 @@ namespace App\Http\Controllers\Staff; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Artisan; use Illuminate\Routing\Controller; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; use League\Flysystem\Adapter\Local; use Exception; @@ -68,7 +66,7 @@ class BackupController extends Controller $output = Artisan::output(); // log the results - Log::info("A new backup was initiated from the staff dashboard ".$output); + info("A new backup was initiated from the staff dashboard ".$output); // return the results as a response to the ajax call echo $output; } catch (Exception $e) { @@ -81,10 +79,10 @@ class BackupController extends Controller /** * Downloads a backup zip file. */ - public function download() + public function download(Request $request) { - $disk = Storage::disk(Request::input('disk')); - $file_name = Request::input('file_name'); + $disk = Storage::disk($request->input('disk')); + $file_name = $request->input('file_name'); $adapter = $disk->getDriver()->getAdapter(); if ($adapter instanceof Local) { @@ -103,9 +101,9 @@ class BackupController extends Controller /** * Deletes a backup file. */ - public function delete($file_name) + public function delete(Request $request, $file_name) { - $disk = Storage::disk(Request::input('disk')); + $disk = Storage::disk($request->input('disk')); if ($disk->exists($file_name)) { $disk->delete($file_name); diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php index 81b555619..6a23e8582 100644 --- a/app/Http/Controllers/Staff/BanController.php +++ b/app/Http/Controllers/Staff/BanController.php @@ -13,10 +13,7 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Mail; use App\Mail\BanUser; use App\Mail\UnbanUser; @@ -42,10 +39,10 @@ class BanController extends Controller * @param $id * */ - public function ban($username, $id) + public function ban(Request $request, $username, $id) { $user = User::findOrFail($id); - if ($user->group->is_modo || Auth::user()->id == $user->id) { + if ($user->group->is_modo || auth()->user()->id == $user->id) { return redirect()->route('home')->with(Toastr::error('You Cannot Ban Yourself Or Other Staff!', 'Whoops!', ['options'])); } else { $user->group_id = 5; @@ -57,8 +54,8 @@ class BanController extends Controller $user->can_chat = 0; $user->save(); - $staff = Auth::user(); - $v = Validator::make(Request::all(), [ + $staff = auth()->user(); + $v = validator($request->all(), [ 'owned_by' => 'required', 'created_by' => 'required|numeric', 'ban_reason' => 'required', @@ -67,11 +64,11 @@ class BanController extends Controller $ban = new Ban(); $ban->owned_by = $user->id; $ban->created_by = $staff->id; - $ban->ban_reason = Request::get('ban_reason'); + $ban->ban_reason = $request->input('ban_reason'); $ban->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has banned member " . $user->username . "."); + \LogActivity::addToLog("Staff Member {$staff->username} has banned member {$user->username}."); // Send Email Mail::to($user->email)->send(new BanUser($user)); @@ -89,13 +86,13 @@ class BanController extends Controller * @param $id * */ - public function unban($username, $id) + public function unban(Request $request, $username, $id) { $user = User::findOrFail($id); - if ($user->group->is_modo || Auth::user()->id == $user->id) { + if ($user->group->is_modo || auth()->user()->id == $user->id) { return redirect()->route('home')->with(Toastr::error('You Cannot Unban Yourself Or Other Staff!', 'Whoops!', ['options'])); } else { - $user->group_id = Request::get('group_id'); + $user->group_id = $request->input('group_id'); $user->can_upload = 1; $user->can_download = 1; $user->can_comment = 1; @@ -104,8 +101,8 @@ class BanController extends Controller $user->can_chat = 1; $user->save(); - $staff = Auth::user(); - $v = Validator::make(Request::all(), [ + $staff = auth()->user(); + $v = validator($request->all(), [ 'unban_reason' => 'required', 'removed_at' => 'required' ]); @@ -113,12 +110,12 @@ class BanController extends Controller $ban = new Ban(); $ban->owned_by = $user->id; $ban->created_by = $staff->id; - $ban->unban_reason = Request::get('unban_reason'); + $ban->unban_reason = $request->input('unban_reason'); $ban->removed_at = Carbon::now(); $ban->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has unbanned member " . $user->username . "."); + \LogActivity::addToLog("Staff Member {$staff->username} has unbanned member {$user->username}."); // Send Email Mail::to($user->email)->send(new UnbanUser($user)); diff --git a/app/Http/Controllers/Staff/BlockController.php b/app/Http/Controllers/Staff/BlockController.php deleted file mode 100755 index 3cb29a7eb..000000000 --- a/app/Http/Controllers/Staff/BlockController.php +++ /dev/null @@ -1,31 +0,0 @@ -all(), [ 'catalog' => 'required|min:3|max:20|regex:/^[(a-zA-Z\-)]+$/u' ]); - $catalog = Catalog::where('name', '=', Request::get('catalog'))->first(); + $catalog = Catalog::where('name', '=', $request->input('catalog'))->first(); if ($catalog) { - return redirect()->route('catalogs')->with(['fail' => 'Catalog ' . $catalog->name . ' is already in database']); + return redirect()->route('catalogs')->with(Toastr::error('Catalog ' . $catalog->name . ' is already in database', 'Whoops!', ['options'])); } $catalog = new Catalog(); - $catalog->name = Request::get('catalog'); - $catalog->slug = str_slug(Request::get('catalog')); + $catalog->name = $request->input('catalog'); + $catalog->slug = str_slug($request->input('catalog')); $catalog->save(); - return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully added', 'Yay!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $request->input('catalog') . ' has been successfully added', 'Yay!', ['options'])); } //Delete Catalog @@ -62,18 +61,18 @@ class CatalogController extends Controller } //Edit Catalog - public function editCatalog($catalog_id) + public function editCatalog(Request $request, $catalog_id) { - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'catalog' => 'required|min:3|max:20|regex:/^[(a-zA-Z\-)]+$/u' ]); $catalog = Catalog::findOrFail($catalog_id); if (!$catalog) { - return redirect()->route('getCatalog')->with(Toastr::error('Catalog ' . Request::get('catalog') . ' is not in our DB!', 'Whoops!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::error('Catalog ' . $request->input('catalog') . ' is not in our DB!', 'Whoops!', ['options'])); } - $catalog->name = Request::get('catalog'); + $catalog->name = $request->input('catalog'); $catalog->save(); - return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully edited', 'Yay!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $request->input('catalog') . ' has been successfully edited', 'Yay!', ['options'])); } /** @@ -88,27 +87,27 @@ class CatalogController extends Controller } //Add New Catalog Torrent - public function postCatalogTorrent() + public function postCatalogTorrent(Request $request) { // Find the right catalog - $catalog = Catalog::findOrFail(Request::get('catalog_id')); - $v = Validator::make(Request::all(), [ + $catalog = Catalog::findOrFail($request->input('catalog_id')); + $v = validator($request->all(), [ 'imdb' => 'required|numeric', 'tvdb' => 'required|numeric', 'catalog_id' => 'required|numeric|exists:catalog_id' ]); - $torrent = CatalogTorrent::where('imdb', '=', Request::get('imdb'))->first(); + $torrent = CatalogTorrent::where('imdb', '=', $request->input('imdb'))->first(); if ($torrent) { return redirect()->route('getCatalogTorrent')->with(Toastr::error('IMDB# ' . $torrent->imdb . ' is already in database', 'Whoops!', ['options'])); } $torrent = new CatalogTorrent(); - $torrent->imdb = Request::get('imdb'); - $torrent->catalog_id = Request::get('catalog_id'); + $torrent->imdb = $request->input('imdb'); + $torrent->catalog_id = $request->input('catalog_id'); $torrent->save(); // Count and save the torrent number in this catalog $catalog->num_torrent = CatalogTorrent::where('catalog_id', '=', $catalog->id)->count(); $catalog->save(); - return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . Request::get('imdb') . ' has been successfully added', 'Yay!', ['options'])); + return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . $request->input('imdb') . ' has been successfully added', 'Yay!', ['options'])); } // Get Catalogs Records diff --git a/app/Http/Controllers/Staff/CategoryController.php b/app/Http/Controllers/Staff/CategoryController.php index 93daf871a..cf25867e4 100755 --- a/app/Http/Controllers/Staff/CategoryController.php +++ b/app/Http/Controllers/Staff/CategoryController.php @@ -14,8 +14,7 @@ namespace App\Http\Controllers\Staff; use App\Category; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; +use Illuminate\Http\Request; use \Toastr; class CategoryController extends Controller @@ -38,18 +37,18 @@ class CategoryController extends Controller * * */ - public function add() + public function add(Request $request) { - if (Request::isMethod('post')) { + if ($request->isMethod('POST')) { $category = new Category(); - $category->name = Request::get('name'); + $category->name = $request->input('name'); $category->slug = str_slug($category->name); - $category->position = Request::get('position'); - $category->icon = Request::get('icon'); - $category->meta = Request::get('meta'); - $v = Validator::make($category->toArray(), $category->rules); + $category->position = $request->input('position'); + $category->icon = $request->input('icon'); + $category->meta = $request->input('meta'); + $v = validator($category->toArray(), $category->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + return redirect()->back()->with(Toastr::error('Something Went Wrong!', 'Error', ['options'])); } else { $category->save(); return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Added', 'Yay!', ['options'])); @@ -63,17 +62,17 @@ class CategoryController extends Controller * * */ - public function edit($slug, $id) + public function edit(Request $request, $slug, $id) { $category = Category::findOrFail($id); - if (Request::isMethod('post')) { - $category->name = Request::get('name'); + if ($request->isMethod('POST')) { + $category->name = $request->input('name'); $category->slug = str_slug($category->name); - $category->icon = Request::get('icon'); - $category->meta = Request::get('meta'); - $v = Validator::make($category->toArray(), $category->rules); + $category->icon = $request->input('icon'); + $category->meta = $request->input('meta'); + $v = validator($category->toArray(), $category->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + return redirect()->back()->with(Toastr::error('Something Went Wrong!', 'Error', ['options'])); } else { $category->save(); return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Modified', 'Yay!', ['options'])); diff --git a/app/Http/Controllers/Staff/FailedLoginController.php b/app/Http/Controllers/Staff/FailedLoginController.php index 733735c10..a51e8a5bf 100644 --- a/app/Http/Controllers/Staff/FailedLoginController.php +++ b/app/Http/Controllers/Staff/FailedLoginController.php @@ -24,7 +24,7 @@ class FailedLoginController extends Controller */ public function getFailedAttemps() { - $attempts = FailedLoginAttempt::orderBy('created_at', 'DESC')->paginate(50); + $attempts = FailedLoginAttempt::orderBy('created_at', 'DESC')->paginate(25); return view('Staff.failedlogin.index', ['attempts' => $attempts]); } diff --git a/app/Http/Controllers/Staff/FlushController.php b/app/Http/Controllers/Staff/FlushController.php index c11f116f1..87f267ca7 100644 --- a/app/Http/Controllers/Staff/FlushController.php +++ b/app/Http/Controllers/Staff/FlushController.php @@ -13,9 +13,6 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; - use App\Peer; use App\History; use \Toastr; diff --git a/app/Http/Controllers/Staff/ForumController.php b/app/Http/Controllers/Staff/ForumController.php index 0d0a65941..333bc62be 100755 --- a/app/Http/Controllers/Staff/ForumController.php +++ b/app/Http/Controllers/Staff/ForumController.php @@ -12,17 +12,17 @@ namespace App\Http\Controllers\Staff; +use App\Http\Controllers\Controller; +use Illuminate\Http\Request; use App\Forum; use App\Group; -use App\Http\Controllers\Controller; use App\Permission; -use Illuminate\Support\Facades\Request; class ForumController extends Controller { /** - * Affiche la page d'index d'administration du forum + * Show Forums * */ public function index() @@ -33,24 +33,24 @@ class ForumController extends Controller } /** - * Ajoute une catégorie / un forum + * Add A Forum * */ - public function add() + public function add(Request $request) { $categories = Forum::where('parent_id', '=', 0)->get(); $groups = Group::all(); - if (Request::isMethod('post')) { - $parentForum = Forum::findOrFail(Request::get('parent_id')); + if ($request->isMethod('POST')) { + $parentForum = Forum::findOrFail($request->input('parent_id')); $forum = new Forum(); - $forum->name = Request::get('title'); - $forum->position = Request::get('position'); - $forum->slug = str_slug(Request::get('title')); - $forum->description = Request::get('description'); - $forum->parent_id = (Request::get('forum_type') == 'category') ? 0 : $parentForum->id; + $forum->name = $request->input('title'); + $forum->position = $request->input('position'); + $forum->slug = str_slug($request->input('title')); + $forum->description = $request->input('description'); + $forum->parent_id = ($request->input('forum_type') == 'category') ? 0 : $parentForum->id; $forum->save(); - // Sauvegarde les permission + // Permissions foreach ($groups as $k => $group) { $perm = Permission::whereRaw('forum_id = ? AND group_id = ?', [$forum->id, $group->id])->first(); if ($perm == null) { @@ -58,13 +58,13 @@ class ForumController extends Controller } $perm->forum_id = $forum->id; $perm->group_id = $group->id; - if (array_key_exists($group->id, Request::get('permissions'))) { - $perm->show_forum = (isset(Request::get('permissions')[$group->id]['show_forum'])) ? true : false; - $perm->read_topic = (isset(Request::get('permissions')[$group->id]['read_topic'])) ? true : false; - $perm->reply_topic = (isset(Request::get('permissions')[$group->id]['reply_topic'])) ? true : false; - $perm->start_topic = (isset(Request::get('permissions')[$group->id]['start_topic'])) ? true : false; - $perm->upload = (isset(Request::get('permissions')[$group->id]['upload'])) ? true : false; - $perm->download = (isset(Request::get('permissions')[$group->id]['download'])) ? true : false; + if (array_key_exists($group->id, $request->input('permissions'))) { + $perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false; + $perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false; + $perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false; + $perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false; + $perm->upload = (isset($request->input('permissions')[$group->id]['upload'])) ? true : false; + $perm->download = (isset($request->input('permissions')[$group->id]['download'])) ? true : false; } else { $perm->show_forum = false; $perm->read_topic = false; @@ -76,31 +76,31 @@ class ForumController extends Controller $perm->save(); } - return redirect()->route('staff_forum_index'); + return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been created successfully', 'Yay!', ['options'])); } return view('Staff.forum.add', ['categories' => $categories, 'groups' => $groups]); } /** - * Edite le forum + * Edit A Forum * * */ - public function edit($slug, $id) + public function edit(Request $request, $slug, $id) { $categories = Forum::where('parent_id', '=', 0)->get(); $groups = Group::all(); $forum = Forum::findOrFail($id); - if (Request::isMethod('post')) { - $forum->name = Request::get('title'); - $forum->position = Request::get('position'); - $forum->slug = str_slug(Request::get('title')); - $forum->description = Request::get('description'); - //$forum->parent_id = (Request::get('forum_type') == 'category') ? 0 : Request::get('parent_id'); // Non changé depuis la création - $forum->parent_id = Request::get('parent_id'); + if ($request->isMethod('POST')) { + $forum->name = $request->input('title'); + $forum->position = $request->input('position'); + $forum->slug = str_slug($request->input('title')); + $forum->description = $request->input('description'); + $forum->parent_id = ($request->input('forum_type') == 'category') ? 0 : $request->input('parent_id'); + $forum->parent_id = $request->input('parent_id'); $forum->save(); - // Sauvegarde des permissions dans la DB + // Permissions foreach ($groups as $k => $group) { $perm = Permission::whereRaw('forum_id = ? AND group_id = ?', [$forum->id, $group->id])->first(); if ($perm == null) { @@ -108,13 +108,13 @@ class ForumController extends Controller } $perm->forum_id = $forum->id; $perm->group_id = $group->id; - if (array_key_exists($group->id, Request::get('permissions'))) { - $perm->show_forum = (isset(Request::get('permissions')[$group->id]['show_forum'])) ? true : false; - $perm->read_topic = (isset(Request::get('permissions')[$group->id]['read_topic'])) ? true : false; - $perm->reply_topic = (isset(Request::get('permissions')[$group->id]['reply_topic'])) ? true : false; - $perm->start_topic = (isset(Request::get('permissions')[$group->id]['start_topic'])) ? true : false; - $perm->upload = (isset(Request::get('permissions')[$group->id]['upload'])) ? true : false; - $perm->download = (isset(Request::get('permissions')[$group->id]['download'])) ? true : false; + if (array_key_exists($group->id, $request->input('permissions'))) { + $perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false; + $perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false; + $perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false; + $perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false; + $perm->upload = (isset($request->input('permissions')[$group->id]['upload'])) ? true : false; + $perm->download = (isset($request->input('permissions')[$group->id]['download'])) ? true : false; } else { $perm->show_forum = false; $perm->read_topic = false; @@ -126,13 +126,13 @@ class ForumController extends Controller $perm->save(); } - return redirect()->route('staff_forum_index'); + return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been edited successfully', 'Yay!', ['options'])); } return view('Staff.forum.edit', ['categories' => $categories, 'groups' => $groups, 'forum' => $forum]); } /** - * Supprime un forum / une catégorie ainsi que les topics et sous-forums + * Delete A Forum * * */ @@ -183,6 +183,6 @@ class ForumController extends Controller } $forum->delete(); } - return redirect()->route('staff_forum_index'); + return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been deleted successfully', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/GiftController.php b/app/Http/Controllers/Staff/GiftController.php index 92b5258eb..c8b133c67 100644 --- a/app/Http/Controllers/Staff/GiftController.php +++ b/app/Http/Controllers/Staff/GiftController.php @@ -13,10 +13,8 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; +use Illuminate\Http\Request; use App\User; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; use \Toastr; class GiftController extends Controller @@ -40,12 +38,12 @@ class GiftController extends Controller * * @return void */ - public function gift() + public function gift(Request $request) { - $user = Auth::user(); + $user = auth()->user(); - if (Request::isMethod('post')) { - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST')) { + $v = validator($request->all(), [ 'username' => "required|exists:users,username|max:180", 'bonus_points' => "required|numeric|min:0", 'invites' => "required|numeric|min:0", @@ -53,22 +51,22 @@ class GiftController extends Controller ]); if ($v->passes()) { - $recipient = User::where('username', 'LIKE', Request::get('username'))->first(); + $recipient = User::where('username', 'LIKE', $request->input('username'))->first(); if (!$recipient) { return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unable to find specified user', 'Whoops!', ['options'])); } - $bon = Request::get('bonus_points'); - $invites = Request::get('invites'); - $fl_tokens = Request::get('fl_tokens'); + $bon = $request->input('bonus_points'); + $invites = $request->input('invites'); + $fl_tokens = $request->input('fl_tokens'); $recipient->seedbonus += $bon; $recipient->invites += $invites; $recipient->fl_tokens += $fl_tokens; $recipient->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $user->username . " has sent a system gift to " . $recipient->username . " account."); + \LogActivity::addToLog("Staff Member {$user->username} has sent a system gift to {$recipient->username} account."); return redirect('/staff_dashboard/systemgift')->with(Toastr::success('Gift Sent', 'Yay!', ['options'])); } else { diff --git a/app/Http/Controllers/Staff/GroupsController.php b/app/Http/Controllers/Staff/GroupsController.php index b83d910d7..75d2d6640 100644 --- a/app/Http/Controllers/Staff/GroupsController.php +++ b/app/Http/Controllers/Staff/GroupsController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Validator; use Illuminate\Http\Request; use App\Group; use \Toastr; @@ -57,7 +56,7 @@ class GroupsController extends Controller $group->is_immune = $request->get('group_immune', 0); $group->is_freeleech = $request->get('group_freeleech', 0); $group->autogroup = $request->get('autogroup', 0); - $v = Validator::make($group->toArray(), $group->rules); + $v = validator($group->toArray(), $group->rules); if ($v->fails()) { return redirect()->route('staff_groups_index')->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } else { @@ -90,7 +89,7 @@ class GroupsController extends Controller $group->is_immune = $request->get('group_immune', 0); $group->is_freeleech = $request->get('group_freeleech', 0); $group->autogroup = $request->get('autogroup', 0); - $v = Validator::make($group->toArray(), $group->rules); + $v = validator($group->toArray(), $group->rules); if ($v->fails()) { return redirect()->route('staff_groups_index')->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } else { diff --git a/app/Http/Controllers/Staff/HomeController.php b/app/Http/Controllers/Staff/HomeController.php index 8edd8203e..e6333eaff 100644 --- a/app/Http/Controllers/Staff/HomeController.php +++ b/app/Http/Controllers/Staff/HomeController.php @@ -13,22 +13,11 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; use App\Torrent; use App\Peer; -use App\History; use App\User; -use App\Group; use App\Client; -use App\Comment; -use App\Post; -use App\Topic; -use App\PrivateMessage; -use App\Catalog; -use App\CatalogTorrent; use App\Report; -use App\Note; use App\Poll; use \Toastr; @@ -63,7 +52,6 @@ class HomeController extends Controller $solved = Report::where('solved', '=', '1')->count(); //Polls $pollCount = Poll::count(); - //System Specs return view('Staff.home.index', ['num_user' => $num_user, 'banned' => $banned, 'validating' => $validating, 'num_torrent' => $num_torrent, 'pending' => $pending, 'rejected' => $rejected, 'peers' => $peers, 'seeders' => $seeders, 'leechers' => $leechers, 'seedboxes' => $seedboxes, 'highspeed_users' => $highspeed_users, 'highspeed_torrents' => $highspeed_torrents, 'reports' => $reports, 'unsolved' => $unsolved, 'solved' => $solved, 'pollCount' => $pollCount]); diff --git a/app/Http/Controllers/Staff/InviteController.php b/app/Http/Controllers/Staff/InviteController.php index 5149ff479..4c9e97f28 100644 --- a/app/Http/Controllers/Staff/InviteController.php +++ b/app/Http/Controllers/Staff/InviteController.php @@ -24,7 +24,7 @@ class InviteController extends Controller */ public function getInvites() { - $invites = Invite::orderBy('created_at', 'DESC')->paginate(50); + $invites = Invite::orderBy('created_at', 'DESC')->paginate(25); $invitecount = Invite::count(); return view('Staff.invites.index', ['invites' => $invites, 'invitecount' => $invitecount]); diff --git a/app/Http/Controllers/Staff/MassPMController.php b/app/Http/Controllers/Staff/MassPMController.php index 2c0224bdf..831612c35 100644 --- a/app/Http/Controllers/Staff/MassPMController.php +++ b/app/Http/Controllers/Staff/MassPMController.php @@ -13,11 +13,9 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; +use Illuminate\Http\Request; use App\User; use App\PrivateMessage; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; use \Toastr; class MassPMController extends Controller @@ -40,24 +38,24 @@ class MassPMController extends Controller * * @return void */ - public function sendMassPM() + public function sendMassPM(Request $request) { - $staff = Auth::user(); + $staff = auth()->user(); $users = User::all(); - if (Request::isMethod('post')) { - $v = Validator::make(Request::all(), [ + if ($request->isMethod('POST')) { + $v = validator($request->all(), [ 'title' => "required|min:5", 'message' => "required|min:5" ]); if ($v->passes()) { foreach ($users as $user) { - PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $user->id, 'subject' => Request::get('title'), 'message' => Request::get('message')]); + PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $user->id, 'subject' => $request->input('title'), 'message' => $request->input('message')]); } // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has sent a MassPM."); + \LogActivity::addToLog("Staff Member {$staff->username} has sent a MassPM."); return redirect('/staff_dashboard/masspm')->with(Toastr::success('MassPM Sent', 'Yay!', ['options'])); } else { diff --git a/app/Http/Controllers/Staff/ModerationController.php b/app/Http/Controllers/Staff/ModerationController.php index 006204b70..5d5ca1ab0 100644 --- a/app/Http/Controllers/Staff/ModerationController.php +++ b/app/Http/Controllers/Staff/ModerationController.php @@ -12,16 +12,10 @@ namespace App\Http\Controllers\Staff; -use App\User; -use App\Group; +use App\Http\Controllers\Controller; +use Illuminate\Support\Facades\DB; use App\Torrent; use App\Requests; -use App\Category; -use App\Peer; -use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Request; use Carbon\Carbon; use \Toastr; @@ -74,11 +68,10 @@ class ModerationController extends Controller */ public function resetRequest($id) { - $user = Auth::user(); + $user = auth()->user(); // reset code here if ($user->group->is_modo) { $request = Requests::findOrFail($id); - $request->filled_by = null; $request->filled_when = null; $request->filled_hash = null; diff --git a/app/Http/Controllers/Staff/NoteController.php b/app/Http/Controllers/Staff/NoteController.php index d9ca41aef..cfad05fd5 100644 --- a/app/Http/Controllers/Staff/NoteController.php +++ b/app/Http/Controllers/Staff/NoteController.php @@ -13,9 +13,7 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Auth; +use Illuminate\Http\Request; use App\Note; use App\User; use \Toastr; @@ -27,12 +25,12 @@ class NoteController extends Controller * * */ - public function postNote($username, $id) + public function postNote(Request $request, $username, $id) { - $staff = Auth::user(); + $staff = auth()->user(); $user = User::findOrFail($id); - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'user_id' => 'required', 'staff_id' => 'required|numeric', 'message' => 'required', @@ -41,11 +39,11 @@ class NoteController extends Controller $note = new Note(); $note->user_id = $user->id; $note->staff_id = $staff->id; - $note->message = Request::get('message'); + $note->message = $request->input('message'); $note->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has added a note on " . $user->username . " account."); + \LogActivity::addToLog("Staff Member {$staff->username} has added a note on {$user->username} account."); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Staff Note Has Successfully Posted', 'Yay!', ['options'])); } diff --git a/app/Http/Controllers/Staff/PageController.php b/app/Http/Controllers/Staff/PageController.php index e6daa067d..105f2c199 100755 --- a/app/Http/Controllers/Staff/PageController.php +++ b/app/Http/Controllers/Staff/PageController.php @@ -13,10 +13,9 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; +use Illuminate\Http\Request; use App\Page; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; +use \Toastr; class PageController extends Controller { @@ -38,20 +37,20 @@ class PageController extends Controller * * */ - public function add() + public function add(Request $request) { - if (Request::getMethod() == 'POST') { + if ($request->isMethod('POST')) { $page = new Page(); - $page->name = Request::get('name'); + $page->name = $request->input('name'); $page->slug = str_slug($page->name); - $page->content = Request::get('content'); + $page->content = $request->input('content'); - $v = Validator::make($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']); + $v = validator($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']); if ($v->passes()) { $page->save(); - return redirect()->route('staff_page_index'); + return redirect()->route('staff_page_index')->with(Toastr::success('Page has been created successfully', 'Yay!', ['options'])); } else { - Session::put('message', 'An error has occurred'); + return redirect()->back()->with(Toastr::error('Page failed to save', 'Whoops!', ['options'])); } } return view('Staff.page.add'); @@ -62,20 +61,20 @@ class PageController extends Controller * * */ - public function edit($slug, $id) + public function edit(Request $request, $slug, $id) { $page = Page::findOrFail($id); - if (Request::getMethod() == 'POST') { - $page->name = Request::get('name'); + if ($request->isMethod('POST')) { + $page->name = $request->input('name'); $page->slug = str_slug($page->name); - $page->content = Request::get('content'); + $page->content = $request->input('content'); - $v = Validator::make($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']); + $v = validator($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']); if ($v->passes()) { $page->save(); - return redirect()->route('staff_page_index')->with('message', 'Page edited successfully'); + return redirect()->route('staff_page_index')->with(Toastr::success('Page has been edited successfully', 'Yay!', ['options'])); } else { - Session::put('message', 'An error has occurred'); + return redirect()->back()->with(Toastr::error('Page failed to save', 'Whoops!', ['options'])); } } return view('Staff.page.edit', ['page' => $page]); @@ -89,6 +88,6 @@ class PageController extends Controller public function delete($slug, $id) { Page::findOrFail($id)->delete(); - return redirect()->route('staff_page_index')->with('message', 'Page successfully deleted'); + return redirect()->route('staff_page_index')->with(Toastr::success('Page has been deleted successfully', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/PollController.php b/app/Http/Controllers/Staff/PollController.php index 4e5dbf52c..4cec4722f 100644 --- a/app/Http/Controllers/Staff/PollController.php +++ b/app/Http/Controllers/Staff/PollController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use App\Http\Requests; use App\User; @@ -28,7 +27,7 @@ class PollController extends Controller { public function polls() { - $polls = Poll::orderBy('created_at', 'desc')->paginate(20); + $polls = Poll::orderBy('created_at', 'desc')->paginate(25); return view('Staff.poll.polls', compact('polls')); } @@ -56,8 +55,8 @@ class PollController extends Controller */ public function store(StorePoll $request) { - if (\Auth::check()) { - $poll = \Auth::user()->polls()->create($request->all()); + if (auth()->check() { + $poll = auth()->user()->polls()->create($request->all()); } else { $poll = Poll::create($request->all()); } @@ -68,11 +67,11 @@ class PollController extends Controller $poll->options()->saveMany($options); // Activity Log - \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has created a new poll " . $poll->title . " ."); + \LogActivity::addToLog("Staff Member " . auth()->user()->username . " has created a new poll {$poll->title}."); // Auto Shout $appurl = config('app.url'); - Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "A new poll has been created [url={$appurl}/poll/" . $poll->slug . "]" . $poll->title . "[/url] vote on it now! :slight_smile:"]); + Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "A new poll has been created [url={$appurl}/poll/{$poll->slug}]"{$poll->title}"[/url] vote on it now! :slight_smile:"]); Cache::forget('shoutbox_messages'); Toastr::success('Your poll has been created.', 'Yay!', ['options']); diff --git a/app/Http/Controllers/Staff/ReportController.php b/app/Http/Controllers/Staff/ReportController.php index 5ab077ba2..dfd700ccc 100644 --- a/app/Http/Controllers/Staff/ReportController.php +++ b/app/Http/Controllers/Staff/ReportController.php @@ -13,9 +13,7 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Auth; +use Illuminate\Http\Request; use App\PrivateMessage; use App\Report; use \Toastr; @@ -41,11 +39,11 @@ class ReportController extends Controller return view('Staff.reports.report', ['report' => $report]); } - public function solveReport($report_id) + public function solveReport(Request $request, $report_id) { - $user = Auth::user(); + $user = auth()->user(); - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'verdict' => 'required|min:3', 'staff_id' => 'required' ]); @@ -56,7 +54,7 @@ class ReportController extends Controller return redirect()->route('getReports')->with(Toastr::error('This Report Has Already Been Solved', 'Whoops!', ['options'])); } - $report->verdict = Request::get('verdict'); + $report->verdict = $request->input('verdict'); $report->staff_id = $user->id; $report->solved = 1; $report->save(); diff --git a/app/Http/Controllers/Staff/SettingsController.php b/app/Http/Controllers/Staff/SettingsController.php deleted file mode 100755 index 52dbe07b7..000000000 --- a/app/Http/Controllers/Staff/SettingsController.php +++ /dev/null @@ -1,31 +0,0 @@ -paginate(20); + $torrents = Torrent::orderBy('created_at', 'DESC')->paginate(25); return view('Staff.torrent.index', ['torrents' => $torrents]); } @@ -38,14 +37,14 @@ class TorrentController extends Controller * @return View page.torrents * */ - public function search() + public function search(Request $request) { - $search = Request::get('name'); + $search = $request->input('name'); $torrents = Torrent::where([ - ['name', 'like', '%' . Request::get('name') . '%'], + ['name', 'like', '%' . $request->input('name') . '%'], ])->orderBy('created_at', 'DESC')->paginate(25); - $torrents->setPath('?name=' . Request::get('name')); + $torrents->setPath('?name=' . $request->input('name')); return view('Staff.torrent.index', ['torrents' => $torrents]); } diff --git a/app/Http/Controllers/Staff/TypeController.php b/app/Http/Controllers/Staff/TypeController.php index 5878006e1..322d51d11 100644 --- a/app/Http/Controllers/Staff/TypeController.php +++ b/app/Http/Controllers/Staff/TypeController.php @@ -14,9 +14,7 @@ namespace App\Http\Controllers\Staff; use App\Type; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; +use Illuminate\Http\Request; use \Toastr; class TypeController extends Controller @@ -39,14 +37,14 @@ class TypeController extends Controller * * */ - public function add() + public function add(Request $request) { - if (Request::isMethod('post')) { + if ($request->isMethod('POST')) { $type = new Type(); - $type->name = Request::get('name'); + $type->name = $request->input('name'); $type->slug = str_slug($type->name); - $type->position = Request::get('position'); - $v = Validator::make($type->toArray(), $type->rules); + $type->position = $request->input('position'); + $v = validator($type->toArray(), $type->rules); if ($v->fails()) { Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { @@ -62,14 +60,14 @@ class TypeController extends Controller * * */ - public function edit($slug, $id) + public function edit(Request $request, $slug, $id) { $type = Type::findOrFail($id); - if (Request::isMethod('post')) { - $type->name = Request::get('name'); + if ($request->isMethod('POST')) { + $type->name = $request->input('name'); $type->slug = str_slug($type->name); - $type->position = Request::get('position'); - $v = Validator::make($type->toArray(), $type->rules); + $type->position = $request->input('position'); + $v = validator($type->toArray(), $type->rules); if ($v->fails()) { Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { diff --git a/app/Http/Controllers/Staff/UserController.php b/app/Http/Controllers/Staff/UserController.php index c2ecd32d6..03356cf80 100755 --- a/app/Http/Controllers/Staff/UserController.php +++ b/app/Http/Controllers/Staff/UserController.php @@ -13,9 +13,7 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Request; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Facades\Auth; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use App\Torrent; use App\User; @@ -40,11 +38,11 @@ class UserController extends Controller */ public function members() { - $users = User::orderBy('created_at', 'DESC')->paginate(20); - $uploaders = User::where('group_id', '=', 7)->orderBy('created_at', 'DESC')->paginate(20); - $mods = User::where('group_id', '=', 6)->orderBy('created_at', 'DESC')->paginate(20); - $admins = User::where('group_id', '=', 4)->orderBy('created_at', 'DESC')->paginate(20); - $coders = User::where('group_id', '=', 10)->orderBy('created_at', 'DESC')->paginate(20); + $users = User::orderBy('created_at', 'DESC')->paginate(25); + $uploaders = User::where('group_id', '=', 7)->orderBy('created_at', 'DESC')->paginate(25); + $mods = User::where('group_id', '=', 6)->orderBy('created_at', 'DESC')->paginate(25); + $admins = User::where('group_id', '=', 4)->orderBy('created_at', 'DESC')->paginate(25); + $coders = User::where('group_id', '=', 10)->orderBy('created_at', 'DESC')->paginate(25); return view('Staff.user.user_search', ['users' => $users, 'uploaders' => $uploaders, 'mods' => $mods, 'admins' => $admins, 'coders' => $coders]); } @@ -54,13 +52,14 @@ class UserController extends Controller * @access public * */ - public function userSearch() + public function userSearch(Request $request) { - $search = Request::get('search'); + $search = $request->input('search'); $users = User::where([ - ['username', 'like', '%' . Request::get('username') . '%'], + ['username', 'like', '%' . $request->input('username') . '%'], ])->paginate(25); - $users->setPath('?username=' . Request::get('username')); + $users->setPath('?username=' . $request->input('username')); + return view('Staff.user.user_results')->with('users', $users); } @@ -74,7 +73,7 @@ class UserController extends Controller { $user = User::findOrFail($id); $groups = Group::all(); - $notes = Note::where('user_id', '=', $id)->orderBy('created_at', 'desc')->paginate(20); + $notes = Note::where('user_id', '=', $id)->orderBy('created_at', 'desc')->paginate(25); return view('Staff.user.user_edit', ['user' => $user, 'groups' => $groups, 'notes' => $notes]); } @@ -84,22 +83,22 @@ class UserController extends Controller * @access public * @return view user.profile */ - public function userEdit($username, $id) + public function userEdit(Request $request, $username, $id) { $user = User::findOrFail($id); - $staff = Auth::user(); + $staff = auth()->user(); $groups = Group::all(); - if (Request::isMethod('post')) { - $user->username = Request::get('username'); - $user->email = Request::get('email'); - $user->uploaded = Request::get('uploaded'); - $user->downloaded = Request::get('downloaded'); - $user->about = Request::get('about'); - $user->group_id = (int)Request::get('group_id'); + if ($request->isMethod('POST')) { + $user->username = $request->input('username'); + $user->email = $request->input('email'); + $user->uploaded = $request->input('uploaded'); + $user->downloaded = $request->input('downloaded'); + $user->about = $request->input('about'); + $user->group_id = (int)$request->input('group_id'); $user->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has edited " . $user->username . " account."); + \LogActivity::addToLog("Staff Member {$staff->username} has edited {$user->username} account."); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Was Updated Successfully!', 'Yay!', ['options'])); } else { @@ -113,21 +112,21 @@ class UserController extends Controller * @access public * @return view user.profile */ - public function userPermissions($username, $id) + public function userPermissions(Request $request, $username, $id) { $user = User::findOrFail($id); - $staff = Auth::user(); - if (Request::isMethod('post')) { - $user->can_upload = Request::get('can_upload'); - $user->can_download = Request::get('can_download'); - $user->can_comment = Request::get('can_comment'); - $user->can_invite = Request::get('can_invite'); - $user->can_request = Request::get('can_request'); - $user->can_chat = Request::get('can_chat'); + $staff = auth()->user(); + if ($request->isMethod('POST')) { + $user->can_upload = $request->input('can_upload'); + $user->can_download = $request->input('can_download'); + $user->can_comment = $request->input('can_comment'); + $user->can_invite = $request->input('can_invite'); + $user->can_request = $request->input('can_request'); + $user->can_chat = $request->input('can_chat'); $user->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has edited " . $user->username . " account permissions."); + \LogActivity::addToLog("Staff Member {$staff->username} has edited {$user->username} account permissions."); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Permissions Succesfully Edited', 'Yay!', ['options'])); } else { @@ -141,17 +140,17 @@ class UserController extends Controller * @access protected * */ - protected function userPassword($username, $id) + protected function userPassword(Request $request, $username, $id) { $user = User::findOrFail($id); - $staff = Auth::user(); - if (Request::isMethod('post')) { - $new_password = Request::get('new_password'); + $staff = auth()->user(); + if ($request->isMethod('POST')) { + $new_password = $request->input('new_password'); $user->password = Hash::make($new_password); $user->save(); // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has changed " . $user->username . " password."); + \LogActivity::addToLog("Staff Member {$staff->username} has changed {$user->username} password."); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Password Was Updated Successfully!', 'Yay!', ['options'])); } else { @@ -169,8 +168,8 @@ class UserController extends Controller protected function userDelete($username, $id) { $user = User::findOrFail($id); - $staff = Auth::user(); - if ($user->group->is_modo || Auth::user()->id == $user->id) { + $staff = auth()->user(); + if ($user->group->is_modo || auth()->user()->id == $user->id) { return redirect()->route('home')->with(Toastr::error('You Cannot Delete Yourself Or Other Staff', 'Whoops!', ['options'])); } else { // Removes UserID from Torrents if any and replaces with System UserID (0) @@ -230,7 +229,7 @@ class UserController extends Controller } // Activity Log - \LogActivity::addToLog("Staff Member " . $staff->username . " has deleted " . $user->username . " account."); + \LogActivity::addToLog("Staff Member {$staff->username} has deleted {$user->username} account."); if ($user->delete()) { return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Yay!', ['options'])); diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php index 32cbcde6c..1eef388b3 100644 --- a/app/Http/Controllers/StatsController.php +++ b/app/Http/Controllers/StatsController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers; +use Illuminate\Support\Facades\DB; use App\User; use App\Torrent; use App\Peer; @@ -19,9 +20,7 @@ use App\History; use App\BonTransactions; use App\Requests; use App\Group; -use Illuminate\Support\Facades\DB; use Carbon\Carbon; -use Cache; class StatsController extends Controller { @@ -38,55 +37,55 @@ class StatsController extends Controller // Site Stats Block // Total Members Count - $num_user = Cache::remember('num_user', 60, function () { + $num_user = cache()->remember('num_user', 60, function () { return User::all()->count(); }); // Total Torrents Count - $num_torrent = Cache::remember('num_torrent', 60, function () { + $num_torrent = cache()->remember('num_torrent', 60, function () { return Torrent::all()->count(); }); // Total Movies Count - $num_movies = Cache::remember('num_movies', 60, function () { + $num_movies = cache()->remember('num_movies', 60, function () { return Torrent::where('category_id', '1')->count(); }); // Total HDTV Count - $num_hdtv = Cache::remember('num_hdtv', 60, function () { + $num_hdtv = cache()->remember('num_hdtv', 60, function () { return Torrent::where('category_id', '2')->count(); }); // Total FANRES Count - $num_fan = Cache::remember('num_fan', 60, function () { + $num_fan = cache()->remember('num_fan', 60, function () { return Torrent::where('category_id', '3')->count(); }); // Total SD Count - $num_sd = Cache::remember('num_sd', 60, function () { + $num_sd = cache()->remember('num_sd', 60, function () { return Torrent::where('sd', '1')->count(); }); // Total Seeders - $num_seeders = Cache::remember('num_seeders', 60, function () { + $num_seeders = cache()->remember('num_seeders', 60, function () { return Peer::where('seeder', '1')->count(); }); // Total Leechers - $num_leechers = Cache::remember('num_leechers', 60, function () { + $num_leechers = cache()->remember('num_leechers', 60, function () { return Peer::where('seeder', '0')->count(); }); // Total Peers - $num_peers = Cache::remember('num_peers', 60, function () { + $num_peers = cache()->remember('num_peers', 60, function () { return Peer::all()->count(); }); //Total Upload Traffic Without Double Upload - $actual_upload = Cache::remember('actual_upload', 60, function () { + $actual_upload = cache()->remember('actual_upload', 60, function () { return History::all()->sum('actual_uploaded'); }); //Total Upload Traffic With Double Upload - $credited_upload = Cache::remember('credited_upload', 60, function () { + $credited_upload = cache()->remember('credited_upload', 60, function () { return History::all()->sum('uploaded'); }); //Total Download Traffic Without Freeleech - $actual_download = Cache::remember('actual_download', 60, function () { + $actual_download = cache()->remember('actual_download', 60, function () { return History::all()->sum('actual_downloaded'); }); //Total Download Traffic With Freeleech - $credited_download = Cache::remember('credited_download', 60, function () { + $credited_download = cache()->remember('credited_download', 60, function () { return History::all()->sum('downloaded'); }); $actual_up_down = $actual_upload + $actual_download; //Total Up/Down Traffic without perks diff --git a/app/Http/Controllers/ThankController.php b/app/Http/Controllers/ThankController.php index 9b0a62d17..84142c74a 100644 --- a/app/Http/Controllers/ThankController.php +++ b/app/Http/Controllers/ThankController.php @@ -14,8 +14,6 @@ namespace App\Http\Controllers; use App\Thank; use App\Torrent; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; use \Toastr; class ThankController extends Controller @@ -29,7 +27,7 @@ class ThankController extends Controller */ public function torrentThank($slug, $id) { - $user = Auth::user(); + $user = auth()->user(); $torrent = Torrent::findOrFail($id); $thank = Thank::where('user_id', '=', $user->id)->where('torrent_id', '=', $torrent->id)->first(); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index f50f15a54..f2a7075fe 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -12,16 +12,15 @@ namespace App\Http\Controllers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Facades\Mail; use App\Group; -use App\Mail\InviteUser; use App\User; -use App\Category; use App\Peer; use App\Torrent; -use App\TorrentFile; use App\Comment; use App\Client; -use App\Shoutbox; use App\Post; use App\Topic; use App\PrivateMessage; @@ -29,19 +28,7 @@ use App\Follow; use App\History; use App\Warning; use App\Note; -use Carbon\Carbon; -use Illuminate\Support\Facades\Request; -use Illuminate\Http\Request as IlluminateRequest; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Validator; -use Illuminate\Contracts\Auth\Authenticatable; -use App\Http\Requests\ValidateSecretRequest; -use Illuminate\Support\Facades\Input; -use Cache; +use App\Mail\InviteUser; use \Toastr; use Image; use Carbon\Cabon; @@ -73,13 +60,13 @@ class UserController extends Controller * @access public * */ - public function userSearch() + public function userSearch(Request $request) { - $search = Request::get('search'); + $search = $request->input('search'); $users = User::where([ - ['username', 'like', '%' . Request::get('username') . '%'], + ['username', 'like', '%' . $request->input('username') . '%'], ])->paginate(25); - $users->setPath('?username=' . Request::get('username')); + $users->setPath('?username=' . $request->input('username')); return view('user.members')->with('users', $users); } @@ -120,14 +107,14 @@ class UserController extends Controller * @return void * */ - public function editProfil($username, $id) + public function editProfil(Request $request, $username, $id) { - $user = Auth::user(); + $user = auth()->user(); // Requetes post only - if (Request::isMethod('post')) { + if ($request->isMethod('POST')) { // Avatar - if (Request::hasFile('image')) { - $image = Request::file('image'); + if ($request->hasFile('image')) { + $image = $request->file('image'); if (in_array($image->getClientOriginalExtension(), ['jpg', 'JPG', 'jpeg', 'bmp', 'png', 'PNG', 'tiff', 'gif', 'GIF']) && preg_match('#image/*#', $image->getMimeType())) { $filename = $user->username . '.' . $image->getClientOriginalExtension(); $path = public_path('/files/img/' . $filename); @@ -136,9 +123,9 @@ class UserController extends Controller } } // Define data - $user->title = Request::get('title'); - $user->about = Request::get('about'); - $user->signature = Request::get('signature'); + $user->title = $request->input('title'); + $user->about = $request->input('about'); + $user->signature = $request->input('signature'); // Save the user $user->save(); @@ -159,7 +146,7 @@ class UserController extends Controller */ public function settings($username, $id) { - $user = Auth::user(); + $user = auth()->user(); return view('user.settings', ['user' => $user]); } @@ -169,26 +156,26 @@ class UserController extends Controller * @access public * @return view user.settings */ - public function changeSettings($username, $id) + public function changeSettings(Request $request, $username, $id) { - $user = Auth::user(); - if (Request::isMethod('post')) { - $user->style = (int)Request::get('theme'); - $css_url = Request::get('custom_css'); + $user = auth()->user(); + if ($request->isMethod('POST')) { + $user->style = (int)$request->input('theme'); + $css_url = $request->input('custom_css'); if (isset($css_url) && filter_var($css_url, FILTER_VALIDATE_URL) === false) { return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('The URL for the external CSS stylesheet is invalid, try it again with a valid URL.', 'Whoops!', ['options'])); } else { $user->custom_css = $css_url; } - $user->nav = Request::get('sidenav'); - $user->hidden = Request::get('onlinehide'); - $user->private_profile = Request::get('private_profile'); - $user->peer_hidden = Request::get('peer_hidden'); - $user->show_poster = Request::get('show_poster'); - $user->ratings = Request::get('ratings'); + $user->nav = $request->input('sidenav'); + $user->hidden = $request->input('onlinehide'); + $user->private_profile = $request->input('private_profile'); + $user->peer_hidden = $request->input('peer_hidden'); + $user->show_poster = $request->input('show_poster'); + $user->ratings = $request->input('ratings'); if (config('auth.TwoStepEnabled') == true) { - $user->twostep = Request::get('twostep'); + $user->twostep = $request->input('twostep'); } $user->save(); @@ -207,14 +194,14 @@ class UserController extends Controller * @access protected * */ - protected function changePassword(IlluminateRequest $request) + protected function changePassword(Request $request) { $this->validate($request, [ 'current_password' => 'required', 'new_password' => 'required|min:6|confirmed', 'new_password_confirmation' => 'required|min:6', ]); - $usr = User::findOrFail(Auth::user()->id); + $usr = User::findOrFail(auth()->user()->id); if (Hash::check($request->current_password, $usr->password)) { $usr->fill([ 'password' => Hash::make($request->new_password) @@ -231,16 +218,16 @@ class UserController extends Controller * @access protected * */ - protected function changeEmail($username, $id) + protected function changeEmail(Request $request, $username, $id) { - $user = Auth::user(); - $v = Validator::make(Request::all(), [ + $user = auth()->user(); + $v = validator($request->all(), [ 'current_password' => 'required', 'new_email' => 'required', ]); if ($v->passes()) { - if (Request::isMethod('post')) { - $user->email = Request::get('new_email'); + if ($request->isMethod('POST')) { + $user->email = $request->input('new_email'); $user->save(); // Activity Log @@ -259,10 +246,10 @@ class UserController extends Controller * @access public * @return view user.settings */ - public function changePID($username, $id) + public function changePID(Request $request, $username, $id) { - $user = Auth::user(); - if (Request::isMethod('post')) { + $user = auth()->user(); + if ($request->isMethod('post')) { $user->passkey = md5(uniqid() . time() . microtime()); $user->save(); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your PID Was Changed Successfully!', 'Yay!', ['options'])); @@ -281,29 +268,29 @@ class UserController extends Controller */ public function clients($username, $id) { - $user = Auth::user(); + $user = auth()->user(); $cli = Client::where('user_id', '=', $user->id)->get(); return view('user.clients', ['user' => $user, 'clients' => $cli]); } - protected function authorizeClient($username, $id) + protected function authorizeClient(Request $request, $username, $id) { - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'password' => 'required', 'ip' => 'required|ipv4|unique:clients,ip', 'client_name' => 'required|alpha_num', ]); - $user = Auth::user(); + $user = auth()->user(); if ($v->passes()) { - if (Hash::check(Request::get('password'), $user->password)) { + if (Hash::check($request->input('password'), $user->password)) { if (Client::where('user_id', '=', $user->id)->get()->count() >= config('other.max_cli')) { return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Max Clients Reached!', 'Whoops!', ['options'])); } $cli = new Client; $cli->user_id = $user->id; - $cli->name = Request::get('client_name'); - $cli->ip = Request::get('ip'); + $cli->name = $request->input('client_name'); + $cli->ip = $request->input('ip'); $cli->save(); return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Client Has Been Added!', 'Yay', ['options'])); } else { @@ -314,16 +301,16 @@ class UserController extends Controller } } - protected function removeClient($username, $id) + protected function removeClient(Request $request, $username, $id) { - $v = Validator::make(Request::all(), [ + $v = validator($request->all(), [ 'cliid' => 'required|exists:clients,id', 'userid' => 'required|exists:users,id', ]); - $user = Auth::user(); + $user = auth()->user(); if ($v->passes()) { - $cli = Client::where('id', '=', Request::get('cliid')); + $cli = Client::where('id', '=', $request->input('cliid')); $cli->delete(); return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Client Has Been Removed!', 'Yay!', ['options'])); } else { @@ -333,7 +320,7 @@ class UserController extends Controller public function getWarnings($username, $id) { - if (Auth::user()->group->is_modo) { + if (auth()->user()->group->is_modo) { $user = User::findOrFail($id); $warnings = Warning::where('user_id', '=', $user->id)->with(['torrenttitle', 'warneduser'])->orderBy('active', 'DESC')->paginate(25); $warningcount = Warning::where('user_id', '=', $id)->count(); @@ -346,8 +333,8 @@ class UserController extends Controller public function deactivateWarning($id) { - if (Auth::user()->group->is_modo) { - $staff = Auth::user(); + if (auth()->user()->group->is_modo) { + $staff = auth()->user(); $warning = Warning::findOrFail($id); $warning->expires_on = Carbon::now(); $warning->active = 0; @@ -363,7 +350,7 @@ class UserController extends Controller public function myUploads($username, $id) { $user = User::findOrFail($id); - if (Auth::user()->group->is_modo || Auth::user()->id == $user->id) { + if (auth()->user()->group->is_modo || auth()->user()->id == $user->id) { $torrents = Torrent::withAnyStatus()->sortable(['created_at' => 'desc'])->where('user_id', '=', $user->id)->paginate(50); return view('user.uploads', ['user' => $user, 'torrents' => $torrents]); } else { @@ -374,7 +361,7 @@ class UserController extends Controller public function myActive($username, $id) { $user = User::findOrFail($id); - if (Auth::user()->group->is_modo || Auth::user()->id == $user->id) { + if (auth()->user()->group->is_modo || auth()->user()->id == $user->id) { $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 { @@ -385,7 +372,7 @@ class UserController extends Controller public function myHistory($username, $id) { $user = User::findOrFail($id); - if (Auth::user()->group->is_modo || Auth::user()->id == $user->id) { + if (auth()->user()->group->is_modo || auth()->user()->id == $user->id) { $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');