@@ -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 |
@@ -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 | }) |
@@ -35,8 +35,7 @@ |
||
35 | 35 | // Update the users table to include the 'user_role' column |
36 | 36 | if(!Schema::hasColumn('users', 'role_id')) |
37 | 37 | { |
38 | - Schema::table('users', function(Blueprint $table) |
|
39 | - { |
|
38 | + Schema::table('users', function(Blueprint $table) { |
|
40 | 39 | $table->integer('role_id')->unsigned()->after('user_id')->default(4); |
41 | 40 | $table->foreign('role_id')->references('role_id')->on('user_role_types')->onUpdate('cascade'); |
42 | 41 | }); |
@@ -135,7 +135,8 @@ discard block |
||
135 | 135 | // Validate the hash token |
136 | 136 | $user = UserInitialize::where('token', $hash)->get(); |
137 | 137 | |
138 | - if ($user->isEmpty()) { |
|
138 | + if ($user->isEmpty()) |
|
139 | + { |
|
139 | 140 | Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id); |
140 | 141 | Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash); |
141 | 142 | return abort(404); |
@@ -151,7 +152,8 @@ discard block |
||
151 | 152 | { |
152 | 153 | // Verify that the link matches the assigned email address |
153 | 154 | $valid = UserInitialize::where('token', $hash)->first(); |
154 | - if (empty($valid)) { |
|
155 | + if (empty($valid)) |
|
156 | + { |
|
155 | 157 | Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id); |
156 | 158 | Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash); |
157 | 159 | return abort(404); |
@@ -181,12 +181,18 @@ discard block |
||
181 | 181 | |
182 | 182 | // Good to go - update user password |
183 | 183 | $roleArr = []; |
184 | - foreach ($roles as $role) { |
|
185 | - if ($role->role_id == 1 && Auth::user()->role_id != 1) { |
|
184 | + foreach ($roles as $role) |
|
185 | + { |
|
186 | + if ($role->role_id == 1 && Auth::user()->role_id != 1) |
|
187 | + { |
|
186 | 188 | continue; |
187 | - } else if ($role->role_id == 2 && Auth::user()->role_id > 1) { |
|
189 | + } |
|
190 | + else if ($role->role_id == 2 && Auth::user()->role_id > 1) |
|
191 | + { |
|
188 | 192 | continue; |
189 | - } else { |
|
193 | + } |
|
194 | + else |
|
195 | + { |
|
190 | 196 | // $roleArr[$role->role_id] = $role->name; |
191 | 197 | $roleArr[] = [ |
192 | 198 | 'value' => $role->role_id, |
@@ -275,17 +281,20 @@ discard block |
||
275 | 281 | $user = User::find($request->user_id); |
276 | 282 | |
277 | 283 | // Verify this is a valid user ID |
278 | - if (!$user) { |
|
284 | + if (!$user) |
|
285 | + { |
|
279 | 286 | $success = false; |
280 | 287 | $reason = 'Cannot find user with this ID'; |
281 | 288 | } |
282 | 289 | // Make sure that the user is not trying to deactivate someone with more permissions |
283 | - else if ($user->role_id < Auth::user()->role_id) { |
|
290 | + else if ($user->role_id < Auth::user()->role_id) |
|
291 | + { |
|
284 | 292 | $success = false; |
285 | 293 | $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.'; |
286 | 294 | } |
287 | 295 | // Good to go - update user password |
288 | - else { |
|
296 | + else |
|
297 | + { |
|
289 | 298 | // Update the user data |
290 | 299 | $user->update( |
291 | 300 | [ |
@@ -51,14 +51,17 @@ discard block |
||
51 | 51 | Log::debug('request Data -> ', $request->toArray()); |
52 | 52 | |
53 | 53 | // See if there are any search paramaters entered |
54 | - if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) { |
|
54 | + if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) |
|
55 | + { |
|
55 | 56 | // No search paramaters, send all tech tips |
56 | 57 | $tips = new TechTipsCollection( |
57 | 58 | TechTips::orderBy('created_at', 'DESC') |
58 | 59 | ->with('SystemTypes') |
59 | 60 | ->paginate($request->pagination['perPage']) |
60 | 61 | ); |
61 | - } else { |
|
62 | + } |
|
63 | + else |
|
64 | + { |
|
62 | 65 | $article = isset($request->search['articleType']) ? true : false; |
63 | 66 | $system = isset($request->search['systemType']) ? true : false; |
64 | 67 | // Search paramaters, filter results |
@@ -146,7 +149,8 @@ discard block |
||
146 | 149 | $save = $receiver->receive(); |
147 | 150 | |
148 | 151 | // See if the uploade has finished |
149 | - if ($save->isFinished()) { |
|
152 | + if ($save->isFinished()) |
|
153 | + { |
|
150 | 154 | $this->saveFile($save->getFile()); |
151 | 155 | |
152 | 156 | return 'uploaded successfully'; |
@@ -248,8 +252,7 @@ discard block |
||
248 | 252 | if(!$tipData->supressEmail) |
249 | 253 | { |
250 | 254 | $details = TechTips::find($tipID); |
251 | - $users = User::whereHas('UserSettings', function($query) |
|
252 | - { |
|
255 | + $users = User::whereHas('UserSettings', function($query) { |
|
253 | 256 | $query->where('em_tech_tip', 1); |
254 | 257 | })->get(); |
255 | 258 | |
@@ -263,7 +266,8 @@ discard block |
||
263 | 266 | // Details controller - will move to the show controller with just the tech tip id |
264 | 267 | public function details($id, $subject) |
265 | 268 | { |
266 | - if (session()->has('newTipFile')) { |
|
269 | + if (session()->has('newTipFile')) |
|
270 | + { |
|
267 | 271 | session()->forget('newTipFile'); |
268 | 272 | } |
269 | 273 | |
@@ -293,7 +297,8 @@ discard block |
||
293 | 297 | // Add or remove this tip as a favorite of the user |
294 | 298 | public function toggleFav($action, $id) |
295 | 299 | { |
296 | - switch ($action) { |
|
300 | + switch ($action) |
|
301 | + { |
|
297 | 302 | case 'add': |
298 | 303 | TechTipFavs::create([ |
299 | 304 | 'user_id' => Auth::user()->user_id, |
@@ -321,7 +326,8 @@ discard block |
||
321 | 326 | $this->authorize('hasAccess', 'Edit Tech Tip'); |
322 | 327 | $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->with('TechTipTypes')->first(); |
323 | 328 | |
324 | - if (!$tipData) { |
|
329 | + if (!$tipData) |
|
330 | + { |
|
325 | 331 | return view('tips.tipNotFound'); |
326 | 332 | } |
327 | 333 | |
@@ -353,7 +359,8 @@ discard block |
||
353 | 359 | $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request)); |
354 | 360 | |
355 | 361 | // Verify if there is a file to be processed or not |
356 | - if ($receiver->isUploaded() === false || $request->_completed) { |
|
362 | + if ($receiver->isUploaded() === false || $request->_completed) |
|
363 | + { |
|
357 | 364 | $this->storeUpdatedTip($request, $id); |
358 | 365 | Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id); |
359 | 366 | return response()->json(['tip_id' => $id]); |
@@ -363,7 +370,8 @@ discard block |
||
363 | 370 | $save = $receiver->receive(); |
364 | 371 | |
365 | 372 | // See if the uploade has finished |
366 | - if ($save->isFinished()) { |
|
373 | + if ($save->isFinished()) |
|
374 | + { |
|
367 | 375 | $this->saveFile($save->getFile(), $id); |
368 | 376 | |
369 | 377 | return 'uploaded successfully'; |
@@ -77,7 +77,8 @@ |
||
77 | 77 | // Delete an existing category - note this will fail if the category has systems assigned to it |
78 | 78 | public function destroy($id) |
79 | 79 | { |
80 | - try { |
|
80 | + try |
|
81 | + { |
|
81 | 82 | SystemCategories::find($id)->delete(); |
82 | 83 | return response()->json(['success' => true, 'reason' => 'Category Successfully Deleted']); |
83 | 84 | } |
@@ -131,8 +131,7 @@ discard block |
||
131 | 131 | public function edit($id) |
132 | 132 | { |
133 | 133 | $fields = SystemDataFieldTypes::all(); |
134 | - $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) |
|
135 | - { |
|
134 | + $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) { |
|
136 | 135 | $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id'); |
137 | 136 | }])->withCount('SystemDataFields')->first(); |
138 | 137 | |
@@ -212,7 +211,8 @@ discard block |
||
212 | 211 | public function destroy($id) |
213 | 212 | { |
214 | 213 | // |
215 | - try { |
|
214 | + try |
|
215 | + { |
|
216 | 216 | SystemTypes::find($id)->delete(); |
217 | 217 | return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']); |
218 | 218 | } |
@@ -81,14 +81,16 @@ |
||
81 | 81 | )->update(['value' => $request->url]); |
82 | 82 | } |
83 | 83 | // Update the site timezone |
84 | - if (config('app.timezone') !== $request->timezone) { |
|
84 | + if (config('app.timezone') !== $request->timezone) |
|
85 | + { |
|
85 | 86 | Settings::firstOrCreate( |
86 | 87 | ['key' => 'app.timezone'], |
87 | 88 | ['key' => 'app.timezone', 'value' => $request->timezone] |
88 | 89 | )->update(['value' => $request->timezone]); |
89 | 90 | } |
90 | 91 | // Update the maximum file upload size |
91 | - if (config('filesystems.paths.max_size') !== $request->filesize) { |
|
92 | + if (config('filesystems.paths.max_size') !== $request->filesize) |
|
93 | + { |
|
92 | 94 | Settings::firstOrCreate( |
93 | 95 | ['key' => 'filesystems.paths.max_size'], |
94 | 96 | ['key' => 'filesystems.paths.max_size', 'value' => $request->filesize] |