@@ -123,7 +123,7 @@ |
||
123 | 123 | |
124 | 124 | |
125 | 125 | |
126 | - ///////////////////////////////////////////////////////////////////////////////////////////////// |
|
126 | + ///////////////////////////////////////////////////////////////////////////////////////////////// |
|
127 | 127 | |
128 | 128 | |
129 | 129 |
@@ -54,15 +54,13 @@ discard block |
||
54 | 54 | * Logged in user routes |
55 | 55 | * |
56 | 56 | */ |
57 | -Route::middleware(['password_expired'])->group(function() |
|
58 | -{ |
|
57 | +Route::middleware(['password_expired'])->group(function() { |
|
59 | 58 | /* |
60 | 59 | * |
61 | 60 | * Routes for users with "tech" permissions |
62 | 61 | * |
63 | 62 | */ |
64 | - Route::group(['middleware' => 'roles', 'roles' => ['tech', 'report', 'admin', 'installer']], function() |
|
65 | - { |
|
63 | + Route::group(['middleware' => 'roles', 'roles' => ['tech', 'report', 'admin', 'installer']], function() { |
|
66 | 64 | /* |
67 | 65 | * |
68 | 66 | * Dashboard and About page routes |
@@ -86,8 +84,7 @@ discard block |
||
86 | 84 | * File Link Routes |
87 | 85 | * |
88 | 86 | */ |
89 | - Route::prefix('links')->name('links.')->group(function() |
|
90 | - { |
|
87 | + Route::prefix('links')->name('links.')->group(function() { |
|
91 | 88 | // Resource controllers for base access |
92 | 89 | Route::resource('data', 'FileLinks\FileLinksController'); |
93 | 90 | Route::get('find/{id}', 'FileLinks\FileLinksController@find')->name('user'); |
@@ -115,8 +112,7 @@ discard block |
||
115 | 112 | * System Routes |
116 | 113 | * |
117 | 114 | */ |
118 | - Route::prefix('system')->name('system.')->group(function() |
|
119 | - { |
|
115 | + Route::prefix('system')->name('system.')->group(function() { |
|
120 | 116 | Route::post('system-files/replace', 'Systems\SystemFilesController@replace')->name('replaceFile'); |
121 | 117 | Route::resource('system-files', 'Systems\SystemFilesController'); |
122 | 118 | Route::get('{cat}/{sys}', 'Systems\SystemsController@details')->name('details'); |
@@ -139,8 +135,7 @@ discard block |
||
139 | 135 | * Customer Routes |
140 | 136 | * |
141 | 137 | */ |
142 | - Route::prefix('customer')->name('customer.')->group(function() |
|
143 | - { |
|
138 | + Route::prefix('customer')->name('customer.')->group(function() { |
|
144 | 139 | |
145 | 140 | Route::get('search-id/{id}', 'CustomerController@searchID')->name('searchID'); |
146 | 141 | Route::get('file-types', 'CustomerFilesController@getFileTypes')->name('getFileTypes'); |
@@ -162,12 +157,10 @@ discard block |
||
162 | 157 | * Administration Routes |
163 | 158 | * |
164 | 159 | */ |
165 | - Route::group(['middleware' => 'roles', 'roles' => ['installer', 'admin']], function() |
|
166 | - { |
|
160 | + Route::group(['middleware' => 'roles', 'roles' => ['installer', 'admin']], function() { |
|
167 | 161 | |
168 | 162 | |
169 | - Route::prefix('admin')->name('admin.')->group(function() |
|
170 | - { |
|
163 | + Route::prefix('admin')->name('admin.')->group(function() { |
|
171 | 164 | // Admin User File Links routes |
172 | 165 | Route::get('links/show/{id}', 'Admin\AdminController@showLinks')->name('userLinks'); |
173 | 166 | Route::get('count-links', 'Admin\AdminController@countLinks')->name('countLinks'); |
@@ -197,10 +190,8 @@ discard block |
||
197 | 190 | * Installer Routes |
198 | 191 | * |
199 | 192 | */ |
200 | - Route::group(['middleware' => 'roles', 'roles' => ['installer']], function() |
|
201 | - { |
|
202 | - Route::prefix('installer')->name('installer.')->group(function() |
|
203 | - { |
|
193 | + Route::group(['middleware' => 'roles', 'roles' => ['installer']], function() { |
|
194 | + Route::prefix('installer')->name('installer.')->group(function() { |
|
204 | 195 | // User Settings |
205 | 196 | Route::get('user-security-settings', 'Installer\SettingsController@userSecurity')->name('userSecurity'); |
206 | 197 | Route::post('user-security-settings', 'Installer\SettingsController@submitUserSecurity')->name('userSecurity'); |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | use Faker\Generator as Faker; |
4 | 4 | |
5 | -$factory->define(App\Customers::class, function (Faker $faker) { |
|
5 | +$factory->define(App\Customers::class, function(Faker $faker) { |
|
6 | 6 | return [ |
7 | 7 | // |
8 | 8 | 'cust_id' => rand(50, 5000), |
@@ -25,12 +25,12 @@ |
||
25 | 25 | ], |
26 | 26 | 'paths' => [ |
27 | 27 | 'default' => env('DFLT_FOLDER', DIRECTORY_SEPARATOR.'default'), |
28 | - 'systems' => env('SYS_FOLDER', DIRECTORY_SEPARATOR.'systems'), |
|
28 | + 'systems' => env('SYS_FOLDER', DIRECTORY_SEPARATOR.'systems'), |
|
29 | 29 | 'customers' => env('CUST_FOLDER', DIRECTORY_SEPARATOR.'customers'), |
30 | 30 | 'users' => env('USER_FOLDER', DIRECTORY_SEPARATOR.'users'), |
31 | - 'tips' => env('TIP_FOLDER', DIRECTORY_SEPARATOR.'tips'), |
|
31 | + 'tips' => env('TIP_FOLDER', DIRECTORY_SEPARATOR.'tips'), |
|
32 | 32 | 'links' => env('LINK_FOLDER', DIRECTORY_SEPARATOR.'links'), |
33 | 33 | 'company' => env('COMP_FOLDER', DIRECTORY_SEPARATOR.'company'), |
34 | - 'max_size' => env('MAX_UPLOAD', ini_get('post_max_size')), |
|
34 | + 'max_size' => env('MAX_UPLOAD', ini_get('post_max_size')), |
|
35 | 35 | ], |
36 | 36 | ]; |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Faker\Generator as Faker; |
4 | 4 | use Illuminate\Support\Str; |
5 | 5 | |
6 | -$factory->define(App\User::class, function (Faker $faker) { |
|
6 | +$factory->define(App\User::class, function(Faker $faker) { |
|
7 | 7 | return [ |
8 | 8 | 'username' => $faker->unique()->lastName, |
9 | 9 | 'first_name' => $faker->firstName, |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Support\Str; |
4 | 4 | use Faker\Generator as Faker; |
5 | 5 | |
6 | -$factory->define(App\FileLinks::class, function (Faker $faker) { |
|
6 | +$factory->define(App\FileLinks::class, function(Faker $faker) { |
|
7 | 7 | return [ |
8 | 8 | 'user_id' => 1, |
9 | 9 | 'cust_id' => null, |
@@ -51,10 +51,10 @@ |
||
51 | 51 | |
52 | 52 | UserSettings::where('user_id', $userID)->update( |
53 | 53 | [ |
54 | - 'em_tech_tip' => $request->em_tech_tip === 'on' ? true : false, |
|
55 | - 'em_file_link' => $request->em_file_link === 'on' ? true : false, |
|
54 | + 'em_tech_tip' => $request->em_tech_tip === 'on' ? true : false, |
|
55 | + 'em_file_link' => $request->em_file_link === 'on' ? true : false, |
|
56 | 56 | 'em_notification' => $request->em_notification === 'on' ? true : false, |
57 | - 'auto_del_link' => $request->auto_del_link === 'on' ? true : false, |
|
57 | + 'auto_del_link' => $request->auto_del_link === 'on' ? true : false, |
|
58 | 58 | ]); |
59 | 59 | |
60 | 60 | Log::info('User Info Updated', ['user_id' => Auth::user()->user_id]); |
@@ -16,21 +16,21 @@ |
||
16 | 16 | */ |
17 | 17 | public function register() |
18 | 18 | { |
19 | - try |
|
20 | - { |
|
21 | - if(Schema::hasTable('settings')) |
|
22 | - { |
|
23 | - $settings = DB::table('settings')->get(); |
|
24 | - foreach($settings as $setting) |
|
25 | - { |
|
26 | - Config([$setting->key => $setting->value]); |
|
27 | - } |
|
28 | - } |
|
29 | - } |
|
30 | - catch(\Illuminate\Database\QueryException $e) |
|
31 | - { |
|
19 | + try |
|
20 | + { |
|
21 | + if(Schema::hasTable('settings')) |
|
22 | + { |
|
23 | + $settings = DB::table('settings')->get(); |
|
24 | + foreach($settings as $setting) |
|
25 | + { |
|
26 | + Config([$setting->key => $setting->value]); |
|
27 | + } |
|
28 | + } |
|
29 | + } |
|
30 | + catch(\Illuminate\Database\QueryException $e) |
|
31 | + { |
|
32 | 32 | // |
33 | - } |
|
33 | + } |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $sys1->sys_id = 1; |
18 | 18 | $sys1->cat_id = 1; |
19 | 19 | $sys1->name = 'NEC'; |
20 | - $sys1->parent_id = NULL; |
|
20 | + $sys1->parent_id = null; |
|
21 | 21 | $sys1->folder_location = 'nec'; |
22 | 22 | $sys1->save(); |
23 | 23 | |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $sys2->sys_id = 2; |
26 | 26 | $sys2->cat_id = 1; |
27 | 27 | $sys2->name = 'IPK II'; |
28 | - $sys2->parent_id = NULL; |
|
28 | + $sys2->parent_id = null; |
|
29 | 29 | $sys2->folder_location = 'nec_ipkii'; |
30 | 30 | $sys2->save(); |
31 | 31 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $sys3->sys_id = 3; |
34 | 34 | $sys3->cat_id = 1; |
35 | 35 | $sys3->name = 'SV8100'; |
36 | - $sys3->parent_id = NULL; |
|
36 | + $sys3->parent_id = null; |
|
37 | 37 | $sys3->folder_location = 'nec_sv8100'; |
38 | 38 | $sys3->save(); |
39 | 39 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $sys4->sys_id = 4; |
42 | 42 | $sys4->cat_id = 1; |
43 | 43 | $sys4->name = 'SV9100'; |
44 | - $sys4->parent_id = NULL; |
|
44 | + $sys4->parent_id = null; |
|
45 | 45 | $sys4->folder_location = 'nec_sv9100'; |
46 | 46 | $sys4->save(); |
47 | 47 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $sys5->sys_id = 5; |
50 | 50 | $sys5->cat_id = 1; |
51 | 51 | $sys5->name = 'IPK'; |
52 | - $sys5->parent_id = NULL; |
|
52 | + $sys5->parent_id = null; |
|
53 | 53 | $sys5->folder_location = 'nec_ipk'; |
54 | 54 | $sys5->save(); |
55 | 55 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $sys6->sys_id = 6; |
58 | 58 | $sys6->cat_id = 1; |
59 | 59 | $sys6->name = 'Older NEC'; |
60 | - $sys6->parent_id = NULL; |
|
60 | + $sys6->parent_id = null; |
|
61 | 61 | $sys6->folder_location = 'nec_oldernec'; |
62 | 62 | $sys6->save(); |
63 | 63 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $sys7->sys_id = 7; |
66 | 66 | $sys7->cat_id = 1; |
67 | 67 | $sys7->name = 'ShoreTel'; |
68 | - $sys7->parent_id = NULL; |
|
68 | + $sys7->parent_id = null; |
|
69 | 69 | $sys7->folder_location = 'shoretel'; |
70 | 70 | $sys7->save(); |
71 | 71 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $sys8->sys_id = 8; |
74 | 74 | $sys8->cat_id = 1; |
75 | 75 | $sys8->name = 'Zultys'; |
76 | - $sys8->parent_id = NULL; |
|
76 | + $sys8->parent_id = null; |
|
77 | 77 | $sys8->folder_location = 'zultys'; |
78 | 78 | $sys8->save(); |
79 | 79 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $sys9->sys_id = 9; |
82 | 82 | $sys9->cat_id = 1; |
83 | 83 | $sys9->name = 'Miscellaneous'; |
84 | - $sys9->parent_id = NULL; |
|
84 | + $sys9->parent_id = null; |
|
85 | 85 | $sys9->folder_location = 'miscellaneous'; |
86 | 86 | $sys9->save(); |
87 | 87 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $sys10->sys_id = 10; |
91 | 91 | $sys10->cat_id = 2; |
92 | 92 | $sys10->name = 'Pelco'; |
93 | - $sys10->parent_id = NULL; |
|
93 | + $sys10->parent_id = null; |
|
94 | 94 | $sys10->folder_location = 'pelco'; |
95 | 95 | $sys10->save(); |
96 | 96 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $sys11->sys_id = 11; |
99 | 99 | $sys11->cat_id = 2; |
100 | 100 | $sys11->name = 'Digital Sentry'; |
101 | - $sys11->parent_id = NULL; |
|
101 | + $sys11->parent_id = null; |
|
102 | 102 | $sys11->folder_location = 'pelco_digitalsentry'; |
103 | 103 | $sys11->save(); |
104 | 104 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $sys12->sys_id = 12; |
107 | 107 | $sys12->cat_id = 2; |
108 | 108 | $sys12->name = 'DX8100'; |
109 | - $sys12->parent_id = NULL; |
|
109 | + $sys12->parent_id = null; |
|
110 | 110 | $sys12->folder_location = 'pelco_dx8100'; |
111 | 111 | $sys12->save(); |
112 | 112 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $sys13->sys_id = 13; |
115 | 115 | $sys13->cat_id = 2; |
116 | 116 | $sys13->name = 'IC Realtime'; |
117 | - $sys13->parent_id = NULL; |
|
117 | + $sys13->parent_id = null; |
|
118 | 118 | $sys13->folder_location = 'icrealtime'; |
119 | 119 | $sys13->save(); |
120 | 120 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | $sys14->sys_id = 14; |
123 | 123 | $sys14->cat_id = 2; |
124 | 124 | $sys14->name = 'Paxton'; |
125 | - $sys14->parent_id = NULL; |
|
125 | + $sys14->parent_id = null; |
|
126 | 126 | $sys14->folder_location = 'paxton'; |
127 | 127 | $sys14->save(); |
128 | 128 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $sys15->sys_id = 15; |
132 | 132 | $sys15->cat_id = 3; |
133 | 133 | $sys15->name = 'Class Connection'; |
134 | - $sys15->parent_id = NULL; |
|
134 | + $sys15->parent_id = null; |
|
135 | 135 | $sys15->folder_location = 'classconnection'; |
136 | 136 | $sys15->save(); |
137 | 137 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $sys16->sys_id = 16; |
140 | 140 | $sys16->cat_id = 3; |
141 | 141 | $sys16->name = 'SynApps'; |
142 | - $sys16->parent_id = NULL; |
|
142 | + $sys16->parent_id = null; |
|
143 | 143 | $sys16->folder_location = 'synapps'; |
144 | 144 | $sys16->save(); |
145 | 145 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | 'link_id' => 1, |
47 | 47 | 'file_id' => $fileID->file_id, |
48 | 48 | 'user_id' => 1, |
49 | - 'added_by' => NULL, |
|
49 | + 'added_by' => null, |
|
50 | 50 | 'upload' => 0 |
51 | 51 | ]); |
52 | 52 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | 'link_id' => 1, |
59 | 59 | 'file_id' => $fileID->file_id, |
60 | 60 | 'user_id' => 1, |
61 | - 'added_by' => NULL, |
|
61 | + 'added_by' => null, |
|
62 | 62 | 'upload' => 0 |
63 | 63 | ]); |
64 | 64 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | 'link_id' => 1, |
71 | 71 | 'file_id' => $fileID->file_id, |
72 | 72 | 'user_id' => 1, |
73 | - 'added_by' => NULL, |
|
73 | + 'added_by' => null, |
|
74 | 74 | 'upload' => 0 |
75 | 75 | ]); |
76 | 76 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | FileLinkFiles::create([ |
82 | 82 | 'link_id' => 1, |
83 | 83 | 'file_id' => $fileID->file_id, |
84 | - 'user_id' => NULL, |
|
84 | + 'user_id' => null, |
|
85 | 85 | 'added_by' => $faker->name(), |
86 | 86 | 'upload' => 1 |
87 | 87 | ]); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | FileLinkFiles::create([ |
94 | 94 | 'link_id' => 1, |
95 | 95 | 'file_id' => $fileID->file_id, |
96 | - 'user_id' => NULL, |
|
96 | + 'user_id' => null, |
|
97 | 97 | 'added_by' => $faker->name(), |
98 | 98 | 'upload' => 1 |
99 | 99 | ]); |