@@ -17,7 +17,8 @@ |
||
17 | 17 | */ |
18 | 18 | public function handle($request, Closure $next, $guard = null) |
19 | 19 | { |
20 | - if(Auth::guard($guard)->check()) { |
|
20 | + if(Auth::guard($guard)->check()) |
|
21 | + { |
|
21 | 22 | return redirect('/dashboard'); |
22 | 23 | } |
23 | 24 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | // Database primary key |
31 | 31 | protected $primaryKey = 'user_id'; |
32 | 32 | |
33 | - protected $appends = [ 'full_name' ]; |
|
33 | + protected $appends = ['full_name']; |
|
34 | 34 | |
35 | 35 | public function getFullNameAttribute() |
36 | 36 | { |
@@ -7,7 +7,7 @@ |
||
7 | 7 | class TechTips extends Model |
8 | 8 | { |
9 | 9 | protected $primaryKey = 'tip_id'; |
10 | - protected $fillable = ['user_id', 'subject', 'documentation', 'description', 'created_at']; // ToDo: Remove Created_at - future build |
|
10 | + protected $fillable = ['user_id', 'subject', 'documentation', 'description', 'created_at']; // ToDo: Remove Created_at - future build |
|
11 | 11 | |
12 | 12 | // public function user() |
13 | 13 | // { |
@@ -48,7 +48,7 @@ |
||
48 | 48 | // Verify that the upload is valid and being processed |
49 | 49 | if($receiver->isUploaded() === false) |
50 | 50 | { |
51 | - Log::error('Upload File Missing - ' . |
|
51 | + Log::error('Upload File Missing - '. |
|
52 | 52 | /** @scrutinizer ignore-type */ |
53 | 53 | $request->toArray()); |
54 | 54 | throw new UploadMissingFileException(); |
@@ -8,58 +8,58 @@ |
||
8 | 8 | /* |
9 | 9 | * Non user Routes |
10 | 10 | */ |
11 | -Route::get('/', 'Auth\LoginController@showLoginForm')->name('index'); |
|
12 | -Route::get('logout', 'Auth\LoginController@logout') ->name('logout'); |
|
11 | +Route::get('/', 'Auth\LoginController@showLoginForm')->name('index'); |
|
12 | +Route::get('logout', 'Auth\LoginController@logout') ->name('logout'); |
|
13 | 13 | Route::get('no-script', 'Controller@noScript') ->name('noscript'); |
14 | 14 | |
15 | 15 | |
16 | 16 | /* |
17 | 17 | * Download File Routes |
18 | 18 | */ |
19 | -Route::get('download/{id}/{filename}', 'DownloadController@index') ->name('download'); |
|
19 | +Route::get('download/{id}/{filename}', 'DownloadController@index') ->name('download'); |
|
20 | 20 | Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive'); |
21 | -Route::put('download-archive', 'DownloadController@archiveFiles') ->name('archiveFiles'); |
|
21 | +Route::put('download-archive', 'DownloadController@archiveFiles') ->name('archiveFiles'); |
|
22 | 22 | |
23 | 23 | |
24 | 24 | /* |
25 | 25 | * User Settings Routes |
26 | 26 | */ |
27 | -Route::get('account', 'AccountController@index') ->name('account'); |
|
28 | -Route::post('account', 'AccountController@submit') ->name('account'); |
|
29 | -Route::put('account', 'AccountController@notifications') ->name('account'); |
|
30 | -Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword'); |
|
27 | +Route::get('account', 'AccountController@index') ->name('account'); |
|
28 | +Route::post('account', 'AccountController@submit') ->name('account'); |
|
29 | +Route::put('account', 'AccountController@notifications') ->name('account'); |
|
30 | +Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword'); |
|
31 | 31 | Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword'); |
32 | 32 | |
33 | 33 | /* |
34 | 34 | * Basic Logged In Routes |
35 | 35 | */ |
36 | -Route::get('about', 'DashboardController@about')->name('about'); |
|
36 | +Route::get('about', 'DashboardController@about')->name('about'); |
|
37 | 37 | Route::get('dashboard', 'DashboardController@index')->name('dashboard'); |
38 | 38 | |
39 | 39 | /* |
40 | 40 | * File Link Routes |
41 | 41 | */ |
42 | -Route::prefix('links')->name('links.')->group(function () { |
|
42 | +Route::prefix('links')->name('links.')->group(function() { |
|
43 | 43 | // Resource controllers for base access |
44 | - Route::resource('data', 'FileLinks\FileLinksController'); |
|
45 | - Route::get('new', 'FileLinks\FileLinksController@create') ->name('new'); |
|
46 | - Route::get('find/{id}', 'FileLinks\FileLinksController@find') ->name('user'); |
|
44 | + Route::resource('data', 'FileLinks\FileLinksController'); |
|
45 | + Route::get('new', 'FileLinks\FileLinksController@create') ->name('new'); |
|
46 | + Route::get('find/{id}', 'FileLinks\FileLinksController@find') ->name('user'); |
|
47 | 47 | Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details') ->name('details'); |
48 | - Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable'); |
|
48 | + Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable'); |
|
49 | 49 | // File Link Files |
50 | - Route::resource('files', 'FileLinks\LinkFilesController'); |
|
50 | + Route::resource('files', 'FileLinks\LinkFilesController'); |
|
51 | 51 | // Index landing page |
52 | - Route::get('/', 'FileLinks\FileLinksController@index') ->name('index'); |
|
52 | + Route::get('/', 'FileLinks\FileLinksController@index') ->name('index'); |
|
53 | 53 | }); |
54 | 54 | |
55 | 55 | /* |
56 | 56 | * Guest File Link Routes |
57 | 57 | */ |
58 | 58 | Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles'); |
59 | -Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify') ->name('file-links.show'); |
|
60 | -Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update') ->name('file-links.show'); |
|
61 | -Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show') ->name('file-links.show'); |
|
62 | -Route::get('file-links', 'FileLinks\GuestLinksController@index') ->name('file-links.index'); |
|
59 | +Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify') ->name('file-links.show'); |
|
60 | +Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update') ->name('file-links.show'); |
|
61 | +Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show') ->name('file-links.show'); |
|
62 | +Route::get('file-links', 'FileLinks\GuestLinksController@index') ->name('file-links.index'); |
|
63 | 63 | |
64 | 64 | |
65 | 65 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $id = Auth::user()->user_id; |
57 | 57 | } |
58 | 58 | // If the user is trying to pull someone elses links, they must be able to manage users |
59 | - else if ($id != Auth::user()->user_id) |
|
59 | + else if($id != Auth::user()->user_id) |
|
60 | 60 | { |
61 | 61 | $this->authorize('hasAccess', 'manage_users'); |
62 | 62 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | // Verify that the upload is valid and being processed |
95 | 95 | if($receiver->isUploaded() === false) |
96 | 96 | { |
97 | - Log::error('Upload File Missing - ' . |
|
97 | + Log::error('Upload File Missing - '. |
|
98 | 98 | /** @scrutinizer ignore-type */ |
99 | 99 | $request->toArray()); |
100 | 100 | throw new UploadMissingFileException(); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | if($files == 0 && $details->allow_upload === 'No') |
54 | 54 | { |
55 | - Log::warning('Visitor ' . \Request::ip() . ' visited a link that they cannot do anything with. Hash - ' . $id); |
|
55 | + Log::warning('Visitor '.\Request::ip().' visited a link that they cannot do anything with. Hash - '.$id); |
|
56 | 56 | return view('links.guestDeadLink'); |
57 | 57 | } |
58 | 58 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | // Verify that the upload is valid and being processed |
93 | 93 | if($receiver->isUploaded() === false) |
94 | 94 | { |
95 | - Log::error('Upload File Missing - ' . |
|
95 | + Log::error('Upload File Missing - '. |
|
96 | 96 | /** @scrutinizer ignore-type */ |
97 | 97 | $request->toArray()); |
98 | 98 | throw new UploadMissingFileException(); |
@@ -49,12 +49,12 @@ |
||
49 | 49 | // Search the name, dba name, and cust id columns |
50 | 50 | ->where(function($query) use ($request) |
51 | 51 | { |
52 | - $query->where('name', 'like', '%' . $request->name . '%') |
|
53 | - ->orWhere('cust_id', 'like', '%' . $request->name . '%') |
|
54 | - ->orWhere('dba_name', 'like', '%' . $request->name . '%'); |
|
52 | + $query->where('name', 'like', '%'.$request->name.'%') |
|
53 | + ->orWhere('cust_id', 'like', '%'.$request->name.'%') |
|
54 | + ->orWhere('dba_name', 'like', '%'.$request->name.'%'); |
|
55 | 55 | }) |
56 | 56 | // Search the city column |
57 | - ->where('city', 'like', '%' . $request->city . '%') |
|
57 | + ->where('city', 'like', '%'.$request->city.'%') |
|
58 | 58 | // Include the customers systems |
59 | 59 | ->with('CustomerSystems.SystemTypes') |
60 | 60 | // If the system field is present - search for system type |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | $searchResults = new CustomersCollection( |
48 | 48 | Customers::orderBy($request->sortField, $request->sortType) |
49 | 49 | // Search the name, dba name, and cust id columns |
50 | - ->where(function($query) use ($request) |
|
51 | - { |
|
50 | + ->where(function($query) use ($request) { |
|
52 | 51 | $query->where('name', 'like', '%' . $request->name . '%') |
53 | 52 | ->orWhere('cust_id', 'like', '%' . $request->name . '%') |
54 | 53 | ->orWhere('dba_name', 'like', '%' . $request->name . '%'); |
@@ -58,10 +57,8 @@ discard block |
||
58 | 57 | // Include the customers systems |
59 | 58 | ->with('CustomerSystems.SystemTypes') |
60 | 59 | // If the system field is present - search for system type |
61 | - ->when($request->system, function($query) use ($request) |
|
62 | - { |
|
63 | - $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) |
|
64 | - { |
|
60 | + ->when($request->system, function($query) use ($request) { |
|
61 | + $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) { |
|
65 | 62 | $query->where('sys_id', $request->system); |
66 | 63 | }); |
67 | 64 | }) |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\Customers; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(Customers::class, function (Faker $faker) { |
|
8 | +$factory->define(Customers::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | // |
11 | 11 | 'cust_id' => $faker->unique()->numberBetween(50, 10000), |