From 60c81ea1c805c138e174b1f352b13457adcc677d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 25 Feb 2019 23:19:54 +0100 Subject: [PATCH] Fix Releases class instantiation --- Blacklight/ReleaseRemover.php | 2 +- Blacklight/processing/ProcessReleases.php | 2 +- Changelog | 1 + app/Http/Controllers/Admin/NzbController.php | 2 +- app/Http/Controllers/Api/ApiController.php | 2 +- app/Http/Controllers/BrowseController.php | 4 ++-- app/Http/Controllers/DetailsController.php | 2 +- app/Http/Controllers/GetNzbController.php | 2 +- app/Http/Controllers/MyMoviesController.php | 2 +- app/Http/Controllers/MyShowsController.php | 2 +- app/Http/Controllers/SearchController.php | 2 +- app/Http/Controllers/SeriesController.php | 2 +- app/Models/UsenetGroup.php | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Blacklight/ReleaseRemover.php b/Blacklight/ReleaseRemover.php index 5904dc9d9..bc081d795 100755 --- a/Blacklight/ReleaseRemover.php +++ b/Blacklight/ReleaseRemover.php @@ -123,7 +123,7 @@ class ReleaseRemover $options += $defaults; $this->consoleTools = ($options['ConsoleTools'] instanceof ConsoleTools ? $options['ConsoleTools'] : new ConsoleTools()); - $this->releases = ($options['Releases'] instanceof Releases ? $options['Releases'] : new Releases(['Settings' => null])); + $this->releases = ($options['Releases'] instanceof Releases ? $options['Releases'] : new Releases()); $this->nzb = ($options['NZB'] instanceof NZB ? $options['NZB'] : new NZB()); $this->releaseImage = ($options['ReleaseImage'] instanceof ReleaseImage ? $options['ReleaseImage'] : new ReleaseImage()); $this->colorCli = new ColorCLI(); diff --git a/Blacklight/processing/ProcessReleases.php b/Blacklight/processing/ProcessReleases.php index 605b97615..f1adf531d 100755 --- a/Blacklight/processing/ProcessReleases.php +++ b/Blacklight/processing/ProcessReleases.php @@ -127,7 +127,7 @@ class ProcessReleases $this->consoleTools = ($options['ConsoleTools'] instanceof ConsoleTools ? $options['ConsoleTools'] : new ConsoleTools()); $this->nzb = ($options['NZB'] instanceof NZB ? $options['NZB'] : new NZB()); $this->releaseCleaning = ($options['ReleaseCleaning'] instanceof ReleaseCleaning ? $options['ReleaseCleaning'] : new ReleaseCleaning()); - $this->releases = ($options['Releases'] instanceof Releases ? $options['Releases'] : new Releases(['Groups' => null])); + $this->releases = ($options['Releases'] instanceof Releases ? $options['Releases'] : new Releases()); $this->releaseImage = ($options['ReleaseImage'] instanceof ReleaseImage ? $options['ReleaseImage'] : new ReleaseImage()); $this->colorCli = new ColorCLI(); diff --git a/Changelog b/Changelog index 032a0137c..441914813 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-25 DariusIII + * Fix: Fix Releases class instantiation * Chg: Releases class now extends Release model * Fix: Fix RSS feed URLs in template files * Fix: Properly handle rss feeds diff --git a/app/Http/Controllers/Admin/NzbController.php b/app/Http/Controllers/Admin/NzbController.php index ddf8217a0..f7218310c 100644 --- a/app/Http/Controllers/Admin/NzbController.php +++ b/app/Http/Controllers/Admin/NzbController.php @@ -82,7 +82,7 @@ class NzbController extends BasePageController } $this->setAdminPrefs(); - $rel = new Releases(['Settings' => null]); + $rel = new Releases(); if ($this->isPostBack()) { $path = $request->input('folder'); diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index 8d8504e85..5fa93ab6d 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -97,7 +97,7 @@ class ApiController extends BasePageController } } - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $api = new API(['Settings' => $this->settings, 'Request' => $request]); // Set Query Parameters based on Request objects diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 762fb386c..d807bbff3 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(); - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $this->smarty->assign('category', -1); @@ -57,7 +57,7 @@ class BrowseController extends BasePageController public function show(string $parentCategory, string $id = 'All') { $this->setPrefs(); - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $parentId = Category::query()->where('title', $parentCategory)->first(['id']); diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php index 16b6d5e07..b52cb085c 100644 --- a/app/Http/Controllers/DetailsController.php +++ b/app/Http/Controllers/DetailsController.php @@ -37,7 +37,7 @@ class DetailsController extends BasePageController $this->setPrefs(); if ($guid !== null) { - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $re = new ReleaseExtra; $data = Release::getByGuid($guid); $user = User::find(Auth::id()); diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index ccd88f597..ff72d7b00 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -64,7 +64,7 @@ class GetNzbController extends BasePageController // Remove any suffixed id with .nzb which is added to help weblogging programs see nzb traffic. $request->merge(['id' => str_ireplace('.nzb', '', $request->input('id'))]); - $rel = new Releases(['Settings' => $this->settings]); + $rel = new Releases(); // User requested a zip of guid,guid,guid releases. if ($request->has('zip') && $request->input('zip') === '1') { $guids = explode(',', $request->input('id')); diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php index 20de41fd8..ace96c441 100644 --- a/app/Http/Controllers/MyMoviesController.php +++ b/app/Http/Controllers/MyMoviesController.php @@ -148,7 +148,7 @@ class MyMoviesController extends BasePageController } } - $ordering = (new Releases(['Settings' => $this->settings]))->getBrowseOrdering(); + $ordering = (new Releases())->getBrowseOrdering(); $page = $request->has('page') && is_numeric($request->input('page')) ? $request->input('page') : 1; diff --git a/app/Http/Controllers/MyShowsController.php b/app/Http/Controllers/MyShowsController.php index e4c2a51ba..b7d13f88e 100644 --- a/app/Http/Controllers/MyShowsController.php +++ b/app/Http/Controllers/MyShowsController.php @@ -177,7 +177,7 @@ class MyShowsController extends BasePageController $shows = UserSerie::getShows($this->userdata->id); - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $page = request()->has('page') && is_numeric(request()->input('page')) ? request()->input('page') : 1; $offset = ($page - 1) * config('nntmux.items_per_page'); diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 1f95903eb..ffc98ee11 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -17,7 +17,7 @@ class SearchController extends BasePageController public function search(Request $request) { $this->setPrefs(); - $releases = new Releases(['Groups' => null, 'Settings' => $this->settings]); + $releases = new Releases(); $meta_title = 'Search Nzbs'; $meta_keywords = 'search,nzb,description,details'; diff --git a/app/Http/Controllers/SeriesController.php b/app/Http/Controllers/SeriesController.php index 0fa438cf3..32c87979b 100644 --- a/app/Http/Controllers/SeriesController.php +++ b/app/Http/Controllers/SeriesController.php @@ -19,7 +19,7 @@ class SeriesController extends BasePageController public function index($id = '', Request $request) { $this->setPrefs(); - $releases = new Releases(['Settings' => $this->settings]); + $releases = new Releases(); $title = 'Series'; $meta_title = 'View TV Series'; $meta_keywords = 'view,series,tv,show,description,details'; diff --git a/app/Models/UsenetGroup.php b/app/Models/UsenetGroup.php index f615f5dba..5d84235a9 100644 --- a/app/Models/UsenetGroup.php +++ b/app/Models/UsenetGroup.php @@ -417,7 +417,7 @@ class UsenetGroup extends Model $res->get(); - $releases = new Releases(['Groups' => self::class]); + $releases = new Releases(); $nzb = new NZB(); $releaseImage = new ReleaseImage(); foreach ($res as $row) {