@@ -20,16 +20,16 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function __construct() |
22 | 22 | { |
23 | - $this->_authEnabled = config('laravelusers.authEnabled'); |
|
24 | - $this->_rolesEnabled = config('laravelusers.rolesEnabled'); |
|
25 | - $this->_rolesMiddlware = config('laravelusers.rolesMiddlware'); |
|
23 | + $this->_authEnabled = config ('laravelusers.authEnabled'); |
|
24 | + $this->_rolesEnabled = config ('laravelusers.rolesEnabled'); |
|
25 | + $this->_rolesMiddlware = config ('laravelusers.rolesMiddlware'); |
|
26 | 26 | |
27 | 27 | if ($this->_authEnabled) { |
28 | - $this->middleware('auth'); |
|
28 | + $this->middleware ('auth'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | if ($this->_rolesEnabled) { |
32 | - $this->middleware($this->_rolesMiddlware); |
|
32 | + $this->middleware ($this->_rolesMiddlware); |
|
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function index() |
42 | 42 | { |
43 | - $pagintaionEnabled = config('laravelusers.enablePagination'); |
|
43 | + $pagintaionEnabled = config ('laravelusers.enablePagination'); |
|
44 | 44 | |
45 | 45 | if ($pagintaionEnabled) { |
46 | - $users = config('laravelusers.defaultUserModel')::paginate(config('laravelusers.paginateListSize')); |
|
46 | + $users = config ('laravelusers.defaultUserModel')::paginate (config ('laravelusers.paginateListSize')); |
|
47 | 47 | } else { |
48 | - $users = config('laravelusers.defaultUserModel')::all(); |
|
48 | + $users = config ('laravelusers.defaultUserModel')::all (); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | $data = [ |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | 'pagintaionEnabled' => $pagintaionEnabled, |
54 | 54 | ]; |
55 | 55 | |
56 | - return view('laravelusers::usersmanagement.show-users', $data); |
|
56 | + return view ('laravelusers::usersmanagement.show-users', $data); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $roles = []; |
67 | 67 | |
68 | 68 | if ($this->_rolesEnabled) { |
69 | - $roles = config('laravelusers.roleModel')::all(); |
|
69 | + $roles = config ('laravelusers.roleModel')::all (); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | $data = [ |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | 'roles' => $roles, |
75 | 75 | ]; |
76 | 76 | |
77 | - return view('laravelusers::usersmanagement.create-user')->with($data); |
|
77 | + return view ('laravelusers::usersmanagement.create-user')->with ($data); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -98,34 +98,34 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | $messages = [ |
101 | - 'name.unique' => trans('laravelusers::laravelusers.messages.userNameTaken'), |
|
102 | - 'name.required' => trans('laravelusers::laravelusers.messages.userNameRequired'), |
|
103 | - 'email.required' => trans('laravelusers::laravelusers.messages.emailRequired'), |
|
104 | - 'email.email' => trans('laravelusers::laravelusers.messages.emailInvalid'), |
|
105 | - 'password.required' => trans('laravelusers::laravelusers.messages.passwordRequired'), |
|
106 | - 'password.min' => trans('laravelusers::laravelusers.messages.PasswordMin'), |
|
107 | - 'password.max' => trans('laravelusers::laravelusers.messages.PasswordMax'), |
|
108 | - 'role.required' => trans('laravelusers::laravelusers.messages.roleRequired'), |
|
101 | + 'name.unique' => trans ('laravelusers::laravelusers.messages.userNameTaken'), |
|
102 | + 'name.required' => trans ('laravelusers::laravelusers.messages.userNameRequired'), |
|
103 | + 'email.required' => trans ('laravelusers::laravelusers.messages.emailRequired'), |
|
104 | + 'email.email' => trans ('laravelusers::laravelusers.messages.emailInvalid'), |
|
105 | + 'password.required' => trans ('laravelusers::laravelusers.messages.passwordRequired'), |
|
106 | + 'password.min' => trans ('laravelusers::laravelusers.messages.PasswordMin'), |
|
107 | + 'password.max' => trans ('laravelusers::laravelusers.messages.PasswordMax'), |
|
108 | + 'role.required' => trans ('laravelusers::laravelusers.messages.roleRequired'), |
|
109 | 109 | ]; |
110 | 110 | |
111 | - $validator = Validator::make($request->all(), $rules, $messages); |
|
111 | + $validator = Validator::make ($request->all (), $rules, $messages); |
|
112 | 112 | |
113 | - if ($validator->fails()) { |
|
114 | - return back()->withErrors($validator)->withInput(); |
|
113 | + if ($validator->fails ()) { |
|
114 | + return back ()->withErrors ($validator)->withInput (); |
|
115 | 115 | } |
116 | 116 | |
117 | - $user = config('laravelusers.defaultUserModel')::create([ |
|
118 | - 'name' => $request->input('name'), |
|
119 | - 'email' => $request->input('email'), |
|
120 | - 'password' => bcrypt($request->input('password')), |
|
117 | + $user = config ('laravelusers.defaultUserModel')::create ([ |
|
118 | + 'name' => $request->input ('name'), |
|
119 | + 'email' => $request->input ('email'), |
|
120 | + 'password' => bcrypt ($request->input ('password')), |
|
121 | 121 | ]); |
122 | 122 | |
123 | 123 | if ($this->_rolesEnabled) { |
124 | - $user->attachRole($request->input('role')); |
|
125 | - $user->save(); |
|
124 | + $user->attachRole ($request->input ('role')); |
|
125 | + $user->save (); |
|
126 | 126 | } |
127 | 127 | |
128 | - return redirect('users')->with('success', trans('laravelusers::laravelusers.messages.user-creation-success')); |
|
128 | + return redirect ('users')->with ('success', trans ('laravelusers::laravelusers.messages.user-creation-success')); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function show($id) |
139 | 139 | { |
140 | - $user = config('laravelusers.defaultUserModel')::find($id); |
|
140 | + $user = config ('laravelusers.defaultUserModel')::find ($id); |
|
141 | 141 | |
142 | - return view('laravelusers::usersmanagement.show-user')->withUser($user); |
|
142 | + return view ('laravelusers::usersmanagement.show-user')->withUser ($user); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -151,12 +151,12 @@ discard block |
||
151 | 151 | */ |
152 | 152 | public function edit($id) |
153 | 153 | { |
154 | - $user = config('laravelusers.defaultUserModel')::findOrFail($id); |
|
154 | + $user = config ('laravelusers.defaultUserModel')::findOrFail ($id); |
|
155 | 155 | $roles = []; |
156 | 156 | $currentRole = ''; |
157 | 157 | |
158 | 158 | if ($this->_rolesEnabled) { |
159 | - $roles = config('laravelusers.roleModel')::all(); |
|
159 | + $roles = config ('laravelusers.roleModel')::all (); |
|
160 | 160 | |
161 | 161 | foreach ($user->roles as $user_role) { |
162 | 162 | $currentRole = $user_role; |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $data['currentRole'] = $currentRole; |
174 | 174 | } |
175 | 175 | |
176 | - return view('laravelusers::usersmanagement.edit-user')->with($data); |
|
176 | + return view ('laravelusers::usersmanagement.edit-user')->with ($data); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | /** |
@@ -186,9 +186,9 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function update(Request $request, $id) |
188 | 188 | { |
189 | - $user = config('laravelusers.defaultUserModel')::find($id); |
|
190 | - $emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email); |
|
191 | - $passwordCheck = $request->input('password') != null; |
|
189 | + $user = config ('laravelusers.defaultUserModel')::find ($id); |
|
190 | + $emailCheck = ($request->input ('email') != '') && ($request->input ('email') != $user->email); |
|
191 | + $passwordCheck = $request->input ('password') != null; |
|
192 | 192 | |
193 | 193 | $rules = [ |
194 | 194 | 'name' => 'required|max:255', |
@@ -207,30 +207,30 @@ discard block |
||
207 | 207 | $rules['role'] = 'required'; |
208 | 208 | } |
209 | 209 | |
210 | - $validator = Validator::make($request->all(), $rules); |
|
210 | + $validator = Validator::make ($request->all (), $rules); |
|
211 | 211 | |
212 | - if ($validator->fails()) { |
|
213 | - return back()->withErrors($validator)->withInput(); |
|
212 | + if ($validator->fails ()) { |
|
213 | + return back ()->withErrors ($validator)->withInput (); |
|
214 | 214 | } |
215 | 215 | |
216 | - $user->name = $request->input('name'); |
|
216 | + $user->name = $request->input ('name'); |
|
217 | 217 | |
218 | 218 | if ($emailCheck) { |
219 | - $user->email = $request->input('email'); |
|
219 | + $user->email = $request->input ('email'); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | if ($passwordCheck) { |
223 | - $user->password = bcrypt($request->input('password')); |
|
223 | + $user->password = bcrypt ($request->input ('password')); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | if ($this->_rolesEnabled) { |
227 | - $user->detachAllRoles(); |
|
228 | - $user->attachRole($request->input('role')); |
|
227 | + $user->detachAllRoles (); |
|
228 | + $user->attachRole ($request->input ('role')); |
|
229 | 229 | } |
230 | 230 | |
231 | - $user->save(); |
|
231 | + $user->save (); |
|
232 | 232 | |
233 | - return back()->with('success', trans('laravelusers::laravelusers.messages.update-user-success')); |
|
233 | + return back ()->with ('success', trans ('laravelusers::laravelusers.messages.update-user-success')); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
@@ -242,15 +242,15 @@ discard block |
||
242 | 242 | */ |
243 | 243 | public function destroy($id) |
244 | 244 | { |
245 | - $currentUser = Auth::user(); |
|
246 | - $user = config('laravelusers.defaultUserModel')::findOrFail($id); |
|
245 | + $currentUser = Auth::user (); |
|
246 | + $user = config ('laravelusers.defaultUserModel')::findOrFail ($id); |
|
247 | 247 | |
248 | 248 | if ($currentUser != $user) { |
249 | - $user->delete(); |
|
249 | + $user->delete (); |
|
250 | 250 | |
251 | - return redirect('users')->with('success', trans('laravelusers::laravelusers.messages.delete-success')); |
|
251 | + return redirect ('users')->with ('success', trans ('laravelusers::laravelusers.messages.delete-success')); |
|
252 | 252 | } |
253 | 253 | |
254 | - return back()->with('error', trans('laravelusers::laravelusers.messages.cannot-delete-yourself')); |
|
254 | + return back ()->with ('error', trans ('laravelusers::laravelusers.messages.cannot-delete-yourself')); |
|
255 | 255 | } |
256 | 256 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function boot() |
24 | 24 | { |
25 | - $this->loadTranslationsFrom(__DIR__.'/resources/lang/', $this->_packageTag); |
|
25 | + $this->loadTranslationsFrom (__DIR__.'/resources/lang/', $this->_packageTag); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -32,15 +32,15 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function register() |
34 | 34 | { |
35 | - $this->loadRoutesFrom(__DIR__.'/routes/web.php'); |
|
36 | - $this->loadViewsFrom(__DIR__.'/resources/views/', $this->_packageTag); |
|
37 | - $this->mergeConfigFrom(__DIR__.'/config/'.$this->_packageTag.'.php', $this->_packageTag); |
|
38 | - $this->publishFiles(); |
|
39 | - $this->app->make('jeremykenedy\laravelusers\App\Http\Controllers\UsersManagementController'); |
|
40 | - $this->app->singleton(UsersManagementController::class, function () { |
|
41 | - return new App\Http\Controllers\UsersManagementController(); |
|
35 | + $this->loadRoutesFrom (__DIR__.'/routes/web.php'); |
|
36 | + $this->loadViewsFrom (__DIR__.'/resources/views/', $this->_packageTag); |
|
37 | + $this->mergeConfigFrom (__DIR__.'/config/'.$this->_packageTag.'.php', $this->_packageTag); |
|
38 | + $this->publishFiles (); |
|
39 | + $this->app->make ('jeremykenedy\laravelusers\App\Http\Controllers\UsersManagementController'); |
|
40 | + $this->app->singleton (UsersManagementController::class, function() { |
|
41 | + return new App\Http\Controllers\UsersManagementController (); |
|
42 | 42 | }); |
43 | - $this->app->alias(UsersManagementController::class, 'laravelusers'); |
|
43 | + $this->app->alias (UsersManagementController::class, 'laravelusers'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -52,16 +52,16 @@ discard block |
||
52 | 52 | { |
53 | 53 | $publishTag = $this->_packageTag; |
54 | 54 | |
55 | - $this->publishes([ |
|
56 | - __DIR__.'/config/'.$this->_packageTag.'.php' => base_path('config/'.$this->_packageTag.'.php'), |
|
55 | + $this->publishes ([ |
|
56 | + __DIR__.'/config/'.$this->_packageTag.'.php' => base_path ('config/'.$this->_packageTag.'.php'), |
|
57 | 57 | ], $publishTag); |
58 | 58 | |
59 | - $this->publishes([ |
|
60 | - __DIR__.'/resources/views' => resource_path('views/vendor/'.$this->_packageTag), |
|
59 | + $this->publishes ([ |
|
60 | + __DIR__.'/resources/views' => resource_path ('views/vendor/'.$this->_packageTag), |
|
61 | 61 | ], $publishTag); |
62 | 62 | |
63 | - $this->publishes([ |
|
64 | - __DIR__.'/resources/lang' => resource_path('lang/vendor/'.$this->_packageTag), |
|
63 | + $this->publishes ([ |
|
64 | + __DIR__.'/resources/lang' => resource_path ('lang/vendor/'.$this->_packageTag), |
|
65 | 65 | ], $publishTag); |
66 | 66 | } |
67 | 67 | } |
@@ -8,8 +8,8 @@ |
||
8 | 8 | */ |
9 | 9 | |
10 | 10 | // APP Routes Below |
11 | -Route::group(['middleware' => 'web', 'namespace' => 'jeremykenedy\laravelusers\app\Http\Controllers'], function () { |
|
12 | - Route::resource('users', 'UsersManagementController', [ |
|
11 | +Route::group (['middleware' => 'web', 'namespace' => 'jeremykenedy\laravelusers\app\Http\Controllers'], function() { |
|
12 | + Route::resource ('users', 'UsersManagementController', [ |
|
13 | 13 | 'names' => [ |
14 | 14 | 'index' => 'users', |
15 | 15 | 'destroy' => 'user.destroy', |