butcherman / Tech_Bench

app/Http/Controllers/Admin/UserController.php

Spacing +8 added lines, -8 removed lines

@@ -31,8 +31,8 @@ 
     public function __construct()
     {
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
-        $this->middleware(function ($request, $next) {
-            $this->user = auth()->user();  //  TODO - is this correct????
+        $this->middleware(function($request, $next) {
+            $this->user = auth()->user(); //  TODO - is this correct????
             $this->authorize('hasAccess', 'Manage Users');
             return $next($request);
         });
@@ -101,7 +101,7 @@ 
     {
         //  Validate the new user form
         $request->validate([
-            'role'       => 'required|numeric',  //  TODO - add validation rule - is in user roles table
+            'role'       => 'required|numeric', //  TODO - add validation rule - is in user roles table
             'username'   => 'required|unique:users|regex:/^[a-zA-Z0-9_]*$/',
             'first_name' => 'required',
             'last_name'  => 'required',
@@ -172,7 +172,7 @@ 
                 {
                     $query->latest()->limit(1);
                 }])->get()->makeVisible('user_id'));
-                $route    = 'admin.user.edit';
+                $route = 'admin.user.edit';
                 break;
             default:
                 abort(404);
@@ -198,10 +198,10 @@ 
         $user  = new UserResource(User::find($id));
 
         $roleArr = [];
-        foreach ($roles as $role) {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
+        foreach($roles as $role) {
+            if($role->role_id == 1 && Auth::user()->role_id != 1) {
                 continue;
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
+            } else if($role->role_id == 2 && Auth::user()->role_id > 1) {
                 continue;
             } else {
                 // $roleArr[$role->role_id] = $role->name;
@@ -212,7 +212,7 @@ 
             }
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('admin.userEdit', [
             'roles' => $roleArr,
             'user'  => $user->makeVisible(['user_id', 'username']),

Braces +11 added lines, -6 removed lines

@@ -168,8 +168,7 @@ 
         switch($type)
         {
             case 'active':
-                $userList = new UserCollection(User::where('active', 1)->with(['UserLogins' => function($query)
-                {
+                $userList = new UserCollection(User::where('active', 1)->with(['UserLogins' => function($query) {
                     $query->latest()->limit(1);
                 }])->get()->makeVisible('user_id'));
                 $route    = 'admin.user.edit';
@@ -198,12 +197,18 @@ 
         $user  = new UserResource(User::find($id));
 
         $roleArr = [];
-        foreach ($roles as $role) {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
+        foreach ($roles as $role)
+        {
+            if ($role->role_id == 1 && Auth::user()->role_id != 1)
+            {
                 continue;
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
+            }
+            else if ($role->role_id == 2 && Auth::user()->role_id > 1)
+            {
                 continue;
-            } else {
+            }
+            else
+            {
                 // $roleArr[$role->role_id] = $role->name;
                 $roleArr[] = [
                     'value' => $role->role_id,