@@ -53,14 +53,17 @@ discard block |
||
53 | 53 | Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
54 | 54 | |
55 | 55 | // See if there are any search paramaters entered |
56 | - if(!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) { |
|
56 | + if(!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) |
|
57 | + { |
|
57 | 58 | // No search paramaters, send all tech tips |
58 | 59 | $tips = new TechTipsCollection( |
59 | 60 | TechTips::orderBy('created_at', 'DESC') |
60 | 61 | ->with('SystemTypes') |
61 | 62 | ->paginate($request->pagination['perPage']) |
62 | 63 | ); |
63 | - } else { |
|
64 | + } |
|
65 | + else |
|
66 | + { |
|
64 | 67 | $article = isset($request->search['articleType']) ? true : false; |
65 | 68 | $system = isset($request->search['systemType']) ? true : false; |
66 | 69 | // Search paramaters, filter results |
@@ -151,7 +154,8 @@ discard block |
||
151 | 154 | $save = $receiver->receive(); |
152 | 155 | |
153 | 156 | // See if the uploade has finished |
154 | - if($save->isFinished()) { |
|
157 | + if($save->isFinished()) |
|
158 | + { |
|
155 | 159 | $this->saveFile($save->getFile()); |
156 | 160 | |
157 | 161 | return 'uploaded successfully'; |
@@ -266,7 +270,8 @@ discard block |
||
266 | 270 | // Details controller - will move to the show controller with just the tech tip id |
267 | 271 | public function details($id, $subject) |
268 | 272 | { |
269 | - if(session()->has('newTipFile')) { |
|
273 | + if(session()->has('newTipFile')) |
|
274 | + { |
|
270 | 275 | session()->forget('newTipFile'); |
271 | 276 | } |
272 | 277 | |
@@ -300,7 +305,8 @@ discard block |
||
300 | 305 | { |
301 | 306 | Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
302 | 307 | |
303 | - switch($action) { |
|
308 | + switch($action) |
|
309 | + { |
|
304 | 310 | case 'add': |
305 | 311 | TechTipFavs::create([ |
306 | 312 | 'user_id' => Auth::user()->user_id, |
@@ -329,7 +335,8 @@ discard block |
||
329 | 335 | $this->authorize('hasAccess', 'Edit Tech Tip'); |
330 | 336 | $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->with('TechTipTypes')->first(); |
331 | 337 | |
332 | - if(!$tipData) { |
|
338 | + if(!$tipData) |
|
339 | + { |
|
333 | 340 | return view('tips.tipNotFound'); |
334 | 341 | } |
335 | 342 | |
@@ -362,7 +369,8 @@ discard block |
||
362 | 369 | $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request)); |
363 | 370 | |
364 | 371 | // Verify if there is a file to be processed or not |
365 | - if($receiver->isUploaded() === false || $request->_completed) { |
|
372 | + if($receiver->isUploaded() === false || $request->_completed) |
|
373 | + { |
|
366 | 374 | $this->storeUpdatedTip($request, $id); |
367 | 375 | Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id); |
368 | 376 | return response()->json(['tip_id' => $id]); |
@@ -372,7 +380,8 @@ discard block |
||
372 | 380 | $save = $receiver->receive(); |
373 | 381 | |
374 | 382 | // See if the uploade has finished |
375 | - if($save->isFinished()) { |
|
383 | + if($save->isFinished()) |
|
384 | + { |
|
376 | 385 | $this->saveFile($save->getFile(), $id); |
377 | 386 | |
378 | 387 | return 'uploaded successfully'; |
@@ -41,7 +41,8 @@ discard block |
||
41 | 41 | ]; |
42 | 42 | } |
43 | 43 | $mods = Module::allDisabled(); |
44 | - foreach($mods as $name => $mod) { |
|
44 | + foreach($mods as $name => $mod) |
|
45 | + { |
|
45 | 46 | $moduleList[] = [ |
46 | 47 | 'name' => $name, |
47 | 48 | 'status' => 'Disabled', |
@@ -78,7 +79,8 @@ discard block |
||
78 | 79 | $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request)); |
79 | 80 | |
80 | 81 | // Verify that the upload is valid and being processed |
81 | - if($receiver->isUploaded() === false) { |
|
82 | + if($receiver->isUploaded() === false) |
|
83 | + { |
|
82 | 84 | Log::error('Upload File Missing - '. |
83 | 85 | /** @scrutinizer ignore-type */ |
84 | 86 | $request->toArray()); |
@@ -89,7 +91,8 @@ discard block |
||
89 | 91 | $save = $receiver->receive(); |
90 | 92 | |
91 | 93 | // See if the uploade has finished |
92 | - if($save->isFinished()) { |
|
94 | + if($save->isFinished()) |
|
95 | + { |
|
93 | 96 | $this->saveFile($save->getFile()); |
94 | 97 | |
95 | 98 | return 'uploaded successfully'; |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | ]); |
81 | 81 | |
82 | 82 | // Update the site timezone |
83 | - if (config('app.timezone') !== $request->timezone) |
|
83 | + if(config('app.timezone') !== $request->timezone) |
|
84 | 84 | { |
85 | 85 | Settings::firstOrCreate( |
86 | 86 | ['key' => 'app.timezone'], |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | )->update(['value' => $request->timezone]); |
89 | 89 | } |
90 | 90 | // Update the maximum file upload size |
91 | - if (config('filesystems.paths.max_size') !== $request->filesize) |
|
91 | + if(config('filesystems.paths.max_size') !== $request->filesize) |
|
92 | 92 | { |
93 | 93 | Settings::firstOrCreate( |
94 | 94 | ['key' => 'filesystems.paths.max_size'], |
@@ -211,7 +211,8 @@ |
||
211 | 211 | public function destroy($id) |
212 | 212 | { |
213 | 213 | // |
214 | - try { |
|
214 | + try |
|
215 | + { |
|
215 | 216 | SystemTypes::find($id)->delete(); |
216 | 217 | return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']); |
217 | 218 | } |
@@ -59,9 +59,12 @@ discard block |
||
59 | 59 | public function archiveFiles(Request $request) |
60 | 60 | { |
61 | 61 | // Debug Data |
62 | - if(Auth::user()) { |
|
62 | + if(Auth::user()) |
|
63 | + { |
|
63 | 64 | $user = Auth::user()->full_name; |
64 | - } else { |
|
65 | + } |
|
66 | + else |
|
67 | + { |
|
65 | 68 | $user = \Request::ip(); |
66 | 69 | } |
67 | 70 | Log::debug('Route '.Route::currentRouteName().' visited by '.$user.' Request Data:', $request->toArray()); |
@@ -107,9 +110,12 @@ discard block |
||
107 | 110 | public function downloadArchive($fileName) |
108 | 111 | { |
109 | 112 | // Debug Data |
110 | - if(Auth::user()) { |
|
113 | + if(Auth::user()) |
|
114 | + { |
|
111 | 115 | $user = Auth::user()->full_name; |
112 | - } else { |
|
116 | + } |
|
117 | + else |
|
118 | + { |
|
113 | 119 | $user = \Request::ip(); |
114 | 120 | } |
115 | 121 | Log::debug('Route '.Route::currentRouteName().' visited by '.$user); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | Log::notice('User '.Auth::user()->full_name.' updated User Password Policy'); |
90 | 90 | |
91 | 91 | // If the setting is changing from never to xx days, update all users |
92 | - if ($request->passExpire == 0) |
|
92 | + if($request->passExpire == 0) |
|
93 | 93 | { |
94 | 94 | User::whereNotNull('password_expires')->update([ |
95 | 95 | 'password_expires' => null |
@@ -110,7 +110,7 @@ discard block |
||
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 | $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id'); |
116 | 116 | }])->get(); |
@@ -182,13 +182,13 @@ discard block |
||
182 | 182 | |
183 | 183 | // Good to go - get role information |
184 | 184 | $roleArr = []; |
185 | - foreach ($roles as $role) |
|
185 | + foreach($roles as $role) |
|
186 | 186 | { |
187 | - if ($role->role_id == 1 && Auth::user()->role_id != 1) |
|
187 | + if($role->role_id == 1 && Auth::user()->role_id != 1) |
|
188 | 188 | { |
189 | 189 | continue; |
190 | 190 | } |
191 | - else if ($role->role_id == 2 && Auth::user()->role_id > 1) |
|
191 | + else if($role->role_id == 2 && Auth::user()->role_id > 1) |
|
192 | 192 | { |
193 | 193 | continue; |
194 | 194 | } |
@@ -285,13 +285,13 @@ discard block |
||
285 | 285 | $user = User::find($request->user_id); |
286 | 286 | |
287 | 287 | // Verify this is a valid user ID |
288 | - if (!$user) |
|
288 | + if(!$user) |
|
289 | 289 | { |
290 | 290 | $success = false; |
291 | 291 | $reason = 'Cannot find user with this ID'; |
292 | 292 | } |
293 | 293 | // Make sure that the user is not trying to deactivate someone with more permissions |
294 | - else if ($user->role_id < Auth::user()->role_id) |
|
294 | + else if($user->role_id < Auth::user()->role_id) |
|
295 | 295 | { |
296 | 296 | $success = false; |
297 | 297 | $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.'; |