From ffc233a71db474060037601ebc18b77fb7a42e19 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Fri, 4 Jan 2019 12:27:12 +0100
Subject: [PATCH] Fix bad checks in all regex related admin controllers

---
 Changelog                                         |  1 +
 .../Admin/CategoryRegexesController.php           |  6 +++---
 .../Admin/CollectionRegexesController.php         |  8 ++++----
 .../Admin/ReleaseNamingRegexesController.php      | 15 ++++++++-------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Changelog b/Changelog
index fc5955d5e..3afc6209c 100755
--- a/Changelog
+++ b/Changelog
@@ -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
diff --git a/app/Http/Controllers/Admin/CategoryRegexesController.php b/app/Http/Controllers/Admin/CategoryRegexesController.php
index 246397616..aacf8fb03 100644
--- a/app/Http/Controllers/Admin/CategoryRegexesController.php
+++ b/app/Http/Controllers/Admin/CategoryRegexesController.php
@@ -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());
diff --git a/app/Http/Controllers/Admin/CollectionRegexesController.php b/app/Http/Controllers/Admin/CollectionRegexesController.php
index 59a5ff5ce..666261714 100644
--- a/app/Http/Controllers/Admin/CollectionRegexesController.php
+++ b/app/Http/Controllers/Admin/CollectionRegexesController.php
@@ -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());
diff --git a/app/Http/Controllers/Admin/ReleaseNamingRegexesController.php b/app/Http/Controllers/Admin/ReleaseNamingRegexesController.php
index d8d5153c7..116d8bd02 100644
--- a/app/Http/Controllers/Admin/ReleaseNamingRegexesController.php
+++ b/app/Http/Controllers/Admin/ReleaseNamingRegexesController.php
@@ -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':