@@ -16,8 +16,8 @@ |
||
16 | 16 | */ |
17 | 17 | public function handle($request, Closure $next) |
18 | 18 | { |
19 | - Date::setLocale(app()->getLocale()); |
|
19 | + Date::setLocale (app ()->getLocale ()); |
|
20 | 20 | |
21 | - return $next($request); |
|
21 | + return $next ($request); |
|
22 | 22 | } |
23 | 23 | } |
@@ -21,41 +21,41 @@ |
||
21 | 21 | */ |
22 | 22 | public function handle($request, Closure $next) |
23 | 23 | { |
24 | - if (Auth::check()) { |
|
25 | - $user = Auth::user(); |
|
24 | + if (Auth::check ()) { |
|
25 | + $user = Auth::user (); |
|
26 | 26 | |
27 | 27 | // If running in a local environment, and FORCE_ADMIN is true, |
28 | 28 | // automatically set any logged in user to (temporarilly) be an admin |
29 | - if (App::environment() == 'local' && Config::get('app.force_admin')) { |
|
30 | - $user->setRole('admin'); |
|
31 | - $user->save(); |
|
29 | + if (App::environment () == 'local' && Config::get ('app.force_admin')) { |
|
30 | + $user->setRole ('admin'); |
|
31 | + $user->save (); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | // Ensure the user has a proper profile associated with it |
35 | 35 | // If no profile exists yet create one. |
36 | 36 | // Admins should be given an applicant and manager profile |
37 | - if ($user->isApplicant() || |
|
38 | - $user->isAdmin() ) { |
|
37 | + if ($user->isApplicant () || |
|
38 | + $user->isAdmin ()) { |
|
39 | 39 | $applicantProfile = $user->applicant; |
40 | 40 | if ($applicantProfile === null) { |
41 | - $applicantProfile = new Applicant(); |
|
41 | + $applicantProfile = new Applicant (); |
|
42 | 42 | $applicantProfile->user_id = $user->id; |
43 | - $applicantProfile->save(); |
|
44 | - $user->refresh(); |
|
43 | + $applicantProfile->save (); |
|
44 | + $user->refresh (); |
|
45 | 45 | } |
46 | 46 | } |
47 | - if ($user->isManager() || |
|
48 | - $user->isAdmin()) { |
|
47 | + if ($user->isManager () || |
|
48 | + $user->isAdmin ()) { |
|
49 | 49 | $managerProfile = $user->manager; |
50 | 50 | if ($managerProfile === null) { |
51 | - $managerProfile = new Manager(); |
|
51 | + $managerProfile = new Manager (); |
|
52 | 52 | $managerProfile->user_id = $user->id; |
53 | - $managerProfile->save(); |
|
54 | - $user->refresh(); |
|
53 | + $managerProfile->save (); |
|
54 | + $user->refresh (); |
|
55 | 55 | } |
56 | 56 | } |
57 | 57 | } |
58 | 58 | |
59 | - return $next($request); |
|
59 | + return $next ($request); |
|
60 | 60 | } |
61 | 61 | } |
@@ -14,13 +14,13 @@ |
||
14 | 14 | */ |
15 | 15 | public function handle($request, Closure $next) |
16 | 16 | { |
17 | - $user = $request->user(); |
|
17 | + $user = $request->user (); |
|
18 | 18 | |
19 | - if ($user !== null && $user->isManager() && !$user->isGovIdentityConfirmed()) { |
|
20 | - $request->session()->put('url.expected', $request->url()); |
|
21 | - return redirect(route('manager.first_visit')); |
|
19 | + if ($user !== null && $user->isManager () && !$user->isGovIdentityConfirmed ()) { |
|
20 | + $request->session ()->put ('url.expected', $request->url ()); |
|
21 | + return redirect (route ('manager.first_visit')); |
|
22 | 22 | } |
23 | 23 | |
24 | - return $next($request); |
|
24 | + return $next ($request); |
|
25 | 25 | } |
26 | 26 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | private function checkIfUserIsAdmin($user) |
24 | 24 | { |
25 | - return ($user->isAdmin()); |
|
25 | + return ($user->isAdmin ()); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -34,10 +34,10 @@ discard block |
||
34 | 34 | */ |
35 | 35 | private function respondToUnauthorizedRequest($request) |
36 | 36 | { |
37 | - if ($request->ajax() || $request->wantsJson()) { |
|
38 | - return response(trans('backpack::base.unauthorized'), 401); |
|
37 | + if ($request->ajax () || $request->wantsJson ()) { |
|
38 | + return response (trans ('backpack::base.unauthorized'), 401); |
|
39 | 39 | } else { |
40 | - return redirect()->guest(backpack_url('login')); |
|
40 | + return redirect ()->guest (backpack_url ('login')); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function handle($request, Closure $next) |
53 | 53 | { |
54 | - if (backpack_auth()->guest()) { |
|
55 | - return $this->respondToUnauthorizedRequest($request); |
|
54 | + if (backpack_auth ()->guest ()) { |
|
55 | + return $this->respondToUnauthorizedRequest ($request); |
|
56 | 56 | } |
57 | 57 | |
58 | - if (!$this->checkIfUserIsAdmin(backpack_user())) { |
|
59 | - return $this->respondToUnauthorizedRequest($request); |
|
58 | + if (!$this->checkIfUserIsAdmin (backpack_user ())) { |
|
59 | + return $this->respondToUnauthorizedRequest ($request); |
|
60 | 60 | } |
61 | 61 | |
62 | - return $next($request); |
|
62 | + return $next ($request); |
|
63 | 63 | } |
64 | 64 | } |
@@ -15,9 +15,9 @@ |
||
15 | 15 | */ |
16 | 16 | public function handle($request, Closure $next) |
17 | 17 | { |
18 | - if (\App::environment('local')) { |
|
19 | - return $next($request); |
|
18 | + if (\App::environment ('local')) { |
|
19 | + return $next ($request); |
|
20 | 20 | } |
21 | - abort(404); |
|
21 | + abort (404); |
|
22 | 22 | } |
23 | 23 | } |
@@ -18,16 +18,16 @@ |
||
18 | 18 | */ |
19 | 19 | public function handle($request, Closure $next, $guard = null) |
20 | 20 | { |
21 | - if (Auth::guard($guard)->check()) { |
|
22 | - if (Auth::user()->isAdmin()) { |
|
23 | - return redirect(backpack_url('')); |
|
24 | - } elseif (WhichPortal::isManagerPortal()) { |
|
25 | - return redirect(route('manager.home')); |
|
21 | + if (Auth::guard ($guard)->check ()) { |
|
22 | + if (Auth::user ()->isAdmin ()) { |
|
23 | + return redirect (backpack_url ('')); |
|
24 | + } elseif (WhichPortal::isManagerPortal ()) { |
|
25 | + return redirect (route ('manager.home')); |
|
26 | 26 | } else { |
27 | - return redirect(route('home')); |
|
27 | + return redirect (route ('home')); |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | |
31 | - return $next($request); |
|
31 | + return $next ($request); |
|
32 | 32 | } |
33 | 33 | } |
@@ -21,21 +21,21 @@ |
||
21 | 21 | public function handle($request, Closure $next, $role) |
22 | 22 | { |
23 | 23 | // If user logged in as admin, always pass, regardless of $role |
24 | - if (Auth::check() && Auth::user()->isAdmin()) { |
|
25 | - Log::info('CheckRole Bypassed as Admin'); |
|
26 | - return $next($request); |
|
24 | + if (Auth::check () && Auth::user ()->isAdmin ()) { |
|
25 | + Log::info ('CheckRole Bypassed as Admin'); |
|
26 | + return $next ($request); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | // Redirect if not logged in, or if not the correct role |
30 | - if (Auth::guest() || !Auth::user()->hasRole($role)) { |
|
31 | - Log::info('CheckRole Failed'); |
|
30 | + if (Auth::guest () || !Auth::user ()->hasRole ($role)) { |
|
31 | + Log::info ('CheckRole Failed'); |
|
32 | 32 | // TODO: redirect to some sort of error messag |
33 | - if (WhichPortal::isManagerPortal()) { |
|
34 | - return redirect(route('manager.home')); |
|
33 | + if (WhichPortal::isManagerPortal ()) { |
|
34 | + return redirect (route ('manager.home')); |
|
35 | 35 | } else { |
36 | - return redirect(route('home')); |
|
36 | + return redirect (route ('home')); |
|
37 | 37 | } |
38 | 38 | } |
39 | - return $next($request); |
|
39 | + return $next ($request); |
|
40 | 40 | } |
41 | 41 | } |
@@ -16,15 +16,15 @@ |
||
16 | 16 | */ |
17 | 17 | public function destroy(Request $request, Course $course) |
18 | 18 | { |
19 | - $this->authorize('delete', $course); |
|
20 | - $course->delete(); |
|
19 | + $this->authorize ('delete', $course); |
|
20 | + $course->delete (); |
|
21 | 21 | |
22 | - if ($request->ajax()) { |
|
22 | + if ($request->ajax ()) { |
|
23 | 23 | return [ |
24 | 24 | 'message' => 'Course delete', |
25 | 25 | ]; |
26 | 26 | } |
27 | 27 | |
28 | - return back(); |
|
28 | + return back (); |
|
29 | 29 | } |
30 | 30 | } |
@@ -14,6 +14,6 @@ |
||
14 | 14 | */ |
15 | 15 | public function index() |
16 | 16 | { |
17 | - return Department::all()->map->toApiArray(); |
|
17 | + return Department::all ()->map->toApiArray (); |
|
18 | 18 | } |
19 | 19 | } |