From 55cbe4087cc86f88f8b8df5d1291500654c9e52e Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 17 Jul 2018 13:27:25 +1000
Subject: [PATCH] More improvements to User Switch

---
 .../adminlte/views/layouts/partials/mainheader.blade.php   | 6 +++---
 src/Controllers/AdminController.php                        | 2 +-
 src/Traits/UserSwitch.php                                  | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
index 7574731..d1733c6 100644
--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@@ -45,7 +45,7 @@
 					<!-- Top Menu Items -->
 					@include('adminlte::layouts.partials.topmenu')
 
-					<li class="dropdown user user-menu @if($user->switched()) bg-red @endif" id="user_menu">
+					<li class="dropdown user user-menu @if($user->switched) bg-red @endif" id="user_menu">
 					<!-- Menu Toggle Button -->
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<!-- The user image in the navbar-->
@@ -69,7 +69,7 @@
 								</div>
 
 								<div class="pull-right">
-									@if ($user->switched())
+									@if ($user->switched)
 										<a href="{{ url('/admin/switch/stop') }}" class="btn btn-default btn-flat" id="switch">
 											{{ trans('adminlte_lang::message.switchoff') }}
 										</a>
@@ -101,4 +101,4 @@
 			</ul>
 		</div>
 	</nav>
-</header>
+</header>
\ No newline at end of file
diff --git a/src/Controllers/AdminController.php b/src/Controllers/AdminController.php
index 6dae1d4..7b4ff1c 100644
--- a/src/Controllers/AdminController.php
+++ b/src/Controllers/AdminController.php
@@ -18,7 +18,7 @@ class AdminController extends Controller
 
 	public function switch_authorised()
 	{
-		return TRUE;
+		return Auth::user()->isAdmin ? TRUE : FALSE;
 	}
 
 	public function switch_session()
diff --git a/src/Traits/UserSwitch.php b/src/Traits/UserSwitch.php
index a760421..7503cda 100644
--- a/src/Traits/UserSwitch.php
+++ b/src/Traits/UserSwitch.php
@@ -9,7 +9,12 @@ use Session;
 
 trait UserSwitch
 {
-	public function switched()
+	public function GetIsAdminAttribute()
+	{
+		return isset($this->admin) ? $this->admin : FALSE;
+	}
+
+	public function getSwitchedAttribute()
 	{
 		return Session::get('orig_user');
 	}