butcherman / Tech_Bench

database/seeds/UserTableSeeder.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
     public function run()
     {
         //  Create the test users - note, none are installers - permissions are assigned randomly
-        factory(App\User::class, 15)->create()->each(function($user)
-        {
+        factory(App\User::class, 15)->create()->each(function($user) {
             // $user->UserPermissions()->save(factory(App\UserPermissions::class)->create(['user_id' => $user->user_id]));
         });
     }

app/Http/Controllers/Admin/UserController.php

Braces +18 added lines, -9 removed lines

@@ -191,19 +191,25 @@ 
         $user  = new UserResource(User::findOrFail($id));
 
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        if ($user->role_id < Auth::user()->role_id) 
+        if ($user->role_id < Auth::user()->role_id)
         {
             return abort(403);
         }
 
         //  Good to go - update user password
         $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,
@@ -239,7 +245,7 @@ 
         //  Update the user data
         $user = User::findOrFail($id);
 
-        if ($user->role_id < Auth::user()->role_id) 
+        if ($user->role_id < Auth::user()->role_id)
         {
             return abort(403);
         }
@@ -282,17 +288,20 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user) {
+        if (!$user)
+        {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id) {
+        else if ($user->role_id < Auth::user()->role_id)
+        {
             $success = false;
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
         }
         //  Good to go - update user password
-        else {
+        else
+        {
             //  Update the user data
             $user->update(
             [

Spacing +16 added lines, -16 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);
         });
@@ -41,12 +41,12 @@ 
     //  Show the list of current users to edit
     public function index()
     {
-        $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()
             /** @scrutinizer ignore-call */
             ->makeVisible('user_id'));
-        $route    = 'admin.user.edit';
+        $route = 'admin.user.edit';
 
         return view('admin.userIndex', [
             'userList' => $userList,
@@ -109,7 +109,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',
@@ -187,17 +187,17 @@ 
         $user  = new UserResource(User::findOrFail($id));
 
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        if ($user->role_id < Auth::user()->role_id) 
+        if($user->role_id < Auth::user()->role_id) 
         {
             return abort(403);
         }
 
         //  Good to go - update user password
         $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;
@@ -208,7 +208,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']),
@@ -235,7 +235,7 @@ 
         //  Update the user data
         $user = User::findOrFail($id);
 
-        if ($user->role_id < Auth::user()->role_id) 
+        if($user->role_id < Auth::user()->role_id) 
         {
             return abort(403);
         }
@@ -278,12 +278,12 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user) {
+        if(!$user) {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id) {
+        else if($user->role_id < Auth::user()->role_id) {
             $success = false;
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
         }
@@ -296,11 +296,11 @@ 
                 'password_expires' => $nextChange
             ]);
             $success = true;
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::notice('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->user_id, [
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::notice('User ID-'.$request->user_id.' password chagned by '.Auth::user()->user_id, [
             'success' => $success,
             'reason'  => $reason,
         ]);

app/Http/Controllers/Admin/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     //  Show the links for the selected user
     public function showLinks($id)
     {
-        $user     = User::find($id);
+        $user = User::find($id);
 
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('admin.linkDetails', [

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
                         User::where('active', 1)
                             ->withCount([
                                 'FileLinks',
-                                'FileLinks as expired_file_links_count' => function($query)
-                                {
+                                'FileLinks as expired_file_links_count' => function($query) {
                                     $query->where('expire', '<', Carbon::now());
                                 }
                             ])