From 148befcf815de50bb3ce5a53f503e01301172e8a Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 19 Apr 2018 21:53:53 +0200
Subject: [PATCH] Fix bugs in redirects

---
 Changelog                                        | 1 +
 app/Http/Controllers/Admin/ContentController.php | 2 +-
 app/Http/Controllers/Admin/MenuController.php    | 2 +-
 app/Http/Controllers/Admin/RoleController.php    | 3 +--
 app/Http/Controllers/Admin/ShowsController.php   | 2 +-
 app/Http/Controllers/Admin/UserController.php    | 2 +-
 resources/views/themes/admin/content-list.tpl    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index e4a7fd522..b0d264739 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-04-19 DariusIII
+	* Fix: Fix bugs in redirects
 	* Fix: Fix link on content addition
 	* Chg: Change redirect route on site edit submit action
 	* Chg: Update admin redirects
diff --git a/app/Http/Controllers/Admin/ContentController.php b/app/Http/Controllers/Admin/ContentController.php
index f4997cf04..9e46fdd85 100644
--- a/app/Http/Controllers/Admin/ContentController.php
+++ b/app/Http/Controllers/Admin/ContentController.php
@@ -78,7 +78,7 @@ class ContentController extends BasePageController
                     $returnid = $content['id'];
                 }
 
-                return redirect('admin/content-add.php?id='.$returnid);
+                return redirect('admin/content-add?id='.$returnid);
                 break;
 
             case 'view':
diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php
index 949adbea3..4c6b639cd 100644
--- a/app/Http/Controllers/Admin/MenuController.php
+++ b/app/Http/Controllers/Admin/MenuController.php
@@ -58,7 +58,7 @@ class MenuController extends BasePageController
                     Menu::updateMenu($request->all());
                 }
 
-                header('Location:'.WWW_TOP.'/menu-list.php');
+                return redirect('admin//menu-list');
                 break;
 
             case 'view':
diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php
index 57ecbb15f..99cadc5a5 100644
--- a/app/Http/Controllers/Admin/RoleController.php
+++ b/app/Http/Controllers/Admin/RoleController.php
@@ -75,8 +75,7 @@ class RoleController extends BasePageController
                 /*header('Location:'.WWW_TOP.'/role-list.php');*/
                 } else {
                     $role = UserRole::updateRole($request->all());
-                    //dd($role);
-                    header('Location:'.WWW_TOP.'/role-list.php');
+                    header('Location:'.WWW_TOP.'admin/role-list');
 
                     $request->merge(['exccat' => (! $request->has('exccat') || ! \is_array($request->input('exccat'))) ? [] : $request->input('exccat')]);
                     RoleExcludedCategory::addRoleCategoryExclusions($request->input('id'), $request->input('exccat'));
diff --git a/app/Http/Controllers/Admin/ShowsController.php b/app/Http/Controllers/Admin/ShowsController.php
index 1d661e4f1..5a6fa7560 100644
--- a/app/Http/Controllers/Admin/ShowsController.php
+++ b/app/Http/Controllers/Admin/ShowsController.php
@@ -54,7 +54,7 @@ class ShowsController extends BasePageController
                     exit;
                 }
 
-                header('Location:'.WWW_TOP.'/show-list.php');
+                header('Location:'.WWW_TOP.'admin/show-list');
                 break;
 
             case 'view':
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 429fe34ec..cd9b45738 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -57,7 +57,7 @@ class UserController extends BasePageController
         User::updateExpiredRoles();
 
         foreach ($ordering as $orderType) {
-            $this->smarty->assign('orderby'.$orderType, WWW_TOP.'/user-list.php?ob='.$orderType.'&offset=0');
+            $this->smarty->assign('orderby'.$orderType, WWW_TOP.'admin/user-list?ob='.$orderType.'&offset=0');
         }
 
         $content = $this->smarty->fetch('user-list.tpl');
diff --git a/resources/views/themes/admin/content-list.tpl b/resources/views/themes/admin/content-list.tpl
index 9859e4ef8..0e6a15a1d 100644
--- a/resources/views/themes/admin/content-list.tpl
+++ b/resources/views/themes/admin/content-list.tpl
@@ -55,7 +55,7 @@
 				</td>
 				<td title="{$content->body|escape:'htmlall'}">{$content->body|truncate:100|escape:'htmlall'}</td>
 				<td><a class="confirm_action"
-					   href="{$smarty.const.WWW_TOP}/content-delete?id={$content->id}">delete</a></td>
+					   href="{$smarty.const.WWW_TOP}/admin/content-delete?id={$content->id}">delete</a></td>
 			</tr>
 		{/foreach}
 	</table>