Replace ! $request->has with new $request->missing

This commit is contained in:
DariusIII
2019-10-24 11:19:10 +02:00
parent 03b4c9dd84
commit 0fe0555bcd
13 changed files with 17 additions and 16 deletions
+1
View File
@@ -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)
@@ -20,7 +20,7 @@ class AjaxController extends BasePageController
*/
public function ajaxAction(Request $request)
{
if (! $request->has('action')) {
if ($request->missing('action')) {
exit();
}
@@ -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());
@@ -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 = '';
+1 -1
View File
@@ -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 = '';
}
+3 -3
View File
@@ -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)');
}
+1 -1
View File
@@ -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)');
}
@@ -51,7 +51,7 @@ class ResetPasswordController extends Controller
$error = '';
$confirmed = '';
$onscreen = '';
if (! $request->has('guid')) {
if ($request->missing('guid')) {
$error = 'No reset code provided.';
}
@@ -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!']);
}
+1 -1
View File
@@ -36,7 +36,7 @@ class GetNzbController extends BasePageController
Utility::showApiError(101);
}
} else {
if (! $request->has('r')) {
if ($request->missing('r')) {
Utility::showApiError(200);
}
+1 -1
View File
@@ -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) {
+2 -2
View File
@@ -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);
}
+2 -2
View File
@@ -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);