From 0fe0555bcdddea526dff57bdd75c845c7f33ca5e Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 24 Oct 2019 11:19:10 +0200 Subject: [PATCH] Replace ! $request->has with new $request->missing --- Changelog | 1 + app/Http/Controllers/Admin/AjaxController.php | 2 +- app/Http/Controllers/Admin/ContentController.php | 2 +- app/Http/Controllers/Admin/SiteController.php | 2 +- app/Http/Controllers/AnimeController.php | 2 +- app/Http/Controllers/Api/ApiController.php | 6 +++--- app/Http/Controllers/Api/ApiV2Controller.php | 2 +- app/Http/Controllers/Auth/ResetPasswordController.php | 2 +- app/Http/Controllers/FailedReleasesController.php | 2 +- app/Http/Controllers/GetNzbController.php | 2 +- app/Http/Controllers/ProfileController.php | 2 +- app/Http/Controllers/RssController.php | 4 ++-- app/Http/Controllers/SearchController.php | 4 ++-- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Changelog b/Changelog index 6f48717b9..bd63f9035 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-10-24 DariusIII + * Chg: Replace ! $request->has with new $request->missing * Chg: Update regex in TV class 2019-10-23 DariusIII * Chg: Update laravel/framework (v6.3.0 => v6.4.0) diff --git a/app/Http/Controllers/Admin/AjaxController.php b/app/Http/Controllers/Admin/AjaxController.php index 2baea1de3..9423dfc5d 100644 --- a/app/Http/Controllers/Admin/AjaxController.php +++ b/app/Http/Controllers/Admin/AjaxController.php @@ -20,7 +20,7 @@ class AjaxController extends BasePageController */ public function ajaxAction(Request $request) { - if (! $request->has('action')) { + if ($request->missing('action')) { exit(); } diff --git a/app/Http/Controllers/Admin/ContentController.php b/app/Http/Controllers/Admin/ContentController.php index 77c21e5c0..45380802b 100644 --- a/app/Http/Controllers/Admin/ContentController.php +++ b/app/Http/Controllers/Admin/ContentController.php @@ -66,7 +66,7 @@ class ContentController extends BasePageController case 'submit': // Validate and add or update. - if (! $request->has('id') || empty($request->input('id'))) { + if ($request->missing('id') || empty($request->input('id'))) { $returnid = $contents->add($request->all()); } else { $content = $contents->update($request->all()); diff --git a/app/Http/Controllers/Admin/SiteController.php b/app/Http/Controllers/Admin/SiteController.php index fb9c6f7a1..050883520 100644 --- a/app/Http/Controllers/Admin/SiteController.php +++ b/app/Http/Controllers/Admin/SiteController.php @@ -30,7 +30,7 @@ class SiteController extends BasePageController switch ($action) { case 'submit': - if (! $request->has('book_reqids')) { + if ($request->missing('book_reqids')) { $request->merge(['book_reqids' => []]); } $error = ''; diff --git a/app/Http/Controllers/AnimeController.php b/app/Http/Controllers/AnimeController.php index ca2227781..2082fb7b4 100644 --- a/app/Http/Controllers/AnimeController.php +++ b/app/Http/Controllers/AnimeController.php @@ -94,7 +94,7 @@ class AnimeController extends BasePageController $animeTitle = ($request->has('title') && ! empty($request->input('title'))) ? $request->input('title') : ''; - if ($animeTitle !== '' && ! $request->has('id')) { + if ($animeTitle !== '' && $request->missing('id')) { $letter = ''; } diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index 3ce72a36f..e44a5fdfb 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -71,7 +71,7 @@ class ApiController extends BasePageController // Page is accessible only by the apikey if ($function !== 'c' && $function !== 'r') { - if (! $request->has('apikey') || ($request->has('apikey') && empty($request->input('apikey')))) { + if ($request->missing('apikey') || ($request->has('apikey') && empty($request->input('apikey')))) { Utility::showApiError(200, 'Missing parameter (apikey)'); } else { $apiKey = $request->input('apikey'); @@ -274,7 +274,7 @@ class ApiController extends BasePageController // Get individual NZB details. case 'd': - if (! $request->has('id')) { + if ($request->missing('id')) { Utility::showApiError(200, 'Missing parameter (guid is required for single release details)'); } @@ -286,7 +286,7 @@ class ApiController extends BasePageController // Get an NFO file for an individual release. case 'n': - if (! $request->has('id')) { + if ($request->missing('id')) { Utility::showApiError(200, 'Missing parameter (id is required for retrieving an NFO)'); } diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php index 573913686..4cb36a813 100644 --- a/app/Http/Controllers/Api/ApiV2Controller.php +++ b/app/Http/Controllers/Api/ApiV2Controller.php @@ -289,7 +289,7 @@ class ApiV2Controller extends BasePageController */ public function details(Request $request): \Illuminate\Http\JsonResponse { - if (! $request->has('id')) { + if ($request->missing('id')) { Utility::showApiError(200, 'Missing parameter (guid is required for single release details)'); } diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index f5642f33f..1a2ae7f92 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -51,7 +51,7 @@ class ResetPasswordController extends Controller $error = ''; $confirmed = ''; $onscreen = ''; - if (! $request->has('guid')) { + if ($request->missing('guid')) { $error = 'No reset code provided.'; } diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php index 96e5cd5b5..155e6635c 100644 --- a/app/Http/Controllers/FailedReleasesController.php +++ b/app/Http/Controllers/FailedReleasesController.php @@ -16,7 +16,7 @@ class FailedReleasesController extends BasePageController */ public function failed(Request $request) { - if (! $request->has('api_token')) { + if ($request->missing('api_token')) { return response('Bad request, please supply all parameters!', 400)->withHeaders(['X-DNZB-RCode' => 400, 'X-DNZB-RText' => 'Bad request, please supply all parameters!']); } diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index 053bf9ea4..55bb3dcd4 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -36,7 +36,7 @@ class GetNzbController extends BasePageController Utility::showApiError(101); } } else { - if (! $request->has('r')) { + if ($request->missing('r')) { Utility::showApiError(200); } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index bc501349a..3a001b6ee 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -160,7 +160,7 @@ class ProfileController extends BasePageController $errorStr = implode('', Arr::collapse($validator->errors()->toArray())); } elseif (! empty($request->input('nzbgeturl')) && $nzbGet->verifyURL($request->input('nzbgeturl')) === false) { $errorStr = 'The NZBGet URL you entered is invalid!'; - } elseif ((! $request->has('saburl') && $request->has('sabapikey')) || ($request->has('saburl') && ! $request->has('sabapikey'))) { + } elseif (($request->missing('saburl') && $request->has('sabapikey')) || ($request->has('saburl') && $request->missing('sabapikey'))) { $errorStr = 'Insert a SABnzdb URL and API key.'; } else { if ($request->has('sabetting') && $request->input('sabsetting') === 2) { diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 5e1f6d437..685349751 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -172,7 +172,7 @@ class RssController extends BasePageController $this->setPrefs(); $rss = new RSS(['Settings' => $this->settings]); $offset = 0; - if (! $request->has('id')) { + if ($request->missing('id')) { return response()->json(['error' => 'Category ID is missing'], '403'); } @@ -202,7 +202,7 @@ class RssController extends BasePageController */ private function userCheck(Request $request) { - if (! $request->has('api_token')) { + if ($request->missing('api_token')) { return response()->json(['error' => 'API key is required for viewing the RSS!'], 403); } diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 2e0737004..8b441e0f7 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -41,7 +41,7 @@ class SearchController extends BasePageController ] ); - if ($searchType === 'basic' && ! $request->has('searchadvr') && ($request->has('id') || $request->has('subject'))) { + if ($searchType === 'basic' && $request->missing('searchadvr') && ($request->has('id') || $request->has('subject'))) { $searchString = []; switch (true) { case $request->has('subject'): @@ -125,7 +125,7 @@ class SearchController extends BasePageController $this->smarty->assign($searchVarKey, $searchVars[$searchVarKey]); } - if ($searchType !== 'basic' && ! $request->has('id') && $request->has('searchadvr') && ! $request->has('subject')) { + if ($searchType !== 'basic' && $request->missing('id') && $request->has('searchadvr') && $request->missing('subject')) { $orderByString = ''; foreach ($searchVars as $searchVarKey => $searchVar) { $orderByString .= "&$searchVarKey=".htmlentities($searchVar, ENT_QUOTES | ENT_HTML5);