diff --git a/app/Console/Commands/AutoBan.php b/app/Console/Commands/AutoBan.php index b2e5e0c3c4..0c7d1e5c45 100644 --- a/app/Console/Commands/AutoBan.php +++ b/app/Console/Commands/AutoBan.php @@ -44,13 +44,16 @@ class AutoBan extends Command */ public function handle() { - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $bans = Warning::with('warneduser')->select(DB::raw('user_id, count(*) as value'))->where('active', '=', 1)->groupBy('user_id')->having('value', '>=', config('hitrun.max_warnings'))->get(); foreach ($bans as $ban) { - if ($ban->warneduser->group_id != $bannedGroup->id && ! $ban->warneduser->group->is_immune) { + if ($ban->warneduser->group_id != $banned_group[0] && ! $ban->warneduser->group->is_immune) { // If User Has x or More Active Warnings Ban Set The Users Group To Banned - $ban->warneduser->group_id = $bannedGroup->id; + $ban->warneduser->group_id = $banned_group[0]; $ban->warneduser->can_upload = 0; $ban->warneduser->can_download = 0; $ban->warneduser->can_comment = 0; diff --git a/app/Console/Commands/AutoDisableInactiveUsers.php b/app/Console/Commands/AutoDisableInactiveUsers.php index a4870b6b02..f7e4ea71c3 100644 --- a/app/Console/Commands/AutoDisableInactiveUsers.php +++ b/app/Console/Commands/AutoDisableInactiveUsers.php @@ -43,7 +43,10 @@ class AutoDisableInactiveUsers extends Command public function handle() { if (config('pruning.user_pruning') == true) { - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $current = Carbon::now(); $matches = User::whereIn('group_id', [config('pruning.group_ids')]); @@ -54,7 +57,7 @@ public function handle() foreach ($users as $user) { if ($user->getSeeding() !== 0) { - $user->group_id = $disabledGroup->id; + $user->group_id = $disabled_group[0]; $user->can_upload = 0; $user->can_download = 0; $user->can_comment = 0; diff --git a/app/Console/Commands/AutoRevokePermissions.php b/app/Console/Commands/AutoRevokePermissions.php index 3bdb52e476..269b8575a1 100644 --- a/app/Console/Commands/AutoRevokePermissions.php +++ b/app/Console/Commands/AutoRevokePermissions.php @@ -42,14 +42,24 @@ class AutoRevokePermissions extends Command */ public function handle() { - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $leechGroup = Group::select(['id'])->where('slug', '=', 'leech')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $leech_group = cache()->rememberForever('leech_group', function () { + return Group::where('slug', '=', 'leech')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); - User::whereNotIn('group_id', [$bannedGroup->id, $validatingGroup->id, $leechGroup->id, $disabledGroup->id, $prunedGroup->id])->update(['can_download' => '1', 'can_request' => '1']); - User::whereIn('group_id', [$bannedGroup->id, $validatingGroup->id, $leechGroup->id, $disabledGroup->id, $prunedGroup->id])->update(['can_download' => '0', 'can_request' => '0']); + User::whereNotIn('group_id', [$banned_group[0], $validating_group[0], $leech_group[0], $disabled_group[0], $pruned_group[0]])->update(['can_download' => '1', 'can_request' => '1']); + User::whereIn('group_id', [$banned_group[0], $validating_group[0], $leech_group[0], $disabled_group[0], $pruned_group[0]])->update(['can_download' => '0', 'can_request' => '0']); $warning = Warning::with('warneduser')->select(DB::raw('user_id, count(*) as value'))->where('active', '=', 1)->groupBy('user_id')->having('value', '>=', config('hitrun.revoke'))->get(); diff --git a/app/Console/Commands/AutoSoftDeleteDisabledUsers.php b/app/Console/Commands/AutoSoftDeleteDisabledUsers.php index bc7053b423..df973323bc 100644 --- a/app/Console/Commands/AutoSoftDeleteDisabledUsers.php +++ b/app/Console/Commands/AutoSoftDeleteDisabledUsers.php @@ -43,11 +43,15 @@ class AutoSoftDeleteDisabledUsers extends Command public function handle() { if (config('pruning.user_pruning') == true) { - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); $current = Carbon::now(); - $users = User::where('group_id', '=', $disabledGroup->id) + $users = User::where('group_id', '=', $disabled_group[0]) ->where('disabled_at', '<', $current->copy()->subDays(config('pruning.soft_delete'))->toDateTimeString()) ->get(); @@ -61,7 +65,7 @@ public function handle() $user->can_invite = 0; $user->can_request = 0; $user->can_chat = 0; - $user->group = $prunedGroup->id; + $user->group = $pruned_group[0]; $user->deleted_by = 1; $user->save(); $user->delete(); diff --git a/app/Http/Controllers/AnnounceController.php b/app/Http/Controllers/AnnounceController.php index 6fa04d70d0..902613eedd 100644 --- a/app/Http/Controllers/AnnounceController.php +++ b/app/Http/Controllers/AnnounceController.php @@ -114,7 +114,7 @@ public function announce(Request $request, $passkey) } // Check Passkey Against Users Table - $user = User::with(['group', 'history'])->where('passkey', '=', $passkey)->first(); + $user = User::with(['group'])->where('passkey', '=', $passkey)->first(); // If Passkey Doesn't Exist Return Error to Client if (! $user) { @@ -256,7 +256,7 @@ public function announce(Request $request, $passkey) } // Get history information - $history = $user->history->where('info_hash', '=', $info_hash)->first(); + $history = History::where('info_hash', '=', $info_hash)->where('user_id', '=', $user->id)->first(); if (! $history) { $history = new History(); diff --git a/app/Http/Controllers/Auth/ActivationController.php b/app/Http/Controllers/Auth/ActivationController.php index 78a3bf7113..f6f7830a71 100644 --- a/app/Http/Controllers/Auth/ActivationController.php +++ b/app/Http/Controllers/Auth/ActivationController.php @@ -21,18 +21,22 @@ class ActivationController extends Controller { public function activate($token) { - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $member_group = cache()->rememberForever('member_group', function () { + return Group::where('slug', '=', 'user')->pluck('id'); + }); $activation = UserActivation::with('user')->where('token', '=', $token)->firstOrFail(); - if ($activation->user->id && $activation->user->group->id != $bannedGroup->id) { + if ($activation->user->id && $activation->user->group->id != $banned_group[0]) { $activation->user->active = 1; $activation->user->can_upload = 1; $activation->user->can_download = 1; $activation->user->can_request = 1; $activation->user->can_comment = 1; $activation->user->can_invite = 1; - $activation->user->group_id = $memberGroup->id; + $activation->user->group_id = $member_group[0]; $activation->user->save(); $activation->delete(); diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d247b0344d..58c69cfe05 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -67,12 +67,20 @@ protected function validateLogin(Request $request) protected function authenticated(Request $request, $user) { - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first(); - - if ($user->active == 0 || $user->group_id == $validatingGroup->id) { + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $member_group = cache()->rememberForever('member_group', function () { + return Group::where('slug', '=', 'user')->pluck('id'); + }); + + if ($user->active == 0 || $user->group_id == $validating_group[0]) { $this->guard()->logout(); $request->session()->invalidate(); @@ -80,7 +88,7 @@ protected function authenticated(Request $request, $user) ->withErrors(trans('auth.not-activated')); } - if ($user->group_id == $bannedGroup->id) { + if ($user->group_id == $banned_group[0]) { $this->guard()->logout(); $request->session()->invalidate(); @@ -88,8 +96,8 @@ protected function authenticated(Request $request, $user) ->withErrors(trans('auth.banned')); } - if ($user->group_id == $disabledGroup->id) { - $user->group_id = $memberGroup->id; + if ($user->group_id == $disabled_group[0]) { + $user->group_id = $member_group[0]; $user->can_upload = 1; $user->can_download = 1; $user->can_comment = 1; @@ -103,8 +111,8 @@ protected function authenticated(Request $request, $user) ->withSuccess(trans('auth.welcome-restore')); } - if (auth()->viaRemember() && $user->group_id == $disabledGroup->id) { - $user->group_id = $memberGroup->id; + if (auth()->viaRemember() && $user->group_id == $disabled_group[0]) { + $user->group_id = $member_group[0]; $user->can_upload = 1; $user->can_download = 1; $user->can_comment = 1; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 1b726cc3a4..a95fb69d0e 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -78,7 +78,10 @@ public function register(Request $request, $code = null) ->withErrors(trans('auth.invalid-key')); } - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $user = new User(); $user->username = $request->input('username'); $user->email = $request->input('email'); @@ -89,7 +92,7 @@ public function register(Request $request, $code = null) $user->downloaded = config('other.default_download'); $user->style = config('other.default_style', 0); $user->locale = config('app.locale'); - $user->group_id = $validatingGroup->id; + $user->group_id = $validating_group[0]; if (config('email-white-blacklist.enabled') === 'allow' && config('captcha.enabled') == true) { $v = validator($request->all(), [ diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index cd268f04d3..956b29cab3 100755 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -33,13 +33,17 @@ public function __construct() protected function resetPassword($user, $password) { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first(); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $member_group = cache()->rememberForever('member_group', function () { + return Group::where('slug', '=', 'user')->pluck('id'); + }); $user->password = bcrypt($password); $user->remember_token = Str::random(60); - if ($user->group_id === $validatingGroup->id) { - $user->group_id = $memberGroup->id; + if ($user->group_id === $validating_group[0]) { + $user->group_id = $member_group[0]; } $user->active = true; diff --git a/app/Http/Controllers/PlaylistController.php b/app/Http/Controllers/PlaylistController.php index be1d1c7cff..e92831ef86 100644 --- a/app/Http/Controllers/PlaylistController.php +++ b/app/Http/Controllers/PlaylistController.php @@ -45,7 +45,7 @@ public function __construct(ChatRepository $chat) */ public function index() { - $playlists = Playlist::with('user')->withCount('torrents')->where('is_private', '=', 0)->orderBy('name', 'ASC')->paginate(25); + $playlists = Playlist::with('user')->withCount('torrents')->where('is_private', '=', 0)->orderBy('name', 'ASC')->paginate(24); return view('playlist.index', ['playlists' => $playlists]); } diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 3873639173..be8978c8c6 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -146,13 +146,17 @@ public function show($id, $rsskey) $user = User::where('rsskey', '=', (string) $rsskey)->firstOrFail(); $rss = Rss::where('id', '=', (int) $id)->whereRaw('(user_id = ? OR is_private != ?)', [$user->id, 1])->firstOrFail(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - - if ($user->group->id == $bannedGroup->id) { + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + + if ($user->group->id == $banned_group[0]) { abort(404); } - if ($user->group->id == $disabledGroup->id) { + if ($user->group->id == $disabled_group[0]) { abort(404); } if ($user->active == 0) { diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php index 4b4017c9bc..52e9b4492a 100644 --- a/app/Http/Controllers/Staff/BanController.php +++ b/app/Http/Controllers/Staff/BanController.php @@ -49,11 +49,13 @@ public function store(Request $request, $username) { $user = User::where('username', '=', $username)->firstOrFail(); $staff = $request->user(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); abort_if($user->group->is_modo || $request->user()->id == $user->id, 403); - $user->group_id = $bannedGroup->id; + $user->group_id = $banned_group[0]; $user->can_upload = 0; $user->can_download = 0; $user->can_comment = 0; diff --git a/app/Http/Controllers/Staff/HomeController.php b/app/Http/Controllers/Staff/HomeController.php index 1b8ac2730f..1915b367c0 100644 --- a/app/Http/Controllers/Staff/HomeController.php +++ b/app/Http/Controllers/Staff/HomeController.php @@ -36,11 +36,15 @@ class HomeController extends Controller public function index(Request $request) { // User Info - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); $num_user = User::count(); - $banned = User::where('group_id', '=', $bannedGroup->id)->count(); - $validating = User::where('group_id', '=', $validatingGroup->id)->count(); + $banned = User::where('group_id', '=', $banned_group[0])->count(); + $validating = User::where('group_id', '=', $validating_group[0])->count(); // Torrent Info $num_torrent = Torrent::count(); diff --git a/app/Http/Controllers/Staff/MassActionController.php b/app/Http/Controllers/Staff/MassActionController.php index c80084bca7..2e866b5561 100644 --- a/app/Http/Controllers/Staff/MassActionController.php +++ b/app/Http/Controllers/Staff/MassActionController.php @@ -40,7 +40,6 @@ public function create() */ public function store(Request $request) { - $staff = $request->user(); $users = User::all(); $sender_id = 1; @@ -72,12 +71,16 @@ public function store(Request $request) */ public function update() { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first(); - $users = User::where('active', '=', 0)->where('group_id', '=', $validatingGroup->id)->get(); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $member_group = cache()->rememberForever('member_group', function () { + return Group::where('slug', '=', 'user')->pluck('id'); + }); + $users = User::where('active', '=', 0)->where('group_id', '=', $validating_group[0])->get(); foreach ($users as $user) { - $user->group_id = $memberGroup->id; + $user->group_id = $member_group[0]; $user->active = 1; $user->can_upload = 1; $user->can_download = 1; diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php index 91b3282aa7..41dc234718 100644 --- a/app/Http/Controllers/StatsController.php +++ b/app/Http/Controllers/StatsController.php @@ -52,33 +52,47 @@ public function index() // Total Active Members Count (Not Validating, Banned, Disabled, Pruned) $active_user = cache()->remember('active_user', $this->expiresAt, function () { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); - - return User::whereNotIn('group_id', [$validatingGroup->id, $bannedGroup->id, $disabledGroup->id, $prunedGroup->id])->count(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); + + return User::whereNotIn('group_id', [$validating_group[0], $banned_group[0], $disabled_group[0], $pruned_group[0]])->count(); }); // Total Disabled Members Count $disabled_user = cache()->remember('disabled_user', $this->expiresAt, function () { - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); - return User::where('group_id', '=', $disabledGroup->id)->count(); + return User::where('group_id', '=', $disabled_group[0])->count(); }); // Total Pruned Members Count $pruned_user = cache()->remember('pruned_user', $this->expiresAt, function () { - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); - return User::onlyTrashed()->where('group_id', '=', $prunedGroup->id)->count(); + return User::onlyTrashed()->where('group_id', '=', $pruned_group[0])->count(); }); // Total Banned Members Count $banned_user = cache()->remember('banned_user', $this->expiresAt, function () { - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); - return User::where('group_id', '=', $bannedGroup->id)->count(); + return User::where('group_id', '=', $banned_group[0])->count(); }); // Total Torrents Count @@ -175,13 +189,21 @@ public function index() */ public function uploaded() { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); // Fetch Top Uploaders - $uploaded = User::latest('uploaded')->whereNotIn('group_id', [$validatingGroup->id, $bannedGroup->id, $disabledGroup->id, $prunedGroup->id])->take(100)->get(); + $uploaded = User::latest('uploaded')->whereNotIn('group_id', [$validating_group[0], $banned_group[0], $disabled_group[0], $pruned_group[0]])->take(100)->get(); return view('stats.users.uploaded', ['uploaded' => $uploaded]); } @@ -193,13 +215,21 @@ public function uploaded() */ public function downloaded() { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); // Fetch Top Downloaders - $downloaded = User::latest('downloaded')->whereNotIn('group_id', [$validatingGroup->id, $bannedGroup->id, $disabledGroup->id, $prunedGroup->id])->take(100)->get(); + $downloaded = User::latest('downloaded')->whereNotIn('group_id', [$validating_group[0], $banned_group[0], $disabled_group[0], $pruned_group[0]])->take(100)->get(); return view('stats.users.downloaded', ['downloaded' => $downloaded]); } @@ -250,13 +280,21 @@ public function uploaders() */ public function bankers() { - $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); - $disabledGroup = Group::select(['id'])->where('slug', '=', 'disabled')->first(); - $prunedGroup = Group::select(['id'])->where('slug', '=', 'pruned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); + $validating_group = cache()->rememberForever('validating_group', function () { + return Group::where('slug', '=', 'validating')->pluck('id'); + }); + $disabled_group = cache()->rememberForever('disabled_group', function () { + return Group::where('slug', '=', 'disabled')->pluck('id'); + }); + $pruned_group = cache()->rememberForever('pruned_group', function () { + return Group::where('slug', '=', 'pruned')->pluck('id'); + }); // Fetch Top Bankers - $bankers = User::latest('seedbonus')->whereNotIn('group_id', [$validatingGroup->id, $bannedGroup->id, $disabledGroup->id, $prunedGroup->id])->take(100)->get(); + $bankers = User::latest('seedbonus')->whereNotIn('group_id', [$validating_group[0], $banned_group[0], $disabled_group[0], $pruned_group[0]])->take(100)->get(); return view('stats.users.bankers', ['bankers' => $bankers]); } diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php index 946c2c6388..0d5656cb87 100644 --- a/app/Http/Controllers/TorrentController.php +++ b/app/Http/Controllers/TorrentController.php @@ -1079,14 +1079,17 @@ public function edit(Request $request, $id) } else { $torrent->save(); + $meta = null; + // Torrent Tags System - if ($torrent->category_id == 2) { + if ($torrent->category->tv_meta) { if ($torrent->tmdb && $torrent->tmdb != 0) { $meta = $client->scrape('tv', null, $torrent->tmdb); } else { $meta = $client->scrape('tv', 'tt'.$torrent->imdb); } - } else { + } + if ($torrent->category->movie_meta) { if ($torrent->tmdb && $torrent->tmdb != 0) { $meta = $client->scrape('movie', null, $torrent->tmdb); } else { @@ -1094,15 +1097,17 @@ public function edit(Request $request, $id) } } - if ($meta->genres) { + if (isset($meta) && $meta->genres) { + $old_genres = TagTorrent::where('torrent_id', '=', $torrent->id)->get(); + foreach ($old_genres as $old_genre) { + $old_genre->delete(); + } + foreach ($meta->genres as $genre) { - $exist = TagTorrent::where('torrent_id', '=', $torrent->id)->where('tag_name', '=', $genre)->first(); - if (! $exist) { - $tag = new TagTorrent(); - $tag->torrent_id = $torrent->id; - $tag->tag_name = $genre; - $tag->save(); - } + $tag = new TagTorrent(); + $tag->torrent_id = $torrent->id; + $tag->tag_name = $genre; + $tag->save(); } } diff --git a/app/Http/Middleware/CheckIfBanned.php b/app/Http/Middleware/CheckIfBanned.php index 4647312d13..5cf4fd4c33 100644 --- a/app/Http/Middleware/CheckIfBanned.php +++ b/app/Http/Middleware/CheckIfBanned.php @@ -30,9 +30,11 @@ class CheckIfBanned public function handle($request, Closure $next, $guard = null) { $user = $request->user(); - $bannedGroup = Group::select(['id'])->where('slug', '=', 'banned')->first(); + $banned_group = cache()->rememberForever('banned_group', function () { + return Group::where('slug', '=', 'banned')->pluck('id'); + }); - if ($user && $user->group_id == $bannedGroup->id) { + if ($user && $user->group_id == $banned_group[0]) { auth()->logout(); $request->session()->flush(); diff --git a/app/Notifications/NewBon.php b/app/Notifications/NewBon.php index b4b52ec1b0..dbde58725a 100644 --- a/app/Notifications/NewBon.php +++ b/app/Notifications/NewBon.php @@ -68,7 +68,7 @@ public function toArray($notifiable) return [ 'title' => $this->sender.' Has Gifted You '.$this->transaction->cost.' BON', 'body' => $this->sender.' has gifted you '.$this->transaction->cost.' BON with the following note: '.$this->transaction->comment, - 'url' => "/users/{$this->transaction->senderObj->id}", + 'url' => "/users/{$this->transaction->senderObj->username}", ]; } } diff --git a/app/Notifications/NewFollow.php b/app/Notifications/NewFollow.php index f6be26468f..cf887cfe66 100644 --- a/app/Notifications/NewFollow.php +++ b/app/Notifications/NewFollow.php @@ -73,7 +73,7 @@ public function toArray($notifiable) return [ 'title' => $this->sender->username.' Has Followed You!', 'body' => $this->sender->username.' has started to follow you so they will get notifications about your activities.', - 'url' => "/users/{$this->sender->id}", + 'url' => "/users/{$this->sender->username}", ]; } } diff --git a/app/Notifications/NewUnfollow.php b/app/Notifications/NewUnfollow.php index 042c06a2cd..8d6d84aedf 100644 --- a/app/Notifications/NewUnfollow.php +++ b/app/Notifications/NewUnfollow.php @@ -68,7 +68,7 @@ public function toArray($notifiable) return [ 'title' => $this->sender->username.' Has Unfollowed You!', 'body' => $this->sender->username.' has stopped following you so they will no longer get notifications about your activities.', - 'url' => '/users/'.$this->sender->id, + 'url' => '/users/'.$this->sender->username, ]; } } diff --git a/composer.lock b/composer.lock index b6b474f73b..52a6fb5b3d 100644 --- a/composer.lock +++ b/composer.lock @@ -470,16 +470,16 @@ }, { "name": "doctrine/cache", - "version": "v1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "d4374ae95b36062d02ef310100ed33d78738d76c" + "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c", - "reference": "d4374ae95b36062d02ef310100ed33d78738d76c", + "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", + "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", "shasum": "" }, "require": { @@ -490,7 +490,7 @@ }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^6.0", "mongodb/mongodb": "^1.1", "phpunit/phpunit": "^7.0", "predis/predis": "~1.0" @@ -501,7 +501,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -535,13 +535,21 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Caching library offering an object-oriented API for many cache backends", - "homepage": "https://www.doctrine-project.org", + "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", + "homepage": "https://www.doctrine-project.org/projects/cache.html", "keywords": [ + "abstraction", + "apcu", "cache", - "caching" + "caching", + "couchdb", + "memcached", + "php", + "redis", + "riak", + "xcache" ], - "time": "2019-10-28T09:31:32+00:00" + "time": "2019-11-15T14:31:57+00:00" }, { "name": "doctrine/dbal", @@ -637,16 +645,16 @@ }, { "name": "doctrine/event-manager", - "version": "v1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" + "reference": "629572819973f13486371cb611386eb17851e85c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", - "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", + "reference": "629572819973f13486371cb611386eb17851e85c", "shasum": "" }, "require": { @@ -656,7 +664,7 @@ "doctrine/common": "<2.9@dev" }, "require-dev": { - "doctrine/coding-standard": "^4.0", + "doctrine/coding-standard": "^6.0", "phpunit/phpunit": "^7.0" }, "type": "library", @@ -675,6 +683,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -683,10 +695,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -700,27 +708,29 @@ "email": "ocramius@gmail.com" } ], - "description": "Doctrine Event Manager component", + "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", "homepage": "https://www.doctrine-project.org/projects/event-manager.html", "keywords": [ "event", - "eventdispatcher", - "eventmanager" + "event dispatcher", + "event manager", + "event system", + "events" ], - "time": "2018-06-11T11:59:03+00:00" + "time": "2019-11-10T09:48:07+00:00" }, { "name": "doctrine/inflector", - "version": "v1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "5527a48b7313d15261292c149e55e26eae771b0a" + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", - "reference": "5527a48b7313d15261292c149e55e26eae771b0a", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "shasum": "" }, "require": { @@ -745,6 +755,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -753,10 +767,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -774,20 +784,20 @@ "singularize", "string" ], - "time": "2018-01-09T20:05:19+00:00" + "time": "2019-10-30T19:59:35+00:00" }, { "name": "doctrine/lexer", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea" + "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", - "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", "shasum": "" }, "require": { @@ -801,7 +811,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -836,7 +846,7 @@ "parser", "php" ], - "time": "2019-07-30T19:33:28+00:00" + "time": "2019-10-30T14:39:59+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1734,16 +1744,16 @@ }, { "name": "laravel/framework", - "version": "v6.5.0", + "version": "v6.5.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6d120a21ef0c69630e92dec67932ef434c746019" + "reference": "cca8906654e72d7bb118c3c18bb55e74c109a766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6d120a21ef0c69630e92dec67932ef434c746019", - "reference": "6d120a21ef0c69630e92dec67932ef434c746019", + "url": "https://api.github.com/repos/laravel/framework/zipball/cca8906654e72d7bb118c3c18bb55e74c109a766", + "reference": "cca8906654e72d7bb118c3c18bb55e74c109a766", "shasum": "" }, "require": { @@ -1876,7 +1886,7 @@ "framework", "laravel" ], - "time": "2019-11-05T14:32:58+00:00" + "time": "2019-11-19T14:52:01+00:00" }, { "name": "laravel/tinker", @@ -2218,16 +2228,16 @@ }, { "name": "monolog/monolog", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "68545165e19249013afd1d6f7485aecff07a2d22" + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22", - "reference": "68545165e19249013afd1d6f7485aecff07a2d22", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c", + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c", "shasum": "" }, "require": { @@ -2295,7 +2305,7 @@ "logging", "psr-3" ], - "time": "2019-08-30T09:56:44+00:00" + "time": "2019-11-13T10:27:43+00:00" }, { "name": "nelexa/zip", @@ -2358,22 +2368,22 @@ }, { "name": "nesbot/carbon", - "version": "2.26.0", + "version": "2.27.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e" + "reference": "13b8485a8690f103bf19cba64879c218b102b726" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e01ecc0b71168febb52ae1fdc1cfcc95428e604e", - "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/13b8485a8690f103bf19cba64879c218b102b726", + "reference": "13b8485a8690f103bf19cba64879c218b102b726", "shasum": "" }, "require": { "ext-json": "*", "php": "^7.1.8 || ^8.0", - "symfony/translation": "^3.4 || ^4.0" + "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", @@ -2388,6 +2398,9 @@ ], "type": "library", "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + }, "laravel": { "providers": [ "Carbon\\Laravel\\ServiceProvider" @@ -2421,7 +2434,7 @@ "datetime", "time" ], - "time": "2019-10-21T21:32:25+00:00" + "time": "2019-11-20T06:59:06+00:00" }, { "name": "nikic/php-parser", @@ -3483,16 +3496,16 @@ }, { "name": "spatie/ssl-certificate", - "version": "1.16.0", + "version": "1.16.1", "source": { "type": "git", "url": "https://github.com/spatie/ssl-certificate.git", - "reference": "c70217ba6c9ef9fe359de703e7dc92a9a4b12387" + "reference": "9ed679e8f251b7fdb4f6e8d2c38f0217a52989d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ssl-certificate/zipball/c70217ba6c9ef9fe359de703e7dc92a9a4b12387", - "reference": "c70217ba6c9ef9fe359de703e7dc92a9a4b12387", + "url": "https://api.github.com/repos/spatie/ssl-certificate/zipball/9ed679e8f251b7fdb4f6e8d2c38f0217a52989d3", + "reference": "9ed679e8f251b7fdb4f6e8d2c38f0217a52989d3", "shasum": "" }, "require": { @@ -3533,7 +3546,7 @@ "spatie", "ssl-certificate" ], - "time": "2019-09-30T20:34:10+00:00" + "time": "2019-11-18T09:24:07+00:00" }, { "name": "spatie/temporary-directory", @@ -3583,16 +3596,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.1", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a" + "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", - "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/149cfdf118b169f7840bbe3ef0d4bc795d1780c9", + "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9", "shasum": "" }, "require": { @@ -3641,31 +3654,32 @@ "mail", "mailer" ], - "time": "2019-04-21T09:21:45+00:00" + "time": "2019-11-12T09:31:26+00:00" }, { "name": "symfony/console", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78" + "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/136c4bd62ea871d00843d1bc0316de4c4a84bb78", - "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78", + "url": "https://api.github.com/repos/symfony/console/zipball/35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", + "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/service-contracts": "^1.1" + "symfony/service-contracts": "^1.1|^2" }, "conflict": { "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { @@ -3673,12 +3687,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/event-dispatcher": "^4.3", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/var-dumper": "^4.3" + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3689,7 +3703,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -3716,29 +3730,29 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:58:49+00:00" + "time": "2019-11-13T07:39:40+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.6", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9" + "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", - "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/19d29e7098b7b2c3313cb03902ca30f100dcb837", + "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.2.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -3769,20 +3783,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-10-02T08:36:26+00:00" + "time": "2019-11-18T17:27:11+00:00" }, { "name": "symfony/debug", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2" + "reference": "b24b791f817116b29e52a63e8544884cf9a40757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5ea9c3e01989a86ceaa0283f21234b12deadf5e2", - "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2", + "url": "https://api.github.com/repos/symfony/debug/zipball/b24b791f817116b29e52a63e8544884cf9a40757", + "reference": "b24b791f817116b29e52a63e8544884cf9a40757", "shasum": "" }, "require": { @@ -3793,12 +3807,12 @@ "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/http-kernel": "~3.4|~4.0" + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -3825,11 +3839,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-10-28T17:07:32+00:00" + "time": "2019-11-10T17:54:30+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.33", + "version": "v3.4.35", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -3884,18 +3898,74 @@ "homepage": "https://symfony.com", "time": "2019-10-24T15:33:53+00:00" }, + { + "name": "symfony/error-handler", + "version": "v4.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/e1acb58dc6a8722617fe56565f742bcf7e8744bf", + "reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/log": "~1.0", + "symfony/debug": "^4.4", + "symfony/var-dumper": "^4.4|^5.0" + }, + "require-dev": { + "symfony/http-kernel": "^4.4|^5.0", + "symfony/serializer": "^4.4|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\ErrorHandler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony ErrorHandler Component", + "homepage": "https://symfony.com", + "time": "2019-11-17T22:49:13+00:00" + }, { "name": "symfony/event-dispatcher", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "6229f58993e5a157f6096fc7145c0717d0be8807" + "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", - "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ab1c43e17fff802bef0a898f3bc088ac33b8e0e1", + "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1", "shasum": "" }, "require": { @@ -3911,12 +3981,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-foundation": "^3.4|^4.0", - "symfony/service-contracts": "^1.1", - "symfony/stopwatch": "~3.4|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3925,7 +3995,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -3952,7 +4022,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-10-01T16:40:32+00:00" + "time": "2019-11-08T22:40:51+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4014,16 +4084,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f" + "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f", - "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f", + "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", + "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", "shasum": "" }, "require": { @@ -4032,7 +4102,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4059,35 +4129,35 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:53:54+00:00" + "time": "2019-11-17T21:56:56+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051" + "reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/38f63e471cda9d37ac06e76d14c5ea2ec5887051", - "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/502040dd2b0cf0a292defeb6145f4d7a4753c99c", + "reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/mime": "^4.3", + "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "~3.4|~4.0" + "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4114,37 +4184,37 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:58:49+00:00" + "time": "2019-11-17T10:10:42+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf" + "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/56acfda9e734e8715b3b0e6859cdb4f5b28757bf", - "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5a5e7237d928aa98ff8952050cbbf0135899b6b0", + "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", - "symfony/debug": "~3.4|~4.0", - "symfony/event-dispatcher": "^4.3", - "symfony/http-foundation": "^4.1.1", - "symfony/polyfill-ctype": "~1.8", + "symfony/error-handler": "^4.4", + "symfony/event-dispatcher": "^4.4", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php73": "^1.9" }, "conflict": { "symfony/browser-kit": "<4.3", "symfony/config": "<3.4", + "symfony/console": ">=5", "symfony/dependency-injection": "<4.3", "symfony/translation": "<4.2", - "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, "provide": { @@ -4152,34 +4222,32 @@ }, "require-dev": { "psr/cache": "~1.0", - "symfony/browser-kit": "^4.3", - "symfony/config": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", - "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.3", - "symfony/dom-crawler": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/finder": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/routing": "~3.4|~4.0", - "symfony/stopwatch": "~3.4|~4.0", - "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~4.2", - "symfony/translation-contracts": "^1.1", - "symfony/var-dumper": "^4.1.1", - "twig/twig": "^1.34|^2.4" + "symfony/browser-kit": "^4.3|^5.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0", + "symfony/css-selector": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^4.3|^5.0", + "symfony/dom-crawler": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/routing": "^3.4|^4.0|^5.0", + "symfony/stopwatch": "^3.4|^4.0|^5.0", + "symfony/templating": "^3.4|^4.0|^5.0", + "symfony/translation": "^4.2|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "twig/twig": "^1.34|^2.4|^3.0" }, "suggest": { "symfony/browser-kit": "", "symfony/config": "", "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/var-dumper": "" + "symfony/dependency-injection": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4206,35 +4274,38 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-11-01T10:00:03+00:00" + "time": "2019-11-21T07:08:15+00:00" }, { "name": "symfony/mime", - "version": "v4.3.6", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "3c0e197529da6e59b217615ba8ee7604df88b551" + "reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/3c0e197529da6e59b217615ba8ee7604df88b551", - "reference": "3c0e197529da6e59b217615ba8ee7604df88b551", + "url": "https://api.github.com/repos/symfony/mime/zipball/76f3c09b7382bf979af7bcd8e6f8033f1324285e", + "reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.5", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "symfony/mailer": "<4.4" + }, "require-dev": { "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "~3.4|^4.1" + "symfony/dependency-injection": "^4.4|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -4265,7 +4336,7 @@ "mime", "mime-type" ], - "time": "2019-10-30T12:58:49+00:00" + "time": "2019-11-18T17:27:11+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4620,16 +4691,16 @@ }, { "name": "symfony/process", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0" + "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0", - "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0", + "url": "https://api.github.com/repos/symfony/process/zipball/75ad33d9b6f25325ebc396d68ad86fd74bcfbb06", + "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06", "shasum": "" }, "require": { @@ -4638,7 +4709,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4665,20 +4736,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-10-28T17:07:32+00:00" + "time": "2019-10-28T20:30:34+00:00" }, { "name": "symfony/routing", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9" + "reference": "cf6d72cf0348775f5243b8389169a7096221ea40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/63a9920cc86fcc745e5ea254e362f02b615290b9", - "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9", + "url": "https://api.github.com/repos/symfony/routing/zipball/cf6d72cf0348775f5243b8389169a7096221ea40", + "reference": "cf6d72cf0348775f5243b8389169a7096221ea40", "shasum": "" }, "require": { @@ -4692,11 +4763,11 @@ "require-dev": { "doctrine/annotations": "~1.2", "psr/log": "~1.0", - "symfony/config": "~4.2", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-foundation": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/config": "^4.2|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -4708,7 +4779,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4741,24 +4812,24 @@ "uri", "url" ], - "time": "2019-10-30T12:58:49+00:00" + "time": "2019-11-20T13:44:34+00:00" }, { "name": "symfony/service-contracts", - "version": "v1.1.8", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" + "reference": "9d99e1556417bf227a62e14856d630672bf10eaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", - "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/9d99e1556417bf227a62e14856d630672bf10eaf", + "reference": "9d99e1556417bf227a62e14856d630672bf10eaf", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^7.2.9", "psr/container": "^1.0" }, "suggest": { @@ -4767,7 +4838,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -4799,30 +4870,31 @@ "interoperability", "standards" ], - "time": "2019-10-14T12:27:06+00:00" + "time": "2019-11-09T09:18:34+00:00" }, { "name": "symfony/translation", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec" + "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a3aa590ce944afb3434d7a55f81b00927144d5ec", - "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec", + "url": "https://api.github.com/repos/symfony/translation/zipball/897fb68ee7933372517b551d6f08c6d4bb0b8c40", + "reference": "897fb68ee7933372517b551d6f08c6d4bb0b8c40", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1.6" + "symfony/translation-contracts": "^1.1.6|^2" }, "conflict": { "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", + "symfony/http-kernel": "<4.4", "symfony/yaml": "<3.4" }, "provide": { @@ -4830,15 +4902,14 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/intl": "~3.4|~4.0", - "symfony/service-contracts": "^1.1.2", - "symfony/var-dumper": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/finder": "~2.8|~3.0|~4.0|^5.0", + "symfony/http-kernel": "^4.4", + "symfony/intl": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1.2|^2", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -4848,7 +4919,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4875,24 +4946,24 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:53:54+00:00" + "time": "2019-11-12T17:18:47+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.1.7", + "version": "v2.0.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6" + "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6", - "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8feb81e6bb1a42d6a3b1429c751d291eb6d05297", + "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.2.9" }, "suggest": { "symfony/translation-implementation": "" @@ -4900,7 +4971,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -4932,20 +5003,20 @@ "interoperability", "standards" ], - "time": "2019-09-17T11:12:18+00:00" + "time": "2019-11-09T09:18:34+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf" + "reference": "eade2890f8b0eeb279b6cf41b50a10007294490f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf", - "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eade2890f8b0eeb279b6cf41b50a10007294490f", + "reference": "eade2890f8b0eeb279b6cf41b50a10007294490f", "shasum": "" }, "require": { @@ -4959,9 +5030,9 @@ }, "require-dev": { "ext-iconv": "*", - "symfony/console": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "twig/twig": "~1.34|~2.4" + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/process": "^4.4|^5.0", + "twig/twig": "^1.34|^2.4|^3.0" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -4974,7 +5045,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -5008,7 +5079,7 @@ "debug", "dump" ], - "time": "2019-10-13T12:02:04+00:00" + "time": "2019-11-12T14:51:11+00:00" }, { "name": "theodorejb/polycast", @@ -5331,16 +5402,16 @@ }, { "name": "doctrine/instantiator", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "a2c590166b2133a4633738648b6b064edae0814a" + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", - "reference": "a2c590166b2133a4633738648b6b064edae0814a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", "shasum": "" }, "require": { @@ -5383,20 +5454,20 @@ "constructor", "instantiate" ], - "time": "2019-03-17T17:37:11+00:00" + "time": "2019-10-21T16:45:58+00:00" }, { "name": "facade/flare-client-php", - "version": "1.1.2", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "04c0bbd1881942f59e27877bac3b29ba57519666" + "reference": "5a1bfe4425974d17addeefce737d66a4c921a8df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/04c0bbd1881942f59e27877bac3b29ba57519666", - "reference": "04c0bbd1881942f59e27877bac3b29ba57519666", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/5a1bfe4425974d17addeefce737d66a4c921a8df", + "reference": "5a1bfe4425974d17addeefce737d66a4c921a8df", "shasum": "" }, "require": { @@ -5437,20 +5508,20 @@ "flare", "reporting" ], - "time": "2019-11-08T11:11:17+00:00" + "time": "2019-11-19T08:42:39+00:00" }, { "name": "facade/ignition", - "version": "1.11.2", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db" + "reference": "67736a01597b9e08f00a1fc8966b92b918dba5ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/862cbc2dfffa1fa28b47822a116e5b2e03b421db", - "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db", + "url": "https://api.github.com/repos/facade/ignition/zipball/67736a01597b9e08f00a1fc8966b92b918dba5ea", + "reference": "67736a01597b9e08f00a1fc8966b92b918dba5ea", "shasum": "" }, "require": { @@ -5508,7 +5579,7 @@ "laravel", "page" ], - "time": "2019-10-13T10:42:06+00:00" + "time": "2019-11-14T10:51:35+00:00" }, { "name": "facade/ignition-contracts", @@ -5706,16 +5777,16 @@ }, { "name": "fzaninotto/faker", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" + "reference": "27a216cbe72327b2d6369fab721a5843be71e57d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d", + "reference": "27a216cbe72327b2d6369fab721a5843be71e57d", "shasum": "" }, "require": { @@ -5724,13 +5795,11 @@ "require-dev": { "ext-intl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^1.5" + "squizlabs/php_codesniffer": "^2.9.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.8-dev" - } + "branch-alias": [] }, "autoload": { "psr-4": { @@ -5752,7 +5821,7 @@ "faker", "fixtures" ], - "time": "2018-07-12T10:23:15+00:00" + "time": "2019-11-14T13:13:06+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -6406,16 +6475,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "7.0.8", + "version": "7.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f" + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f", - "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf", + "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf", "shasum": "" }, "require": { @@ -6465,7 +6534,7 @@ "testing", "xunit" ], - "time": "2019-09-17T06:24:36+00:00" + "time": "2019-11-20T13:55:58+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6973,16 +7042,16 @@ }, { "name": "sebastian/environment", - "version": "4.2.2", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404" + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", - "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", "shasum": "" }, "require": { @@ -7022,7 +7091,7 @@ "environment", "hhvm" ], - "time": "2019-05-05T09:05:15+00:00" + "time": "2019-11-20T08:46:58+00:00" }, { "name": "sebastian/exporter", @@ -7423,16 +7492,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263" + "reference": "d12b01cba60be77b583c9af660007211e3909854" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263", - "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d12b01cba60be77b583c9af660007211e3909854", + "reference": "d12b01cba60be77b583c9af660007211e3909854", "shasum": "" }, "require": { @@ -7442,7 +7511,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -7469,20 +7538,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:07:54+00:00" + "time": "2019-11-12T14:51:11+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4" + "reference": "2be23e63f33de16b49294ea6581f462932a77e2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4", - "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2be23e63f33de16b49294ea6581f462932a77e2f", + "reference": "2be23e63f33de16b49294ea6581f462932a77e2f", "shasum": "" }, "require": { @@ -7491,7 +7560,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -7523,7 +7592,7 @@ "configuration", "options" ], - "time": "2019-10-28T20:59:01+00:00" + "time": "2019-10-28T21:57:16+00:00" }, { "name": "symfony/polyfill-php70", @@ -7586,26 +7655,26 @@ }, { "name": "symfony/stopwatch", - "version": "v4.3.6", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71" + "reference": "5745b514fc56ae1907c6b8ed74f94f90f64694e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/1e4ff456bd625be5032fac9be4294e60442e9b71", - "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5745b514fc56ae1907c6b8ed74f94f90f64694e9", + "reference": "5745b514fc56ae1907c6b8ed74f94f90f64694e9", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/service-contracts": "^1.0" + "symfony/service-contracts": "^1.0|^2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -7632,7 +7701,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2019-08-07T11:52:19+00:00" + "time": "2019-11-05T16:11:08+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/other.php b/config/other.php index 82d884a8aa..cdb7c0935b 100755 --- a/config/other.php +++ b/config/other.php @@ -22,7 +22,7 @@ | */ - 'codebase' => 'UNIT3D Community Edition (Nex-Gen Torrent Tracker) v2.2.4', + 'codebase' => 'UNIT3D Community Edition (Nex-Gen Torrent Tracker) v2.2.5', /* |-------------------------------------------------------------------------- diff --git a/config/unit3d.php b/config/unit3d.php index 38e23d1d30..6b26d72f9d 100644 --- a/config/unit3d.php +++ b/config/unit3d.php @@ -22,7 +22,7 @@ | */ - 'powered-by' => 'Powered By UNIT3D Community Edition v2.2.4', + 'powered-by' => 'Powered By UNIT3D Community Edition v2.2.5', /* |-------------------------------------------------------------------------- @@ -44,6 +44,6 @@ | */ - 'version' => 'v2.2.4', + 'version' => 'v2.2.5', ]; diff --git a/package-lock.json b/package-lock.json index 55ab7dbd29..c102fbfcda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5046,6 +5046,33 @@ "path-is-absolute": "^1.0.0" } }, + "glob-all": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz", + "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=", + "dev": true, + "requires": { + "glob": "^7.0.5", + "yargs": "~1.2.6" + }, + "dependencies": { + "minimist": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz", + "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=", + "dev": true + }, + "yargs": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz", + "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=", + "dev": true, + "requires": { + "minimist": "^0.1.0" + } + } + } + }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -6346,6 +6373,16 @@ "yargs": "^12.0.5" } }, + "laravel-mix-purgecss": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/laravel-mix-purgecss/-/laravel-mix-purgecss-4.2.0.tgz", + "integrity": "sha512-hzphHnhK3xPiv19QhCnhuvSUK4vmPB/76S6EHDb3WPa6Oz7aOlBREXLhg57ejiisy9GdVKw5DZjYwk3JLjAkYA==", + "dev": true, + "requires": { + "glob-all": "^3.1.0", + "purgecss-webpack-plugin": "^1.3.0" + } + }, "laravel-mix-sri": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/laravel-mix-sri/-/laravel-mix-sri-0.0.4.tgz", @@ -8700,6 +8737,110 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, + "purgecss": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-1.4.1.tgz", + "integrity": "sha512-5jONV/D/3nfa+lC425+LA+OWe5/LDn4a79cac+TnzJq3VczwnWlpIDdW275hHsGhkzIlqATQsYFLW7or0cSwNQ==", + "dev": true, + "requires": { + "glob": "^7.1.3", + "postcss": "^7.0.14", + "postcss-selector-parser": "^6.0.0", + "yargs": "^14.0.0" + }, + "dependencies": { + "cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "postcss-selector-parser": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", + "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" + } + }, + "yargs": { + "version": "14.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz", + "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.0" + } + }, + "yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "purgecss-webpack-plugin": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/purgecss-webpack-plugin/-/purgecss-webpack-plugin-1.6.0.tgz", + "integrity": "sha512-rVrTWYsOTShUvD5gl0q/krkwTlBUILlyoqRk2XoujNm2dETt276yvK4vP9oyXVPSQyaMCjjP5YPMCq9PNgIlJQ==", + "dev": true, + "requires": { + "purgecss": "^1.4.0", + "webpack-sources": "^1.4.3" + } + }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", @@ -9286,9 +9427,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.3.tgz", - "integrity": "sha512-1DKRZxJMOh4Bme16AbWTyYeJAjTlrvw2+fWshHHaepeJfGq2soFZTnt0YhWit+bohtDu4LdyPoEj6VFD4APHog==", + "version": "1.23.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.7.tgz", + "integrity": "sha512-cYgc0fanwIpi0rXisGxl+/wadVQ/HX3RhpdRcjLdj2o2ye/sxUTpAxIhbmJy3PLQgRFbf6Pn8Jsrta2vdXcoOQ==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -10377,9 +10518,9 @@ } }, "sweetalert2": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.2.0.tgz", - "integrity": "sha512-57vw5Hk6Mo9F2kXrkQ/KOacCSRaFYwI1LqVwKWtO9ca5Fa9avg3P6BzcHuwDrmIWTfkjwIPfgP+O9Y9wiYEtAg==", + "version": "9.3.17", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.3.17.tgz", + "integrity": "sha512-FmIKj+xzQ2fxkwVo9CA2UOjViRJXjn3I0wZSnEU4vOqdKJjo0nOdb7Su8qRckPpiEaas/qhPUcnl5ch+fEm9Bw==", "dev": true }, "tapable": { diff --git a/package.json b/package.json index 03dfbd796c..b521e78995 100644 --- a/package.json +++ b/package.json @@ -20,15 +20,16 @@ "ladda": "^2.0.1", "laravel-echo": "^1.6.1", "laravel-mix": "^5.0.0", + "laravel-mix-purgecss": "^4.2.0", "lodash": "^4.17.15", "moment": "^2.24.0", "resolve-url-loader": "3.1.1", - "sass": "^1.23.3", + "sass": "^1.23.7", "sass-loader": "^8.0.0", "socket.io": "^2.3.0", "socket.io-client": "^2.3.0", "spin.js": "^4.1.0", - "sweetalert2": "^9.2.0", + "sweetalert2": "^9.3.17", "v-tooltip": "^2.0.2", "vue": "^2.6.10", "vue-template-compiler": "^2.6.10" diff --git a/resources/views/Staff/backup/index.blade.php b/resources/views/Staff/backup/index.blade.php index 99b0a8448a..1775bc2d03 100644 --- a/resources/views/Staff/backup/index.blade.php +++ b/resources/views/Staff/backup/index.blade.php @@ -67,12 +67,13 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> @method('DELETE') @if ($b['download']) + href="{{ route('staff.backups.download') }}?disk={{ $b['disk'] }}&path={{ urlencode($b['file_path']) }}&file_name={{ urlencode($b['file_name']) }}"> @lang('backup.download') @endif - @@ -126,7 +127,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_warning_message ')' + title: '@lang('backup.create_warning_message')' }) } else { const Toast = Swal.mixin({ @@ -138,7 +139,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'success', - title: '@lang('backup.create_confirmation_message ')' + title: '@lang('backup.create_confirmation_message')' }) } @@ -163,7 +164,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_error_message ')' + title: '@lang('backup.create_error_message')' }) // Stop loading l.stop(); @@ -208,7 +209,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_warning_message ')' + title: '@lang('backup.create_warning_message')' }) } else { const Toast = Swal.mixin({ @@ -220,7 +221,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'success', - title: '@lang('backup.create_confirmation_message ')' + title: '@lang('backup.create_confirmation_message')' }) } @@ -245,7 +246,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_error_message ')' + title: '@lang('backup.create_error_message')' }) // Stop loading l.stop(); @@ -290,7 +291,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_warning_message ')' + title: '@lang('backup.create_warning_message')' }) } else { const Toast = Swal.mixin({ @@ -302,7 +303,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'success', - title: '@lang('backup.create_confirmation_message ')' + title: '@lang('backup.create_confirmation_message')' }) } @@ -327,7 +328,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.create_error_message ')' + title: '@lang('backup.create_error_message')' }) // Stop loading l.stop(); @@ -363,7 +364,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'success', - title: '@lang('backup.delete_confirmation_message ')' + title: '@lang('backup.delete_confirmation_message')' }) // delete the row from the table delete_button.parentsUntil('tr').parent().remove(); @@ -379,7 +380,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'warning', - title: '@lang('backup.delete_error_title ')' + title: '@lang('backup.delete_error_title')' }) } }); @@ -393,7 +394,7 @@ class="btn btn-primary ladda-button" data-style="zoom-in"> Toast.fire({ icon: 'info', - title: '@lang('backup.delete_cancel_message ')' + title: '@lang('backup.delete_cancel_message')' }) } }); diff --git a/resources/views/Staff/category/index.blade.php b/resources/views/Staff/category/index.blade.php index 4d2c747003..e31f7a8c3c 100755 --- a/resources/views/Staff/category/index.blade.php +++ b/resources/views/Staff/category/index.blade.php @@ -93,7 +93,8 @@
@csrf @method('DELETE') - + @lang('common.edit') diff --git a/resources/views/Staff/chat/room/chatroom_modals.blade.php b/resources/views/Staff/chat/room/chatroom_modals.blade.php index 2a87043bad..275ead2985 100644 --- a/resources/views/Staff/chat/room/chatroom_modals.blade.php +++ b/resources/views/Staff/chat/room/chatroom_modals.blade.php @@ -1,4 +1,3 @@ -{{--Edit Chatroom--}} -{{--/Edit Chatroom--}} -{{--Delete Chatroom--}} -{{--/Delete Chatroom--}} diff --git a/resources/views/Staff/chat/room/index.blade.php b/resources/views/Staff/chat/room/index.blade.php index 1be5838061..ab40089aaa 100644 --- a/resources/views/Staff/chat/room/index.blade.php +++ b/resources/views/Staff/chat/room/index.blade.php @@ -18,7 +18,6 @@

Chat Rooms

- {{--Add Chatroom Modal--}} - {{--/Add Chatroom Modal--}}
diff --git a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php index 3f841182b5..d49097f944 100644 --- a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php +++ b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php @@ -1,4 +1,3 @@ -{{--Edit Chatroom--}} -{{--/Edit Chatroom--}} -{{--Delete Chatroom--}} -{{--/Delete Chatroom--}} diff --git a/resources/views/Staff/chat/status/index.blade.php b/resources/views/Staff/chat/status/index.blade.php index cea1cb6458..42e37cc431 100644 --- a/resources/views/Staff/chat/status/index.blade.php +++ b/resources/views/Staff/chat/status/index.blade.php @@ -18,7 +18,6 @@

@lang('common.user') Chat Statuses

- {{--Add Chatroom Modal--}} - {{--/Add Chatroom Modal--}}
diff --git a/resources/views/Staff/command/index.blade.php b/resources/views/Staff/command/index.blade.php index db94f45d9b..575905bbe8 100644 --- a/resources/views/Staff/command/index.blade.php +++ b/resources/views/Staff/command/index.blade.php @@ -68,7 +68,8 @@

This commands clears your sites cache. This cache depends on what driver you are using.

- Run Command + Run + Command @@ -83,7 +84,8 @@ Clear View Cache

This commands clears your sites compiled views cache.

- Run Command + Run + Command @@ -95,7 +97,8 @@ Clear Route Cache

This commands clears your sites compiled routes cache.

- Run Command + Run + Command @@ -107,7 +110,8 @@ Clear Config Cache

This commands clears your sites compiled configs cache.

- Run Command + Run + Command @@ -122,7 +126,8 @@ Clear All Cache

This commands clears ALL of your sites cache.

- Run Command + Run + Command @@ -134,7 +139,8 @@ Set All Cache

This commands sets ALL of your sites cache.

- Run Command + Run + Command diff --git a/resources/views/Staff/moderation/index.blade.php b/resources/views/Staff/moderation/index.blade.php index 2ba104f37b..27570874fe 100644 --- a/resources/views/Staff/moderation/index.blade.php +++ b/resources/views/Staff/moderation/index.blade.php @@ -57,8 +57,7 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up">Approveid }}" data-toggle="modal" class="btn btn-labeled btn-danger"> Postpone - - {{-- Torrent Postpone Modal --}} + - @endforeach @@ -212,8 +207,7 @@ class="{{ config('other.font-awesome') }} fa-pencil">@lang('common.ed class="btn btn-labeled btn-danger">@lang('common.delete') - - {{-- Torrent Delete Modal --}} + - @endforeach @@ -318,8 +311,7 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up">Approveid }}" data-toggle="modal" class="btn btn-labeled btn-danger"> Postpone - - {{-- Torrent Postpone Modal --}} + - @endforeach diff --git a/resources/views/Staff/user/user_search.blade.php b/resources/views/Staff/user/user_search.blade.php index 37808d85ba..dd3bfa86d7 100644 --- a/resources/views/Staff/user/user_search.blade.php +++ b/resources/views/Staff/user/user_search.blade.php @@ -88,7 +88,6 @@ class="edit"> -
- - {{-- Torrent Reject Modal --}} -
@lang('common.ed class="btn btn-labeled btn-danger">@lang('common.delete') - - {{-- Torrent Delete Modal --}} + -
@@ -134,7 +133,6 @@ class="edit">
-
@@ -180,7 +178,6 @@ class="edit">
-
@@ -225,7 +222,6 @@ class="edit">
-
diff --git a/resources/views/achievement/index.blade.php b/resources/views/achievement/index.blade.php index b9141653d0..cd8c4e6a60 100644 --- a/resources/views/achievement/index.blade.php +++ b/resources/views/achievement/index.blade.php @@ -107,18 +107,18 @@

@lang('user.unlocked-achievements') :{{ auth() - ->user() - ->unlockedAchievements() - ->count() }} + ->user() + ->unlockedAchievements() + ->count() }}

@lang('user.locked-achievements') :{{ auth() - ->user() - ->lockedAchievements() - ->count() }} + ->user() + ->lockedAchievements() + ->count() }}

diff --git a/resources/views/auth/username.blade.php b/resources/views/auth/username.blade.php index 95595240ca..4efddd8659 100644 --- a/resources/views/auth/username.blade.php +++ b/resources/views/auth/username.blade.php @@ -4,7 +4,6 @@ @lang('auth.lost-username') - {{ config('other.title') }} - @section('meta') @@ -29,14 +28,12 @@
- {{ config('other.title') }} - @@ -45,7 +42,6 @@
@@ -117,8 +117,8 @@ class="text-bold">>= 25GB {{ strtolower(trans('common.but')) }} - + {{ $total * 24 * 30 }} @lang('bon.per-month')
+ diff --git a/resources/views/bonus/store.blade.php b/resources/views/bonus/store.blade.php index 8b8dd8d41b..c1d503fc50 100644 --- a/resources/views/bonus/store.blade.php +++ b/resources/views/bonus/store.blade.php @@ -3,14 +3,12 @@ @section('breadcrumb')
    • @endsection @@ -18,103 +16,93 @@ class="l-breadcrumb-item-link-title">@lang('bon.bonus') @lang('bon.store')
    - @include('bonus.buttons') -
    -
    -

    @lang('bon.bon') @lang('bon.store')

    + @include('bonus.buttons') +
    +
    +

    @lang('bon.bon') @lang('bon.store')

    +
    -
    -
    -
    -
    -

    @lang('bon.exchange')

    -
    @lang('common.huge') @lang('torrent.torrents')
    - @lang('torrent.torrent) @lang('torrent.size)@lang('torrent.torrent') @lang('torrent.size')> 100GB
    @lang('common.everyday') @lang('torrent.torrents')
    - @lang('torrent.torrent') @lang('torrent.size') >= 1GB {{ strtolower(trans('common.but')) }} + @lang('torrent.torrent') @lang('torrent.size') + >= 1GB {{ strtolower(trans('common.but')) }} < 25GB     		{{ $regular }} x 0.25 {{ $regular * 0.25 }} @lang('bon.per-hour')
    @@ -227,8 +227,8 @@ class="text-bold"> >= 1GB {{ strtolower(trans('common.but')) }}
    - - - - - - - - - @foreach ($uploadOptions as $u => $uu) - - - - - - @endforeach - - {{--@foreach ($downloadOptions as $d => $dO) - - - - - - @endforeach--}} - - @foreach ($personalFreeleech as $p => $pf) - - - - - - @endforeach - - @foreach ($invite as $i => $in) - - - - - - @endforeach - -
    @lang('bon.item')@lang('bon.points')@lang('bon.exchange')
    {{ $uu['description'] }}{{ $uu['cost'] }} -
    - @csrf - -
    -
    {{ $dO['description'] }}{{ $dO['cost'] }} -
    - @csrf - -
    -
    {{ $pf['description'] }}{{ $pf['cost'] }} - @if ($activefl) -
    - @csrf - -
    - @else -
    - @csrf - -
    - @endif -
    {{ $in['description'] }}{{ $in['cost'] }} -
    - @csrf - -
    -
    -
    - -
    - -
    -

    @lang('bon.your-points'):
    {{ $userbon }}

    -
    - -
    -

    @lang('bon.exchange-warning') -
    @lang('bon.no-refund') -

    +
    +
    +
    +

    @lang('bon.exchange')

    + + + + + + + + + + @foreach ($uploadOptions as $u => $uu) + + + + + + @endforeach + + @foreach ($personalFreeleech as $p => $pf) + + + + + + @endforeach + + @foreach ($invite as $i => $in) + + + + + + @endforeach + +
    @lang('bon.item')@lang('bon.points')@lang('bon.exchange')
    {{ $uu['description'] }}{{ $uu['cost'] }} +
    + @csrf + +
    +
    {{ $pf['description'] }}{{ $pf['cost'] }} + @if ($activefl) +
    + @csrf + +
    + @else +
    + @csrf + +
    + @endif +
    {{ $in['description'] }}{{ $in['cost'] }} +
    + @csrf + +
    +
    +
    +
    +
    + +
    +

    @lang('bon.your-points'):
    {{ $userbon }}

    +
    + +
    +

    @lang('bon.exchange-warning') +
    @lang('bon.no-refund') +

    +
    +
    - - -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/category/show.blade.php b/resources/views/category/show.blade.php index faed7f3c07..e1fc4093c5 100755 --- a/resources/views/category/show.blade.php +++ b/resources/views/category/show.blade.php @@ -129,9 +129,6 @@ class="img-tor-poster torrent-poster-img-small" alt="Poster"> @endif - {{-- - --}} - @php $history = \App\Models\History::where('user_id', '=', $user->id)->where('info_hash', '=', $torrent->info_hash)->first(); @endphp @if ($history) diff --git a/resources/views/errors/307.blade.php b/resources/views/errors/307.blade.php index 9c653f2c05..edec3da798 100644 --- a/resources/views/errors/307.blade.php +++ b/resources/views/errors/307.blade.php @@ -17,19 +17,19 @@ @@ -37,17 +37,17 @@ + l2.115-6.273c-0.706-0.448-1.443-0.867-2.213-1.238c-0.774-0.371-1.559-0.685-2.351-0.958l-3.584,5.567 + c-1.701-0.39-3.432-0.479-5.118-0.284L73.335,0c-1.652,0.367-3.256,0.931-4.776,1.672l1.404,6.47 + c-1.439,0.899-2.744,2.047-3.835,3.419c-2.208-0.746-4.38-1.476-6.273-2.114c-0.451,0.71-0.874,1.448-1.244,2.229 + c-0.371,0.764-0.68,1.541-0.954,2.329c1.681,1.078,3.612,2.323,5.569,3.579c-0.399,1.711-0.486,3.449-0.291,5.145 + c-2.086,1.034-4.143,2.055-5.936,2.945c0.368,1.648,0.929,3.25,1.67,4.769c1.954-0.426,4.193-0.912,6.468-1.405 + c0.906,1.449,2.06,2.758,3.442,3.853l-2.117,6.27c0.708,0.449,1.439,0.865,2.218,1.236c0.767,0.371,1.551,0.685,2.338,0.96 + c1.081-1.68,2.319-3.612,3.583-5.574c1.714,0.401,3.457,0.484,5.156,0.288L82.695,42c1.651-0.371,3.252-0.931,4.773-1.676 + c-0.425-1.952-0.912-4.194-1.404-6.473c1.439-0.902,2.744-2.057,3.835-3.436l6.273,2.11c0.444-0.7,0.856-1.43,1.225-2.197 + c0.372-0.777,0.691-1.569,0.963-2.361l-5.568-3.586C93.181,22.677,93.269,20.939,93.068,19.253z M84.365,24.062 + c-1.693,3.513-5.908,4.991-9.418,3.302c-3.513-1.689-4.99-5.906-3.301-9.419c1.688-3.513,5.906-4.991,9.417-3.302 + C84.573,16.331,86.05,20.549,84.365,24.062z" fill="none" stroke="#E43" /> diff --git a/resources/views/errors/400.blade.php b/resources/views/errors/400.blade.php index 334ccd13c2..d2370c1ef5 100644 --- a/resources/views/errors/400.blade.php +++ b/resources/views/errors/400.blade.php @@ -14,6 +14,6 @@

    {{ $exception->getMessage() ?: 'The request could not be understood by the server due to malformed syntax. -
    The client SHOULD NOT repeat the request without modifications. -

    ' }} +
    The client SHOULD NOT repeat the request without modifications. +

    ' }} @stop diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 7d363e404d..90bc0015a4 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -14,6 +14,6 @@

    {{ $exception->getMessage() ?: 'The Requested Page Cannot Be Found! Not Sure What Your Looking For But Check The - Address And Try Again!' }} + Address And Try Again!' }}

    @stop diff --git a/resources/views/errors/502.blade.php b/resources/views/errors/502.blade.php index 3cb0df954d..19943d62c8 100644 --- a/resources/views/errors/502.blade.php +++ b/resources/views/errors/502.blade.php @@ -13,7 +13,7 @@

    {{ $exception->getMessage() ?: - 'The server, while acting as a gateway or proxy, received an invalid response from the - upstream server it accessed in attempting to fulfill the request.' }} + 'The server, while acting as a gateway or proxy, received an invalid response from the + upstream server it accessed in attempting to fulfill the request.' }}

    @stop diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php index e17fe5ab88..c1be37a69c 100644 --- a/resources/views/errors/layout.blade.php +++ b/resources/views/errors/layout.blade.php @@ -14,14 +14,10 @@ - - - - diff --git a/resources/views/forum/category.blade.php b/resources/views/forum/category.blade.php index 1f26970b9c..416a93fe66 100755 --- a/resources/views/forum/category.blade.php +++ b/resources/views/forum/category.blade.php @@ -24,7 +24,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    @@ -121,7 +121,7 @@ class='label label-sm label-success'>{{ strtoupper(trans('forum.implemented')) }
    {{ $topics->links() }}
    - + @include('forum.stats')
    @endsection diff --git a/resources/views/forum/display.blade.php b/resources/views/forum/display.blade.php index 5ba537d740..0b25cfcc57 100755 --- a/resources/views/forum/display.blade.php +++ b/resources/views/forum/display.blade.php @@ -24,7 +24,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    diff --git a/resources/views/forum/index.blade.php b/resources/views/forum/index.blade.php index a5cd8c0205..3af0ac041e 100755 --- a/resources/views/forum/index.blade.php +++ b/resources/views/forum/index.blade.php @@ -21,7 +21,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    diff --git a/resources/views/forum/latest_posts.blade.php b/resources/views/forum/latest_posts.blade.php index ac6a29be11..6cb1325e0d 100644 --- a/resources/views/forum/latest_posts.blade.php +++ b/resources/views/forum/latest_posts.blade.php @@ -24,7 +24,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    diff --git a/resources/views/forum/latest_topics.blade.php b/resources/views/forum/latest_topics.blade.php index 97751adc3c..ca554c350b 100644 --- a/resources/views/forum/latest_topics.blade.php +++ b/resources/views/forum/latest_topics.blade.php @@ -24,7 +24,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    diff --git a/resources/views/forum/stats.blade.php b/resources/views/forum/stats.blade.php index d25c34a179..8c19effdce 100644 --- a/resources/views/forum/stats.blade.php +++ b/resources/views/forum/stats.blade.php @@ -1,10 +1,10 @@
    -
    - - @lang('forum.forums'): {{ $num_forums }} | - @lang('forum.topics'): {{ $num_topics }} | - @lang('forum.posts'): {{ $num_posts }} - -
    -
    \ No newline at end of file +
    + + @lang('forum.forums'): {{ $num_forums }} | + @lang('forum.topics'): {{ $num_topics }} | + @lang('forum.posts'): {{ $num_posts }} + +
    +
    diff --git a/resources/views/forum/subscriptions.blade.php b/resources/views/forum/subscriptions.blade.php index 150b288e13..e4d032afea 100644 --- a/resources/views/forum/subscriptions.blade.php +++ b/resources/views/forum/subscriptions.blade.php @@ -24,7 +24,7 @@ @section('content')
    - @include('forum.buttons') + @include('forum.buttons')
    diff --git a/resources/views/graveyard/index.blade.php b/resources/views/graveyard/index.blade.php index 77a1bc2c00..09baa4db0b 100644 --- a/resources/views/graveyard/index.blade.php +++ b/resources/views/graveyard/index.blade.php @@ -13,7 +13,6 @@ @endsection @section('content') -

    @lang('torrent.filters')

    @@ -101,9 +100,7 @@ class="form-horizontal form-condensed form-torrent-search form-bordered">
    - -
    @@ -164,8 +161,7 @@ function faceted(page) { }, type: 'get', beforeSend: function() { - $("#result").html('') + $("#result").html('') } }).done(function(e) { $data = $(e); diff --git a/resources/views/graveyard/results.blade.php b/resources/views/graveyard/results.blade.php index f5438c3253..9b22907a28 100644 --- a/resources/views/graveyard/results.blade.php +++ b/resources/views/graveyard/results.blade.php @@ -62,7 +62,6 @@ class="btn btn-sm btn-default"> @emojione(':zombie:') @lang('graveyard.resurrect') - {{-- Resurrect Modal --}} @endsection diff --git a/resources/views/playlist/show.blade.php b/resources/views/playlist/show.blade.php index d6e80d0cf9..743fc878b2 100644 --- a/resources/views/playlist/show.blade.php +++ b/resources/views/playlist/show.blade.php @@ -209,67 +209,6 @@ class="torrent-poster-img-small show-poster" alt="@lang('torrent.poster')">
    - {{--
    -
    -
    -
    -
    - -
    - @if ($t->torrent->tmdb != 0) - - - - @endif - - @if (config('torrent.download_check_page') == 1) - - - - @else - - - - @endif - - @if(auth()->user()->id == $playlist->user_id || auth()->user()->group->is_modo) -
    - @csrf - @method('DELETE') - -
    - @endif -
    -

    - {{ $t->torrent->name }} -

    -
    -
    -
    -
    - {{ $t->torrent->type }} -
    -
      -
    • {{ trans('torrent.seeders') }}: {{ $t->torrent->seeders }}
      • -
    • {{ trans('torrent.leechers') }}: {{ $t->torrent->leechers }}
      • -
    • {{ trans('torrent.completed') }}: {{ $t->torrent->times_completed }}
      • -
    • {{ trans('torrent.size') }}: {{ $t->torrent->getSize() }}
      • -
    -
    -
    -
    -
    -
    - @endforeach -
    -
    --}} -
    @@ -329,9 +268,7 @@ class="pull-right {{ config('other.font-awesome') }} fa-pencil"
    -
    -
    @csrf @@ -348,12 +285,10 @@ class="badge-extra">BBCode @lang('common.is-allowed') @lang('common.no')
    -
    - {{-- Add Torrent Modal --}} @include('torrent.torrent_modals', ['user' => $user, 'torrent' => $torrent]) diff --git a/resources/views/torrent/torrent_modals.blade.php b/resources/views/torrent/torrent_modals.blade.php index b3503c17b8..261b867f44 100644 --- a/resources/views/torrent/torrent_modals.blade.php +++ b/resources/views/torrent/torrent_modals.blade.php @@ -1,4 +1,3 @@ -{{-- Report Modal --}} -
    -{{-- Delete Modal --}} -
    -
    -
    -{{-- Files Modal --}}