@@ -25,14 +25,14 @@ |
||
| 25 | 25 | public function boot() |
| 26 | 26 | { |
| 27 | 27 | // Service provider to customize form inputs |
| 28 | - Form::component('bsText', 'components.form.text', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 28 | + Form::component('bsText', 'components.form.text', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 29 | 29 | Form::component('bsPassword', 'components.form.password', ['name', 'label', 'value' => null, 'attributes' => []]); |
| 30 | - Form::component('bsNumber', 'components.form.number', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 31 | - Form::component('bsEmail', 'components.form.email', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 32 | - Form::component('bsDate', 'components.form.date', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 30 | + Form::component('bsNumber', 'components.form.number', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 31 | + Form::component('bsEmail', 'components.form.email', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 32 | + Form::component('bsDate', 'components.form.date', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
| 33 | 33 | Form::component('bsTextarea', 'components.form.textarea', ['name', 'label', 'value' => null, 'attributes' => []]); |
| 34 | 34 | Form::component('bsCheckbox', 'components.form.checkbox', ['name', 'label', 'value' => 'on', 'checked' => false, 'attributes' => []]); |
| 35 | - Form::component('bsSelect', 'components.form.select', ['name', 'label', 'list', 'selected' => null, 'attributes' => []]); |
|
| 35 | + Form::component('bsSelect', 'components.form.select', ['name', 'label', 'list', 'selected' => null, 'attributes' => []]); |
|
| 36 | 36 | // Custom Submit button |
| 37 | 37 | Form::component('bsSubmit', 'components.form.submit', ['name']); |
| 38 | 38 | // List of all states in a dropdown box |
@@ -37,13 +37,13 @@ discard block |
||
| 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 |
||
| 54 | 54 | ->get(); |
| 55 | 55 | |
| 56 | 56 | $allow = $data->isEmpty() ? 'Denied' : 'Allowed'; |
| 57 | - Log::debug('User ' . $user->full_name . ' is trying to see admin link. Result - ' . $allow); |
|
| 57 | + Log::debug('User '.$user->full_name.' is trying to see admin link. Result - '.$allow); |
|
| 58 | 58 | |
| 59 | 59 | return $data->isEmpty() ? false : true; |
| 60 | 60 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 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,10 +77,10 @@ discard block |
||
| 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); |
|
| 81 | - if ($allow === 'Denied') |
|
| 80 | + Log::debug('User '.$user->full_name.' is trying to access '.$task.'. Result - '.$allow); |
|
| 81 | + if($allow === 'Denied') |
|
| 82 | 82 | { |
| 83 | - Log::alert('User ' . $user->full_name . ' was denied from accessing '.$task.' link.'); |
|
| 83 | + Log::alert('User '.$user->full_name.' was denied from accessing '.$task.' link.'); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | return $data->isEmpty() ? false : true; |
@@ -22,7 +22,8 @@ discard block |
||
| 22 | 22 | $this->line(''); |
| 23 | 23 | // Select which update file to use |
| 24 | 24 | $updateFile = $this->checkForUpdate(); |
| 25 | - if($updateFile) { |
|
| 25 | + if($updateFile) |
|
| 26 | + { |
|
| 26 | 27 | // Open up the file and verify it is at least the same version as the current setup |
| 27 | 28 | $valid = $this->openUpdate($updateFile); |
| 28 | 29 | |
@@ -80,7 +81,8 @@ discard block |
||
| 80 | 81 | $this->line(''); |
| 81 | 82 | |
| 82 | 83 | $anticipate = []; |
| 83 | - foreach($updateList as $key => $up) { |
|
| 84 | + foreach($updateList as $key => $up) |
|
| 85 | + { |
|
| 84 | 86 | $opt = $key + 1; |
| 85 | 87 | $anticipate[$opt] = $up; |
| 86 | 88 | $this->line('['.$opt.'] '.$up); |
@@ -25,7 +25,8 @@ discard block |
||
| 25 | 25 | // Validate the hash token |
| 26 | 26 | $user = UserInitialize::where('token', $hash)->get(); |
| 27 | 27 | |
| 28 | - if($user->isEmpty()) { |
|
| 28 | + if($user->isEmpty()) |
|
| 29 | + { |
|
| 29 | 30 | Log::warning('Visitor at IP Address '.\Request::ip().' tried to access invalid initialize hash - '.$hash); |
| 30 | 31 | return abort(404); |
| 31 | 32 | } |
@@ -43,7 +44,8 @@ discard block |
||
| 43 | 44 | |
| 44 | 45 | // Verify that the link matches the assigned email address |
| 45 | 46 | $valid = UserInitialize::where('token', $hash)->first(); |
| 46 | - if(empty($valid)) { |
|
| 47 | + if(empty($valid)) |
|
| 48 | + { |
|
| 47 | 49 | Log::warning('Visitor at IP Address '.\Request::ip().' tried to submit an invalid User Initialization link - '.$hash); |
| 48 | 50 | return abort(404); |
| 49 | 51 | } |
@@ -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); |