From 53ccfc26168733481ab289cc8b29dda68c1ff249 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 31 Mar 2023 17:01:28 +0200 Subject: [PATCH] CS fixes --- Blacklight/utility/Utility.php | 1 + app/Http/Controllers/Api/ApiController.php | 24 ++++++++++---------- app/Http/Controllers/Api/ApiV2Controller.php | 20 ++++++++-------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Blacklight/utility/Utility.php b/Blacklight/utility/Utility.php index bd131f728..d178ddaf2 100755 --- a/Blacklight/utility/Utility.php +++ b/Blacklight/utility/Utility.php @@ -243,6 +243,7 @@ class Utility $response = "\n". '\n"; + return response($response)->header('Content-type', 'text/xml')->header('Content-Length', strlen($response))->header('X-NNTmux', 'API ERROR ['.$errorCode.'] '.$errorText)->header('HTTP/1.1', $errorHeader); } diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index a3a714a46..a7756bc03 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -27,8 +27,8 @@ class ApiController extends BasePageController private string $type; /** - * @param Request $request * @return Application|\Illuminate\Foundation\Application|RedirectResponse|Redirector|StreamedResponse|void + * * @throws \Throwable */ public function api(Request $request) @@ -186,14 +186,14 @@ class ApiController extends BasePageController case 'tv': $this->verifyEmptyParameter($request, 'q'); $this->verifyEmptyParameter($request, 'vid'); - $this->verifyEmptyParameter($request,'tvdbid'); - $this->verifyEmptyParameter($request,'traktid'); - $this->verifyEmptyParameter($request,'rid'); - $this->verifyEmptyParameter($request,'tvmazeid'); - $this->verifyEmptyParameter($request,'imdbid'); - $this->verifyEmptyParameter($request,'tmdbid'); - $this->verifyEmptyParameter($request,'season'); - $this->verifyEmptyParameter($request,'ep'); + $this->verifyEmptyParameter($request, 'tvdbid'); + $this->verifyEmptyParameter($request, 'traktid'); + $this->verifyEmptyParameter($request, 'rid'); + $this->verifyEmptyParameter($request, 'tvmazeid'); + $this->verifyEmptyParameter($request, 'imdbid'); + $this->verifyEmptyParameter($request, 'tmdbid'); + $this->verifyEmptyParameter($request, 'season'); + $this->verifyEmptyParameter($request, 'ep'); $maxAge = $this->maxAge($request); UserRequest::addApiRequest($apiKey, $request->getRequestUri()); @@ -235,8 +235,8 @@ class ApiController extends BasePageController // Search movie releases. case 'm': - $this->verifyEmptyParameter($request,'q'); - $this->verifyEmptyParameter($request,'imdbid'); + $this->verifyEmptyParameter($request, 'q'); + $this->verifyEmptyParameter($request, 'imdbid'); $maxAge = $this->maxAge($request); UserRequest::addApiRequest($apiKey, $request->getRequestUri()); @@ -269,7 +269,7 @@ class ApiController extends BasePageController // Get NZB. case 'g': - $this->verifyEmptyParameter($request,'g'); + $this->verifyEmptyParameter($request, 'g'); UserRequest::addApiRequest($apiKey, $request->getRequestUri()); $relData = Release::checkGuidForApi($request->input('id')); if ($relData) { diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php index d1ec1f5e5..8e8782598 100644 --- a/app/Http/Controllers/Api/ApiV2Controller.php +++ b/app/Http/Controllers/Api/ApiV2Controller.php @@ -181,16 +181,16 @@ class ApiV2Controller extends BasePageController $user = User::query()->where('api_token', $request->input('api_token'))->first(); $catExclusions = User::getCategoryExclusionForApi($request); $minSize = $request->has('minsize') && $request->input('minsize') > 0 ? $request->input('minsize') : 0; - $this->api->verifyEmptyParameter($request,'id'); - $this->api->verifyEmptyParameter($request,'vid'); - $this->api->verifyEmptyParameter($request,'tvdbid'); - $this->api->verifyEmptyParameter($request,'traktid'); - $this->api->verifyEmptyParameter($request,'rid'); - $this->api->verifyEmptyParameter($request,'tvmazeid'); - $this->api->verifyEmptyParameter($request,'imdbid'); - $this->api->verifyEmptyParameter($request,'tmdbid'); - $this->api->verifyEmptyParameter($request,'season'); - $this->api->verifyEmptyParameter($request,'ep'); + $this->api->verifyEmptyParameter($request, 'id'); + $this->api->verifyEmptyParameter($request, 'vid'); + $this->api->verifyEmptyParameter($request, 'tvdbid'); + $this->api->verifyEmptyParameter($request, 'traktid'); + $this->api->verifyEmptyParameter($request, 'rid'); + $this->api->verifyEmptyParameter($request, 'tvmazeid'); + $this->api->verifyEmptyParameter($request, 'imdbid'); + $this->api->verifyEmptyParameter($request, 'tmdbid'); + $this->api->verifyEmptyParameter($request, 'season'); + $this->api->verifyEmptyParameter($request, 'ep'); $maxAge = $this->api->maxAge($request); UserRequest::addApiRequest($request->input('api_token'), $request->getRequestUri()); event(new UserAccessedApi($user));