starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-09-02 03:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad checks in all regex related admin controllers

Browse Source
This commit is contained in:
DariusIII
2019-01-04 12:27:12 +01:00
parent d2dd3d8109
commit ffc233a71d
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+1
View File
@@ -1,4 +1,5 @@
2019-01-04 DariusIII
* Fix: Fix bad checks in all regex related admin controllers
* Fix: Fix adding new collection regexes
* Fix: Fix AEBN class error when fetching data
2019-01-03 DariusIII
app/Http/Controllers/Admin/CategoryRegexesController.php
+3 -3
View File
@@ -70,12 +70,12 @@ class CategoryRegexesController extends BasePageController
switch ($action) {
case 'submit':
if ($request->input('group_regex') === '') {
if (empty($request->input('group_regex'))) {
$this->smarty->assign('error', 'Group regex must not be empty!');
break;
}
if ($request->input('regex') === '') {
if (empty($request->input('regex'))) {
$this->smarty->assign('error', 'Regex cannot be empty');
break;
}
@@ -85,7 +85,7 @@ class CategoryRegexesController extends BasePageController
break;
}
if ($request->input('id') === '') {
if (empty($request->input('id'))) {
$regexes->addRegex($request->all());
} else {
$regexes->updateRegex($request->all());
app/Http/Controllers/Admin/CollectionRegexesController.php
+4 -4
View File
@@ -58,17 +58,17 @@ class CollectionRegexesController extends BasePageController
switch ($request->input('action') ?? 'view') {
case 'submit':
if ($request->input('group_regex') === '') {
if (empty($request->input('group_regex'))) {
$error = 'Group regex must not be empty!';
break;
}
if ($request->input('regex') === '') {
if (empty($request->input('regex'))) {
$error = 'Regex cannot be empty';
break;
}
if ($request->input('description') === '') {
if (empty($request->input('description'))) {
$request->merge(['description' => '']);
}
@@ -77,7 +77,7 @@ class CollectionRegexesController extends BasePageController
break;
}
if (empty($request->input('id'))) {
if (! $request->has('id')) {
$regexes->addRegex($request->all());
} else {
$regexes->updateRegex($request->all());
app/Http/Controllers/Admin/ReleaseNamingRegexesController.php
+8 -7
View File
@@ -42,6 +42,7 @@ class ReleaseNamingRegexesController extends BasePageController
/**
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws \Exception
*/
public function edit(Request $request)
@@ -54,17 +55,17 @@ class ReleaseNamingRegexesController extends BasePageController
switch ($action) {
case 'submit':
if ($request->input('group_regex') === '') {
if (empty($request->input('group_regex'))) {
$this->smarty->assign('error', 'Group regex must not be empty!');
break;
}
if ($request->input('regex') === '') {
if (empty($request->input('regex'))) {
$this->smarty->assign('error', 'Regex cannot be empty');
break;
}
if ($request->input('description') === '') {
if (empty($request->input('description'))) {
$request->merge(['description' => '']);
}
@@ -73,13 +74,13 @@ class ReleaseNamingRegexesController extends BasePageController
break;
}
if ($request->input('id') === '') {
$regex = $regexes->addRegex($request->all());
if (empty($request->input('id'))) {
$regexes->addRegex($request->all());
} else {
$regex = $regexes->updateRegex($request->all());
$regexes->updateRegex($request->all());
}
redirect('admin/release_naming_regexes-list');
return redirect('admin/release_naming_regexes-list');
break;
case 'view':