View GitHub Repository Tech_Bench

Schedule Inspection
Subscribe
Passed
Push — dev5 ( 113ec3...0d97ef )
by Ron
19:22
created
Status
Category
Toggle Patches
app/Policies/GatePolicy.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -37,13 +37,13 @@  discard block
 
 block discarded – undo
37 37 
     //  Determine if a user can see the Administration Nav Link
38 38 
     public function seeAdminLink(User $user)
39 39 
     {
40 
-        if ($this->isInstaller($user))
40 
+        if($this->isInstaller($user))
41 41 
         {
42 42 
             return true;
43 43 
         }
44 44
45 45 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
46 
-            ->whereHas('UserRolePermissionTypes', function ($query) {
46 
+            ->whereHas('UserRolePermissionTypes', function($query) {
47 47 
                 $query->where('description', 'Manage Users')
48 48 
                     ->orWhere('description', 'Manage User Roles')
49 49 
                     ->orWhere('description', 'Manage Customers')
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
             ->get();
55 55
56 56 
         $allow = $data->isEmpty() ? 'Denied' : 'Allowed';
57 
-        Log::debug('User ' . $user->full_name . ' is trying to access admin link.  Result - ' . $allow);
57 
+        Log::debug('User '.$user->full_name.' is trying to access admin link.  Result - '.$allow);
58 58
59 59 
         return  $data->isEmpty() ? false : true;
60 60 
     }
 
@@ -69,7 +69,7 @@  discard block
 
 block discarded – undo
69 69 
         }
70 70
71 71 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
72 
-            ->whereHas('UserRolePermissionTypes', function ($query) use ($task) {
72 
+            ->whereHas('UserRolePermissionTypes', function($query) use ($task) {
73 73 
                 $query->where('description', $task);
74 74 
             })
75 75 
             ->where('role_id', $user->role_id)
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
             ->get();
78 78
79 79 
         $allow = $data->isEmpty() ? 'false' : 'true';
80 
-        Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - ' . $allow);
80 
+        Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - '.$allow);
81 81
82 82 
         return  $data->isEmpty() ? false : true;
83 83 
     }
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/AdminController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,7 @@  discard block
 
 block discarded – undo
26 26 
     //  Admin landing page
27 27 
     public function index()
28 28 
     {
29 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
29 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
30 30 
         return view('admin.index');
31 31 
     }
32 32 
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
                             ->makeVisible('user_id')
46 46 
                     );
47 47
48 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
48 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
49 49 
         return view('admin.userLinks', [
50 50 
             'links' => $userLinks,
51 51 
         ]);
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
     {
57 57 
         $user = User::find($id);
58 58
59 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
59 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
60 60 
         Log::debug('User Link Data:', $user->toArray());
61 61 
         return view('admin.linkDetails', [
62 62 
             'user' => $user,
 
@@ -67,7 +67,7 @@  discard block
 
 block discarded – undo
67 67 
     public function passwordPolicy()
68 68 
     {
69 69 
         $this->authorize('hasAccess', 'Manage Users');
70 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
70 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
71 71 
         return view('admin.userSecurity', [
72 72 
             'passExpire' => config('auth.passwords.settings.expire'),
73 73 
         ]);
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
     //  Submit the form to change the user password policy
77 77 
     public function submitPolicy(Request $request)
78 78 
     {
79 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
79 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
80 80 
         $this->authorize('hasAccess', 'Manage Users');
81 81
82 82 
         $request->validate([
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
         Log::notice('User '.Auth::user()->full_name.' updated User Password Policy');
91 91
92 92 
         //  If the setting is changing from never to xx days, update all users
93 
-        if ($request->passExpire == 0) {
93 
+        if($request->passExpire == 0) {
94 94 
             User::whereNotNull('password_expires')->update([
95 95 
                 'password_expires' => null
96 96 
             ]);
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
     public function roleSettings()
111 111 
     {
112 112 
         $this->authorize('hasAccess', 'Manage User Roles');
113 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
113 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
114 114 
         $roles = UserRoleType::with(['UserRolePermissions' => function($query)
115 115 
         {
116 116 
             $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id');
 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127
128 128 
     public function submitRoleSettings(Request $request)
129 129 
     {
130 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data: ', $request->toArray());
130 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data: ', $request->toArray());
131 131 
         $this->authorize('hasAccess', 'Manage User Roles');
132 132
133 133 
         $request->validate([
 
@@ -165,7 +165,7 @@  discard block
 
 block discarded – undo
165 165 
             'name'        => $request->name,
166 166 
             'description' => $request->description,
167 167 
         ]);
168 
-        foreach ($request->permissions as $perm)
168 
+        foreach($request->permissions as $perm)
169 169 
         {
170 170 
             UserRolePermissions::create([
171 171 
                 'role_id'      => $role->role_id,
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/UserController.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -25,7 +25,7 @@  discard block
 
 block discarded – undo
25 25 
     public function __construct()
26 26 
     {
27 27 
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
28 
-        $this->middleware(function ($request, $next) {
28 
+        $this->middleware(function($request, $next) {
29 29 
             $this->authorize('hasAccess', 'Manage Users');
30 30 
             return $next($request);
31 31 
         });
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37 
         $userList = User::with('LastUserLogin')->get()->makeVisible('user_id');
38 38 
         $route    = 'admin.user.edit';
39 39
40 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
40 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
41 41 
         Log::debug('User list:', $userList->toArray());
42 42 
         return view('admin.userIndex', [
43 43 
             'userList' => $userList,
 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
     //  Check if a username is in use
49 49 
     public function checkUser($username, $type)
50 50 
     {
51 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
51 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
52 52 
         $user = User::where($type, $username)->first();
53 53
54 54 
         if(!$user)
 
@@ -91,7 +91,7 @@  discard block
 
 block discarded – undo
91 91 
             }
92 92 
         }
93 93
94 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
94 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
95 95 
         Log::debug('Role data: ', $roleArr);
96 96 
         return view('admin.newUser', [
97 97 
             'roles' => $roleArr
 
@@ -101,7 +101,7 @@  discard block
 
 block discarded – undo
101 101 
     //  Submit the Add User form
102 102 
     public function store(Request $request)
103 103 
     {
104 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
104 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
105 105 
         //  Validate the new user form
106 106 
         $request->validate([
107 107 
             'role'       => 'required|numeric|exists:user_role_types,role_id',
 
@@ -145,7 +145,7 @@  discard block
 
 block discarded – undo
145 145 
     //  List all inactive users
146 146 
     public function show($type)
147 147 
     {
148 
-        $route    = '';
148 
+        $route = '';
149 149
150 150 
         if($type !== 'inactive')
151 151 
         {
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
                 ->makeVisible('user_id'));
157 157 
                 // dd($userList);
158 158
159 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
159 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
160 160
161 161 
         return view('admin.userDeleted', [
162 162 
             'userList' => $userList,
 
@@ -171,10 +171,10 @@  discard block
 
 block discarded – undo
171 171 
         $roles = UserRoleType::all();
172 172 
         $user  = new UserResource(User::findOrFail($id));
173 173
174 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
174 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
175 175
176 176 
         //  Make sure that the user is not trying to edit someone with more permissions
177 
-        if ($user->role_id < Auth::user()->role_id)
177 
+        if($user->role_id < Auth::user()->role_id)
178 178 
         {
179 179 
             Log::notice('User '.Auth::user()->full_name.' tried to update a user that has more permissions than they do.  This request was denied.');
180 180 
             return abort(403);
 
@@ -182,10 +182,10 @@  discard block
 
 block discarded – undo
182 182
183 183 
         //  Good to go - get role information
184 184 
         $roleArr = [];
185 
-        foreach ($roles as $role) {
186 
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
185 
+        foreach($roles as $role) {
186 
+            if($role->role_id == 1 && Auth::user()->role_id != 1) {
187 187 
                 continue;
188 
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
188 
+            } else if($role->role_id == 2 && Auth::user()->role_id > 1) {
189 189 
                 continue;
190 190 
             } else {
191 191 
                 // $roleArr[$role->role_id] = $role->name;
 
@@ -208,7 +208,7 @@  discard block
 
 block discarded – undo
208 208 
     //  Reactivate a disabled user
209 209 
     public function reactivateUser($id)
210 210 
     {
211 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
211 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
212 212 
         User::withTrashed()->where('user_id', $id)->restore();
213 213
214 214 
         Log::info('User ID '.$id.' reactivated by '.Auth::user()->full_name);
 
@@ -220,7 +220,7 @@  discard block
 
 block discarded – undo
220 220 
     //  Submit the update user form
221 221 
     public function update(Request $request, $id)
222 222 
     {
223 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
223 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
224 224 
         $request->validate([
225 225 
             'username'   => [
226 226 
                                 'required',
 
@@ -238,7 +238,7 @@  discard block
 
 block discarded – undo
238 238 
         //  Update the user data
239 239 
         $user = User::findOrFail($id);
240 240
241 
-        if ($user->role_id < Auth::user()->role_id)
241 
+        if($user->role_id < Auth::user()->role_id)
242 242 
         {
243 243 
             return abort(403);
244 244 
         }
 
@@ -260,7 +260,7 @@  discard block
 
 block discarded – undo
260 260 
     //  Submit the change password form
261 261 
     public function submitPassword(Request $request)
262 262 
     {
263 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
263 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
264 264
265 265 
         $request->validate([
266 266 
             'password' => 'required|string|min:6|confirmed',
 
@@ -279,12 +279,12 @@  discard block
 
 block discarded – undo
279 279 
         $user = User::find($request->user_id);
280 280
281 281 
         //  Verify this is a valid user ID
282 
-        if (!$user) {
282 
+        if(!$user) {
283 283 
             $success = false;
284 284 
             $reason  = 'Cannot find user with this ID';
285 285 
         }
286 286 
         //  Make sure that the user is not trying to deactivate someone with more permissions
287 
-        else if ($user->role_id < Auth::user()->role_id) {
287 
+        else if($user->role_id < Auth::user()->role_id) {
288 288 
             $success = false;
289 289 
             $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.';
290 290 
         }
 
@@ -297,10 +297,10 @@  discard block
 
 block discarded – undo
297 297 
                 'password_expires' => $nextChange
298 298 
             ]);
299 299 
             $success = true;
300 
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
300 
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
301 301 
         }
302 302
303 
-        Log::notice('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->Full_name, [
303 
+        Log::notice('User ID-'.$request->user_id.' password chagned by '.Auth::user()->Full_name, [
304 304 
             'success' => $success,
305 305 
             'reason'  => $reason,
306 306 
         ]);
 
@@ -343,7 +343,7 @@  discard block
 
 block discarded – undo
343 343 
             $reason  = 'User '.$user->full_name.' successfully deactivated.';
344 344 
         }
345 345
346 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
346 
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
347 347 
         Log::notice('User ID-'.$id.' disabled by '.Auth::user()->full_name, [
348 348 
             'success' => $success,
349 349 
             'reason'  => $reason,
Please login to merge, or discard this patch.