From 3d73bffa6eaf3640222b688df11072886d4e25aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 2 Aug 2017 13:52:19 +0200
Subject: [PATCH] FIX: fix minor bug in user management

---
 app/CMS/Enumerations/UserRoles.php              | 2 +-
 app/Http/Controllers/Admin/Users/EditUser.php   | 2 +-
 app/Http/Controllers/Admin/Users/UserDetail.php | 5 +++--
 app/Http/Controllers/Auth/LoginController.php   | 1 +
 app/Http/Middleware/Authenticate.php            | 5 ++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/CMS/Enumerations/UserRoles.php b/app/CMS/Enumerations/UserRoles.php
index 735592f3..6aabee15 100644
--- a/app/CMS/Enumerations/UserRoles.php
+++ b/app/CMS/Enumerations/UserRoles.php
@@ -9,7 +9,7 @@ class UserRoles extends BaseEnumeration
     {
         $roles = [
             User::ROLE_ADMIN   => 'admin/userManagement.role_' . User::ROLE_ADMIN,
-            User::ROLE_EDITOR  => 'admin/userManagement.role_' . User::ROLE_EDITOR,
+//            User::ROLE_EDITOR  => 'admin/userManagement.role_' . User::ROLE_EDITOR,
             User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR
         ];
 
diff --git a/app/Http/Controllers/Admin/Users/EditUser.php b/app/Http/Controllers/Admin/Users/EditUser.php
index 2b774233..90e34783 100644
--- a/app/Http/Controllers/Admin/Users/EditUser.php
+++ b/app/Http/Controllers/Admin/Users/EditUser.php
@@ -39,7 +39,7 @@ class EditUser extends Controller
     public function getEditUser(User $user = null)
     {
         // when no user specified, lets assume we want to edit "me"
-        if (!$user->exists()) {
+        if (!$user->exists) {
             $user = Auth::user();
         }
 
diff --git a/app/Http/Controllers/Admin/Users/UserDetail.php b/app/Http/Controllers/Admin/Users/UserDetail.php
index 6d027a0b..59c2b0e0 100644
--- a/app/Http/Controllers/Admin/Users/UserDetail.php
+++ b/app/Http/Controllers/Admin/Users/UserDetail.php
@@ -25,10 +25,11 @@ class UserDetail extends Controller
     public function getDetail(User $user = null)
     {
         // when no user specified, lets assume we want to edit "me"
-        if (!$user->exists()) {
-            $id = Auth::user();
+        if (!$user->exists) {
+            $user = Auth::user();
         }
 
+
         $actions = $this->log->getUserActions($user->id, 10);
         $roles = UserRoles::getWithTranslations();
         $states = UserStates::getWithTranslations();
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 17597694..a4c37755 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
 
 class LoginController extends Controller
 {
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 44a30265..68872955 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -20,7 +20,7 @@ class Authenticate
     public function handle($request, Closure $next, $guard = null)
     {
         if (!Auth::guard($guard)
-                 ->check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR) {
+                 ->check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR || 0) {
             Auth::logout();
 
             if ($request->ajax()) {
@@ -38,8 +38,7 @@ class Authenticate
 
             return redirect()
                 ->route('login')
-                ->with('warning', trans($message))
-                ->with('redirectTo', $request->fullUrl());
+                ->with('warning', trans($message));
         }
 
         return $next($request);