diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index ce6481865..5ecaae1b5 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -14,7 +14,7 @@ class AdultController extends BasePageController */ public function show(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); $adult = new XXX(); $moviecats = Category::getChildren(Category::XXX_ROOT); diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index 6bedffc11..8920dddc2 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -12,7 +12,7 @@ class AjaxController extends BasePageController */ public function profile(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if ($request->has('action') && (int) $request->input('action') === 1 && $request->has('emailto')) { $emailTo = $request->input('emailto'); $ret = User::sendInvite(url('/'), $this->userdata->id, $emailTo); diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php index 3d6146eca..fa704608b 100644 --- a/app/Http/Controllers/AnimeController.php +++ b/app/Http/Controllers/AnimeController.php @@ -36,7 +36,7 @@ class AnimeController extends BasePageController */ public function showAnime(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if ($request->has('id') && ctype_digit($request->input('id'))) { // force the category to TV_ANIME as it should be for anime, as $catarray was NULL and we know the category for sure for anime @@ -84,7 +84,7 @@ class AnimeController extends BasePageController */ public function showList(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $letter = ($request->has('id') && preg_match('/^(0\-9|[A-Z])$/i', $request->input('id'))) ? $request->input('id') : '0-9'; $animeTitle = ($request->has('title') && ! empty($request->input('title'))) ? $request->input('title') : ''; diff --git a/app/Http/Controllers/ApiHelpController.php b/app/Http/Controllers/ApiHelpController.php index cb8aca2a1..f566ad42b 100644 --- a/app/Http/Controllers/ApiHelpController.php +++ b/app/Http/Controllers/ApiHelpController.php @@ -16,7 +16,7 @@ class ApiHelpController extends BasePageController */ public function index(): void { - $this->setPrefs(); + $this->setPreferences(); $title = 'Api Help'; $meta_title = 'Api Help Topics'; $meta_keywords = 'view,nzb,api,details,help,json,rss,atom'; @@ -32,7 +32,7 @@ class ApiHelpController extends BasePageController */ public function apiv2(): void { - $this->setPrefs(); + $this->setPreferences(); $title = 'Api V2 Help'; $meta_title = 'Api V2 Help Topics'; $meta_keywords = 'view,nzb,api,details,help,json,rss,atom'; diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index ec63a4a77..82a6f9836 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -44,7 +44,7 @@ class BasePageController extends Controller /** * @var \Illuminate\Foundation\Application|mixed */ - public $smarty; + public mixed $smarty; /** * BasePageController constructor. @@ -74,7 +74,7 @@ class BasePageController extends Controller /** * @throws \Exception */ - protected function setPrefs(): void + protected function setPreferences(): void { if (Auth::check()) { $this->userdata = User::find(Auth::id()); diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index b68003107..d0e88979e 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -14,7 +14,7 @@ class BooksController extends BasePageController */ public function index(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); $book = new Books(['Settings' => $this->settings]); $boocats = Category::getChildren(Category::BOOKS_ROOT); diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 8353b53cb..1528fee01 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -14,7 +14,7 @@ class BrowseController extends BasePageController */ public function index() { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); $this->smarty->assign('category', -1); @@ -61,7 +61,7 @@ class BrowseController extends BasePageController */ public function show(string $parentCategory, string $id = 'All'): void { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); $parentId = RootCategory::query()->where('title', $parentCategory)->value('id'); @@ -155,7 +155,7 @@ class BrowseController extends BasePageController */ public function group(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); if ($request->has('g')) { $group = $request->input('g'); @@ -194,7 +194,7 @@ class BrowseController extends BasePageController */ public function tags(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); if ($request->has('tags')) { $tags = explode(',', $request->input('tags')); diff --git a/app/Http/Controllers/BrowseGroupController.php b/app/Http/Controllers/BrowseGroupController.php index 1017253ef..85cffb21d 100644 --- a/app/Http/Controllers/BrowseGroupController.php +++ b/app/Http/Controllers/BrowseGroupController.php @@ -11,7 +11,7 @@ class BrowseGroupController extends BasePageController */ public function show(): void { - $this->setPrefs(); + $this->setPreferences(); $groupList = UsenetGroup::getGroupsRange('', true); $this->smarty->assign('results', $groupList); diff --git a/app/Http/Controllers/BtcPaymentController.php b/app/Http/Controllers/BtcPaymentController.php index 5a80c2010..9f3e5cf2c 100644 --- a/app/Http/Controllers/BtcPaymentController.php +++ b/app/Http/Controllers/BtcPaymentController.php @@ -14,7 +14,7 @@ class BtcPaymentController extends BasePageController */ public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $gateway_id = env('MYCELIUM_GATEWAY_ID'); $gateway_secret = env('MYCELIUM_GATEWAY_SECRET'); diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index fff8af95e..9d9f0231b 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -14,7 +14,7 @@ class CartController extends BasePageController */ public function index(): void { - $this->setPrefs(); + $this->setPreferences(); $meta_title = 'My Download Basket'; $meta_keywords = 'search,add,to,cart,download,basket,nzb,description,details'; $meta_description = 'Manage Your Download Basket'; @@ -32,7 +32,7 @@ class CartController extends BasePageController */ public function store(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $guids = explode(',', $request->input('id')); $data = Release::query()->whereIn('guid', $guids)->select(['id'])->get(); @@ -56,7 +56,7 @@ class CartController extends BasePageController */ public function destroy(array|string $id): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $ids = null; if (! empty($id) && ! \is_array($id)) { $ids = explode(',', $id); diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index aeea740ab..47d1d5150 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -15,7 +15,7 @@ class ConsoleController extends BasePageController */ public function show(Request $request, string $id = ''): \Illuminate\Http\JsonResponse { - $this->setPrefs(); + $this->setPreferences(); if ($id === 'WiiVare') { $id = 'WiiVareVC'; } diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index 5b9ea04e0..4b63e17e5 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -12,7 +12,7 @@ class ContactUsController extends BasePageController */ public function contact(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|null { - $this->setPrefs(); + $this->setPreferences(); $this->validate($request, [ 'useremail' => 'required', 'username' => 'required', @@ -51,7 +51,7 @@ class ContactUsController extends BasePageController */ public function showContactForm(string $msg = ''): void { - $this->setPrefs(); + $this->setPreferences(); $title = 'Contact '.config('app.name'); $meta_title = 'Contact '.config('app.name'); $meta_keywords = 'contact us,contact,get in touch,email'; diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php index 53bdaa3c2..3d6f04c2f 100644 --- a/app/Http/Controllers/ContentController.php +++ b/app/Http/Controllers/ContentController.php @@ -14,7 +14,7 @@ class ContentController extends BasePageController */ public function show(Request $request) { - $this->setPrefs(); + $this->setPreferences(); $contents = new Contents(); $role = $this->userdata->role ?? 0; diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 27d193902..1248c3585 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -32,18 +32,18 @@ class DetailsController extends BasePageController * @throws \Foolz\SphinxQL\Exception\ConnectionException * @throws \Foolz\SphinxQL\Exception\DatabaseException * @throws \Foolz\SphinxQL\Exception\SphinxQLException + * @throws \Exception */ public function show(string $guid) { - $this->setPrefs(); + $this->setPreferences(); if ($guid !== null) { $releases = new Releases(); $re = new ReleaseExtra; $data = Release::getByGuid($guid); - $user = User::find(Auth::id()); - $cpapi = $user['cp_api']; - $cpurl = $user['cp_url']; + $cpapi = $this->userdata->cp_api; + $cpurl = $this->userdata->cp_url; $releaseRegex = ''; if (! empty($data)) { $releaseRegex = ReleaseRegex::query()->where('releases_id', '=', $data['id'])->first(); diff --git a/app/Http/Controllers/FileListController.php b/app/Http/Controllers/FileListController.php index 7bc26ddd9..4768ea561 100644 --- a/app/Http/Controllers/FileListController.php +++ b/app/Http/Controllers/FileListController.php @@ -12,7 +12,7 @@ class FileListController extends BasePageController */ public function show(string $guid): void { - $this->setPrefs(); + $this->setPreferences(); $nzb = new NZB(); if ($guid !== null) { diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 932cadb22..3adff4ff0 100644 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -16,7 +16,7 @@ class ForumController extends BasePageController */ public function forum(Request $request) { - $this->setPrefs(); + $this->setPreferences(); if ($this->isPostBack() && $request->has('addMessage') && $request->has('addSubject')) { Forumpost::add(0, $this->userdata->id, $request->input('addSubject'), $request->input('addMessage')); @@ -70,7 +70,7 @@ class ForumController extends BasePageController */ public function getPosts($id, Request $request) { - $this->setPrefs(); + $this->setPreferences(); if ($request->has('addMessage') && $this->isPostBack()) { Forumpost::add($id, $this->userdata->id, '', $request->input('addMessage')); @@ -121,7 +121,7 @@ class ForumController extends BasePageController */ public function edit(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if ($request->has('id') && ! empty($request->input('addMessage'))) { $parent = Forumpost::getPost($request->input('id')); @@ -153,7 +153,7 @@ class ForumController extends BasePageController */ public function destroy($id): \Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); if ($id) { Forumpost::deletePost($id); diff --git a/app/Http/Controllers/GamesController.php b/app/Http/Controllers/GamesController.php index d7353e464..ad4008b6a 100644 --- a/app/Http/Controllers/GamesController.php +++ b/app/Http/Controllers/GamesController.php @@ -14,7 +14,7 @@ class GamesController extends BasePageController */ public function show(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $games = new Games(['Settings' => $this->settings]); $gen = new Genres(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index d2e55eed5..8b7f9e6c8 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -21,7 +21,7 @@ class GetNzbController extends BasePageController */ public function getNzb(Request $request): \STS\ZipStream\ZipStream|StreamedResponse|JsonResponse { - $this->setPrefs(); + $this->setPreferences(); // Page is accessible only by the rss token, or logged in users. if (Auth::check()) { diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 7b19978d8..21f6c7468 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -14,7 +14,7 @@ class MovieController extends BasePageController */ public function showMovies(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); $movie = new Movie(['Settings' => $this->settings]); $moviecats = Category::getChildren(Category::MOVIE_ROOT); diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index f6227e965..8d35a89fc 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -15,7 +15,7 @@ class MusicController extends BasePageController */ public function show(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); $music = new Music(['Settings' => $this->settings]); $gen = new Genres(['Settings' => $this->settings]); diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index f01749f63..eea74bdec 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -16,7 +16,7 @@ class MyMoviesController extends BasePageController */ public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $mv = new Movie(['Settings' => $this->settings]); $action = $request->input('id') ?? ''; diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index 15598a8a7..aef8a2995 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -16,7 +16,7 @@ class MyShowsController extends BasePageController */ public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $action = $request->input('action') ?? ''; $videoId = $request->input('id') ?? ''; @@ -165,7 +165,7 @@ class MyShowsController extends BasePageController */ public function browse(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $title = 'Browse My Shows'; $meta_title = 'My Shows'; $meta_keywords = 'search,add,to,cart,nzb,description,details'; diff --git a/app/Http/Controllers/NfoController.php b/app/Http/Controllers/NfoController.php index af634c7a5..1f8ded980 100644 --- a/app/Http/Controllers/NfoController.php +++ b/app/Http/Controllers/NfoController.php @@ -14,7 +14,7 @@ class NfoController extends BasePageController */ public function showNfo(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); if ($id) { $rel = Release::getByGuid($id); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 2ed7ed668..ef205e549 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -25,7 +25,7 @@ class ProfileController extends BasePageController */ public function show(Request $request) { - $this->setPrefs(); + $this->setPreferences(); $sab = new SABnzbd($this); $userID = $this->userdata->id; @@ -124,7 +124,7 @@ class ProfileController extends BasePageController */ public function edit(Request $request) { - $this->setPrefs(); + $this->setPreferences(); $sab = new SABnzbd($this); $nzbGet = new NZBGet($this); @@ -271,7 +271,7 @@ class ProfileController extends BasePageController if (! empty($request->input('email')) && $this->userdata->email !== $request->input('email')) { $this->userdata->email = $request->input('email'); - $verify_user = User::find(Auth::id()); + $verify_user = $this->userdata; UserVerification::generate($verify_user); @@ -353,7 +353,7 @@ class ProfileController extends BasePageController */ public function destroy(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\Routing\Redirector|\Illuminate\View\View|\Illuminate\Http\RedirectResponse { - $this->setPrefs(); + $this->setPreferences(); $userId = $request->input('id'); if ($userId !== null && (int) $userId === $this->userdata->id && ! $this->userdata->hasRole('Admin')) { diff --git a/app/Http/Controllers/QueueController.php b/app/Http/Controllers/QueueController.php index 757392b31..92921f65f 100644 --- a/app/Http/Controllers/QueueController.php +++ b/app/Http/Controllers/QueueController.php @@ -15,7 +15,7 @@ class QueueController extends BasePageController */ public function index(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $queueType = $error = ''; $queue = null; @@ -101,7 +101,7 @@ class QueueController extends BasePageController */ public function nzbget() { - $this->setPrefs(); + $this->setPreferences(); $nzbGet = new NZBGet($this); $output = ''; @@ -174,7 +174,7 @@ class QueueController extends BasePageController */ public function sabnzbd() { - $this->setPrefs(); + $this->setPreferences(); $sab = new SABnzbd($this); $output = ''; @@ -249,7 +249,7 @@ class QueueController extends BasePageController */ public function nzbVortex() { - $this->setPrefs(); + $this->setPreferences(); try { if (isset($_GET['isAjax'])) { $vortex = new NZBVortex; diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index fd521db73..d6c08d2d5 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -85,7 +85,7 @@ class RssController extends BasePageController */ public function showRssDesc(): void { - $this->setPrefs(); + $this->setPreferences(); $rss = new RSS(['Settings' => $this->settings]); $title = 'Rss Info'; @@ -129,7 +129,7 @@ class RssController extends BasePageController */ public function cartRss(Request $request): \Illuminate\Http\JsonResponse|array { - $this->setPrefs(); + $this->setPreferences(); $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); @@ -156,7 +156,7 @@ class RssController extends BasePageController */ public function categoryFeedRss(Request $request): \Illuminate\Http\JsonResponse|array { - $this->setPrefs(); + $this->setPreferences(); $rss = new RSS(['Settings' => $this->settings]); $offset = 0; if ($request->missing('id')) { diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 65dcdf0f2..e8187c25b 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -14,7 +14,7 @@ class SearchController extends BasePageController */ public function search(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); $meta_title = 'Search Nzbs'; diff --git a/app/Http/Controllers/SendReleaseController.php b/app/Http/Controllers/SendReleaseController.php index cc210de2a..479c87701 100644 --- a/app/Http/Controllers/SendReleaseController.php +++ b/app/Http/Controllers/SendReleaseController.php @@ -16,7 +16,7 @@ class SendReleaseController extends BasePageController */ public function couchPotato(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if (empty($request->input('id'))) { $this->show404(); } else { @@ -39,7 +39,7 @@ class SendReleaseController extends BasePageController */ public function sabNzbd(Request $request) { - $this->setPrefs(); + $this->setPreferences(); if (empty($request->input('id'))) { $this->show404(); } @@ -64,7 +64,7 @@ class SendReleaseController extends BasePageController */ public function nzbGet(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if (empty($request->input('id'))) { $this->show404(); } @@ -93,13 +93,13 @@ class SendReleaseController extends BasePageController */ public function queue(Request $request): void { - $this->setPrefs(); + $this->setPreferences(); if (empty($request->input('id'))) { $this->show404(); } - $user = User::find(Auth::id()); - if ((int) $user['queuetype'] !== 2) { + $user = $this->userdata; + if ((int) $this->userdata->queuetype !== 2) { $sab = new SABnzbd($this); if (empty($sab->url)) { $this->show404(); diff --git a/app/Http/Controllers/SeriesController.php b/app/Http/Controllers/SeriesController.php index 019102921..b47172975 100644 --- a/app/Http/Controllers/SeriesController.php +++ b/app/Http/Controllers/SeriesController.php @@ -15,7 +15,7 @@ class SeriesController extends BasePageController */ public function index(Request $request, string $id = ''): void { - $this->setPrefs(); + $this->setPreferences(); $releases = new Releases(); $title = 'Series'; $meta_title = 'View TV Series'; diff --git a/app/Http/Controllers/TermsController.php b/app/Http/Controllers/TermsController.php index eb9d7b210..c8f52caf6 100644 --- a/app/Http/Controllers/TermsController.php +++ b/app/Http/Controllers/TermsController.php @@ -9,7 +9,7 @@ class TermsController extends BasePageController */ public function terms(): void { - $this->setPrefs(); + $this->setPreferences(); $title = 'Terms and Conditions'; $meta_title = config('app.name').' - Terms and conditions'; $meta_keywords = 'terms,conditions';