@@ -65,7 +65,7 @@ |
||
65 | 65 | // Here we will attempt to reset the user's password. If it is successful we |
66 | 66 | // will update the password on an actual user model and persist it to the |
67 | 67 | // database. Otherwise we will parse the error and return the response. |
68 | - $response = $this->broker()->reset($this->credentials($request), function ($user, $password) { |
|
68 | + $response = $this->broker()->reset($this->credentials($request), function($user, $password) { |
|
69 | 69 | $this->resetPassword($user, $password); |
70 | 70 | }); |
71 | 71 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | $user = auth()->guard('chief')->user(); |
18 | 18 | |
19 | - return view('chief::admin.auth.passwords.edit', ['new_password' => ! $user->password]); |
|
19 | + return view('chief::admin.auth.passwords.edit', ['new_password' => !$user->password]); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function update(Request $request) |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $this->authorize('create-page'); |
32 | 32 | |
33 | 33 | $menuitem = new MenuItem(); |
34 | - $menuitem->type = MenuItem::TYPE_INTERNAL; // Default menu type |
|
34 | + $menuitem->type = MenuItem::TYPE_INTERNAL; // Default menu type |
|
35 | 35 | $menuitem->menu_type = $menutype; |
36 | 36 | |
37 | 37 | $menuitems = $this->prepareMenuItemsForAdminSelect->prepare(ChiefMenu::fromMenuItems($menuitem->menuType())->items()); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | ->performedOn($menu) |
55 | 55 | ->log('created'); |
56 | 56 | |
57 | - return redirect()->route('chief.back.menus.show', $menu->menu_type)->with('messages.success', $menu->label . ' is aangemaakt'); |
|
57 | + return redirect()->route('chief.back.menus.show', $menu->menu_type)->with('messages.success', $menu->label.' is aangemaakt'); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | ->performedOn($menu) |
87 | 87 | ->log('updated'); |
88 | 88 | |
89 | - return redirect()->route('chief.back.menus.show', $menu->menu_type)->with('messages.success', $menu->label . ' is aangepast'); |
|
89 | + return redirect()->route('chief.back.menus.show', $menu->menu_type)->with('messages.success', $menu->label.' is aangepast'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | public function destroy($id) |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | ->log('deleted'); |
104 | 104 | |
105 | 105 | return redirect()->route('chief.back.menus.show', $menuItem->menuType())->with('messages.warning', $message); |
106 | - } else { |
|
106 | + }else { |
|
107 | 107 | return redirect()->back()->with('messages.warning', 'Je menu item is niet verwijderd. Probeer opnieuw'); |
108 | 108 | } |
109 | 109 | } |
@@ -48,7 +48,7 @@ |
||
48 | 48 | $role->givePermissionTo($request->permission_names); |
49 | 49 | |
50 | 50 | return redirect()->route('chief.back.roles.index') |
51 | - ->with('messages.success', 'Rol ' . $role->name . ' is toegevoegd.'); |
|
51 | + ->with('messages.success', 'Rol ' . $role->name . ' is toegevoegd.'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $role->givePermissionTo($request->permission_names); |
49 | 49 | |
50 | 50 | return redirect()->route('chief.back.roles.index') |
51 | - ->with('messages.success', 'Rol ' . $role->name . ' is toegevoegd.'); |
|
51 | + ->with('messages.success', 'Rol '.$role->name.' is toegevoegd.'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $this->authorize('update-role'); |
70 | 70 | |
71 | 71 | $this->validate($request, [ |
72 | - 'name' => 'required|alpha_dash|unique:roles,name,' . $id, |
|
72 | + 'name' => 'required|alpha_dash|unique:roles,name,'.$id, |
|
73 | 73 | 'permission_names' => 'required|array', |
74 | 74 | 'permission_names.*' => 'required', // Avoid null array entry |
75 | 75 | ]); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $role->syncPermissions($request->permission_names); |
81 | 81 | |
82 | 82 | return redirect()->route('chief.back.roles.index') |
83 | - ->with('messages.success', 'Rol ' . $role->name . ' is aangepast.'); |
|
83 | + ->with('messages.success', 'Rol '.$role->name.' is aangepast.'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | public function destroy($id) |
@@ -91,6 +91,6 @@ discard block |
||
91 | 91 | $role->delete(); |
92 | 92 | |
93 | 93 | return redirect()->route('chief.back.roles.index') |
94 | - ->with('messages.success', 'Rol ' . $role->name . ' is verwijderd.'); |
|
94 | + ->with('messages.success', 'Rol '.$role->name.' is verwijderd.'); |
|
95 | 95 | } |
96 | 96 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $roles = $request['roles']; |
49 | 49 | |
50 | 50 | $permission->save(); |
51 | - if (! empty($request['roles'])) { |
|
51 | + if (!empty($request['roles'])) { |
|
52 | 52 | foreach ($roles as $role) { |
53 | 53 | $r = Role::where('id', '=', $role)->firstOrFail(); //Match input role to db record |
54 | 54 | $permission = Permission::where('name', '=', $name)->first(); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | return redirect()->route('chief.back.permissions.index') |
60 | - ->with('flash_message', 'Permission' . $permission->name . ' added!'); |
|
60 | + ->with('flash_message', 'Permission'.$permission->name.' added!'); |
|
61 | 61 | } |
62 | 62 | /** |
63 | 63 | * Display the specified resource. |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $permission->fill($input)->save(); |
102 | 102 | |
103 | 103 | return redirect()->route('chief.back.permissions.index') |
104 | - ->with('flash_message', 'Permission' . $permission->name . ' updated!'); |
|
104 | + ->with('flash_message', 'Permission'.$permission->name.' updated!'); |
|
105 | 105 | } |
106 | 106 | /** |
107 | 107 | * Remove the specified resource from storage. |
@@ -115,12 +115,12 @@ discard block |
||
115 | 115 | |
116 | 116 | if ($permission->name == "Administer roles & permissions") { |
117 | 117 | return redirect()->route('chief.back.permissions.index') |
118 | - ->with('flash_message', 'Cannot delete this Permission!'); |
|
118 | + ->with('flash_message', 'Cannot delete this Permission!'); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | $permission->delete(); |
122 | 122 | |
123 | 123 | return redirect()->route('chief.back.permissions.index') |
124 | - ->with('flash_message', 'Permission deleted!'); |
|
124 | + ->with('flash_message', 'Permission deleted!'); |
|
125 | 125 | } |
126 | 126 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | $this->validate($request, [ |
49 | 49 | 'firstname' => 'required', |
50 | 50 | 'lastname' => 'required', |
51 | - 'email' => 'required|email|unique:' . (new User())->getTable(), |
|
51 | + 'email' => 'required|email|unique:'.(new User())->getTable(), |
|
52 | 52 | 'roles' => 'required|array', |
53 | 53 | ]); |
54 | 54 | |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | $this->validate($request, [ |
89 | 89 | 'firstname' => 'required', |
90 | 90 | 'lastname' => 'required', |
91 | - 'email' => 'required|email|unique:' . (new User())->getTable() . ',email,' . $id, |
|
91 | + 'email' => 'required|email|unique:'.(new User())->getTable().',email,'.$id, |
|
92 | 92 | 'roles' => 'required|array', |
93 | 93 | ]); |
94 | 94 | |
95 | 95 | $user = User::findOrFail($id); |
96 | 96 | |
97 | 97 | // Only another developer can change another developer. |
98 | - if (! chiefAdmin()->hasRole('developer') && ($user->hasRole('developer') || in_array('developer', $request->get('roles', [])))) { |
|
98 | + if (!chiefAdmin()->hasRole('developer') && ($user->hasRole('developer') || in_array('developer', $request->get('roles', [])))) { |
|
99 | 99 | throw new AuthorizationException('Constraint: Only an user with role developer can update an user with developer role.'); |
100 | 100 | } |
101 | 101 |
@@ -17,6 +17,6 @@ |
||
17 | 17 | app(InviteUser::class)->handle($user, auth()->guard('chief')->user()); |
18 | 18 | |
19 | 19 | return redirect()->route('chief.back.users.index') |
20 | - ->with('messages.success', $user->fullname . ' is opnieuw een uitnodiging verstuurd.'); |
|
20 | + ->with('messages.success', $user->fullname.' is opnieuw een uitnodiging verstuurd.'); |
|
21 | 21 | } |
22 | 22 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | $this->validate($request, [ |
26 | 26 | 'firstname' => 'required|max:50', |
27 | 27 | 'lastname' => 'required|max:50', |
28 | - 'email' => 'required|email|unique:' . (new User())->getTable() . ',email,' . $user->id, |
|
28 | + 'email' => 'required|email|unique:'.(new User())->getTable().',email,'.$user->id, |
|
29 | 29 | ]); |
30 | 30 | |
31 | 31 | $user->update($request->only(['firstname', 'lastname', 'email'])); |
@@ -20,11 +20,11 @@ |
||
20 | 20 | return redirect('/'); |
21 | 21 | } |
22 | 22 | |
23 | - if (! $request->user('chief')->hasRole($role)) { |
|
23 | + if (!$request->user('chief')->hasRole($role)) { |
|
24 | 24 | abort(403); |
25 | 25 | } |
26 | 26 | |
27 | - if (! $request->user('chief')->can($permission)) { |
|
27 | + if (!$request->user('chief')->can($permission)) { |
|
28 | 28 | abort(403); |
29 | 29 | } |
30 | 30 |