butcherman / Tech_Bench

app/Http/Controllers/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
     //  Display all file links
     public function userLinks()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $userLinks = new UserCollection(
             User::withCount([
@@ -94,7 +94,7 @@ 
         Log::notice('User '.Auth::user()->full_name.' updated User Password Policy requiring resets every '.$request->passExpire.' days');
 
         //  If the setting is changing from never to xx days, update all users
-        if ($request->passExpire == 0)
+        if($request->passExpire == 0)
         {
             User::whereNotNull('password_expires')->update([
                 'password_expires' => null
@@ -116,7 +116,7 @@ 
     //  View the current roles that can be assigned to users
     public function roleSettings()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         $this->authorize('hasAccess', 'Manage User Roles');
 
         $roles = UserRoleType::with(['UserRolePermissions' => function($query) {

app/Http/Controllers/Admin/UserController.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
     //  Show the list of current users to edit
     public function index()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $userList = User::with('LastUserLogin')->get()->makeVisible('user_id');
         $route    = 'admin.user.edit';
@@ -71,7 +71,7 @@ 
     //  Show the Add User form
     public function create()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $roles = UserRoleType::all();
         $roleArr = [];
@@ -154,7 +154,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         $route = '';
 
         if($type !== 'inactive')
@@ -177,10 +177,10 @@ 
     //  Reactivate a disabled user
     public function reactivateUser($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         User::withTrashed()->where('user_id', $id)->restore();
 
-        Log::notice('User ID ' . $id . ' reactivated by ' . Auth::user()->full_name);
+        Log::notice('User ID '.$id.' reactivated by '.Auth::user()->full_name);
         return response()->json([
             'success' => true,
         ]);
@@ -189,13 +189,13 @@ 
     //  Open the edit user form
     public function edit($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $roles = UserRoleType::all();
         $user  = new UserResource(User::findOrFail($id));
 
         //  Make sure that the user is not trying to edit someone with more permissions
-        if(($user->role_id == 1 || $user->role_id == 2) && Auth::user()->role_id <=2)
+        if(($user->role_id == 1 || $user->role_id == 2) && Auth::user()->role_id <= 2)
         {
             Log::warning('User '.Auth::user()->full_name.' tried to update user ID '.$id.' that has more permissions than they do.  This request was denied.');
             return abort(403);
@@ -205,13 +205,13 @@ 
 
         //  Good to go - get role information
         $roleArr = [];
-        foreach ($roles as $role)
+        foreach($roles as $role)
         {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1)
+            if($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
             }
-            else if ($role->role_id == 2 && Auth::user()->role_id > 2)
+            else if($role->role_id == 2 && Auth::user()->role_id > 2)
             {
                 continue;
             }
@@ -257,7 +257,7 @@ 
         $user = User::findOrFail($id);
         if($user->role_id < Auth::user()->role_id)
         {
-            Log::warning('User ' . Auth::user()->full_name . ' tried to update user ID ' . $id . ' that has more permissions than they do.  This request was denied.');
+            Log::warning('User '.Auth::user()->full_name.' tried to update user ID '.$id.' that has more permissions than they do.  This request was denied.');
             return abort(403);
         }
 
@@ -297,13 +297,13 @@ 
         $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.';
@@ -335,7 +335,7 @@ 
     //  Disable the user
     public function destroy($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $user = User::find($id);