Skip to content

Commit 5bfbed0

Browse files
jeremykenedyjeremykenedy
committed
remove deprecated error call
1 parent 1bb48bf commit 5bfbed0

File tree

4 files changed

+49
-93
lines changed

4 files changed

+49
-93
lines changed

‎app/Http/Controllers/Auth/RegisterController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use App\Traits\CaptureIpTrait;
1111
use Illuminate\Foundation\Auth\RegistersUsers;
1212
use Illuminate\Support\Facades\Validator;
13-
1413
use jeremykenedy\LaravelRoles\Models\Role;
1514

1615
class RegisterController extends Controller {
@@ -43,8 +42,8 @@ class RegisterController extends Controller {
4342
*/
4443
public function __construct() {
4544
$this->middleware('guest', [
46-
'except' => 'logout'
47-
]);
45+
'except' => 'logout'
46+
]);
4847
}
4948

5049
/**

‎app/Http/Controllers/ProfilesController.php

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,7 @@ public function update($username, Request $request)
150150
$profile_validator = $this->profile_validator($request->all());
151151

152152
if ($profile_validator->fails()) {
153-
154-
$this->throwValidationException(
155-
$request, $profile_validator
156-
);
157-
158-
return redirect('profile/'.$user->name.'/edit')->withErrors($validator)->withInput();
153+
return back()->withErrors($profile_validator)->withInput();
159154
}
160155

161156
if ($user->profile == null) {
@@ -200,7 +195,6 @@ public function validator(array $data)
200195
*/
201196
public function updateUserAccount(Request $request, $id)
202197
{
203-
204198
$currentUser = \Auth::user();
205199
$user = User::findOrFail($id);
206200
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
@@ -221,9 +215,7 @@ public function updateUserAccount(Request $request, $id)
221215
$validator = $this->validator($request->all(), $rules);
222216

223217
if ($validator->fails()) {
224-
$this->throwValidationException(
225-
$request, $validator
226-
);
218+
return back()->withErrors($validator)->withInput();
227219
}
228220

229221
$user->name = $request->input('name');
@@ -252,7 +244,6 @@ public function updateUserAccount(Request $request, $id)
252244
*/
253245
public function updateUserPassword(Request $request, $id)
254246
{
255-
256247
$currentUser = \Auth::user();
257248
$user = User::findOrFail($id);
258249
$ipAddress = new CaptureIpTrait;
@@ -270,9 +261,7 @@ public function updateUserPassword(Request $request, $id)
270261
);
271262

272263
if ($validator->fails()) {
273-
$this->throwValidationException(
274-
$request, $validator
275-
);
264+
return back()->withErrors($validator)->withInput();
276265
}
277266

278267
if ($request->input('password') != null) {
@@ -284,7 +273,6 @@ public function updateUserPassword(Request $request, $id)
284273
$user->save();
285274

286275
return redirect('profile/'.$user->name.'/edit')->with('success', trans('profile.updatePWSuccess'));
287-
288276
}
289277

290278
/**
@@ -357,16 +345,12 @@ public function deleteUserAccount(Request $request, $id)
357345
]
358346
);
359347

360-
if ($validator->fails()) {
361-
$this->throwValidationException(
362-
$request, $validator
363-
);
364-
}
365-
366348
if ($user->id != $currentUser->id) {
367-
368349
return redirect('profile/'.$user->name.'/edit')->with('error', trans('profile.errorDeleteNotYour'));
350+
}
369351

352+
if ($validator->fails()) {
353+
return back()->withErrors($validator)->withInput();
370354
}
371355

372356
// Create and encrypt user account restore token

‎app/Http/Controllers/ThemesManagementController.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@ public function store(Request $request)
6464
$validator = Validator::make($input, Theme::rules());
6565

6666
if ($validator->fails()) {
67-
68-
$this->throwValidationException(
69-
$request, $validator
70-
);
71-
72-
return redirect('themes/create')->withErrors($validator)->withInput();
67+
return back()->withErrors($validator)->withInput();
7368
}
7469

7570
$theme = Theme::create([
@@ -156,12 +151,7 @@ public function update(Request $request, $id)
156151
$validator = Validator::make($input, Theme::rules($id));
157152

158153
if ($validator->fails()) {
159-
160-
$this->throwValidationException(
161-
$request, $validator
162-
);
163-
164-
return redirect('themes/'.$theme->id.'/edit')->withErrors($validator)->withInput();
154+
return back()->withErrors($validator)->withInput();
165155
}
166156

167157
$theme->fill($input)->save();

‎app/Http/Controllers/UsersManagementController.php

Lines changed: 39 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public function index()
4040
$roles = Role::all();
4141

4242
return View('usersmanagement.show-users', compact('users', 'roles'));
43-
4443
}
4544

4645
/**
@@ -50,7 +49,6 @@ public function index()
5049
*/
5150
public function create()
5251
{
53-
5452
$roles = Role::all();
5553

5654
$data = [
@@ -68,7 +66,6 @@ public function create()
6866
*/
6967
public function store(Request $request)
7068
{
71-
7269
$validator = Validator::make($request->all(),
7370
[
7471
'name' => 'required|max:255|unique:users',
@@ -94,34 +91,28 @@ public function store(Request $request)
9491
);
9592

9693
if ($validator->fails()) {
97-
98-
$this->throwValidationException(
99-
$request, $validator
100-
);
101-
102-
} else {
103-
104-
$ipAddress = new CaptureIpTrait;
105-
$profile = new Profile;
106-
107-
$user = User::create([
108-
'name' => $request->input('name'),
109-
'first_name' => $request->input('first_name'),
110-
'last_name' => $request->input('last_name'),
111-
'email' => $request->input('email'),
112-
'password' => bcrypt($request->input('password')),
113-
'token' => str_random(64),
114-
'admin_ip_address' => $ipAddress->getClientIp(),
115-
'activated' => 1
116-
]);
117-
118-
$user->profile()->save($profile);
119-
$user->attachRole($request->input('role'));
120-
$user->save();
121-
122-
return redirect('users')->with('success', trans('usersmanagement.createSuccess'));
123-
94+
return back()->withErrors($validator)->withInput();
12495
}
96+
97+
$ipAddress = new CaptureIpTrait;
98+
$profile = new Profile;
99+
100+
$user = User::create([
101+
'name' => $request->input('name'),
102+
'first_name' => $request->input('first_name'),
103+
'last_name' => $request->input('last_name'),
104+
'email' => $request->input('email'),
105+
'password' => bcrypt($request->input('password')),
106+
'token' => str_random(64),
107+
'admin_ip_address' => $ipAddress->getClientIp(),
108+
'activated' => 1
109+
]);
110+
111+
$user->profile()->save($profile);
112+
$user->attachRole($request->input('role'));
113+
$user->save();
114+
115+
return redirect('users')->with('success', trans('usersmanagement.createSuccess'));
125116
}
126117

127118
/**
@@ -132,7 +123,6 @@ public function store(Request $request)
132123
*/
133124
public function show($id)
134125
{
135-
136126
$user = User::find($id);
137127

138128
return view('usersmanagement.show-user')->withUser($user);
@@ -146,7 +136,6 @@ public function show($id)
146136
*/
147137
public function edit($id)
148138
{
149-
150139
$user = User::findOrFail($id);
151140
$roles = Role::all();
152141

@@ -172,7 +161,6 @@ public function edit($id)
172161
*/
173162
public function update(Request $request, $id)
174163
{
175-
176164
$currentUser = Auth::user();
177165
$user = User::find($id);
178166
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
@@ -190,33 +178,29 @@ public function update(Request $request, $id)
190178
'password' => 'nullable|confirmed|min:6'
191179
]);
192180
}
193-
if ($validator->fails()) {
194-
$this->throwValidationException(
195-
$request, $validator
196-
);
197-
} else {
198-
$user->name = $request->input('name');
199181

200-
$user->first_name = $request->input('first_name');
201-
$user->last_name = $request->input('last_name');
182+
if ($validator->fails()) {
183+
return back()->withErrors($validator)->withInput();
184+
}
202185

203-
if ($emailCheck) {
204-
$user->email = $request->input('email');
205-
}
186+
$user->name = $request->input('name');
187+
$user->first_name = $request->input('first_name');
188+
$user->last_name = $request->input('last_name');
206189

207-
if ($request->input('password') != null) {
208-
$user->password = bcrypt($request->input('password'));
209-
}
190+
if ($emailCheck) {
191+
$user->email = $request->input('email');
192+
}
210193

211-
$user->detachAllRoles();
212-
$user->attachRole($request->input('role'));
213-
//$user->activated = 1;
194+
if ($request->input('password') != null) {
195+
$user->password = bcrypt($request->input('password'));
196+
}
214197

215-
$user->updated_ip_address = $ipAddress->getClientIp();
198+
$user->detachAllRoles();
199+
$user->attachRole($request->input('role'));
200+
$user->updated_ip_address = $ipAddress->getClientIp();
201+
$user->save();
216202

217-
$user->save();
218-
return back()->with('success', trans('usersmanagement.updateSuccess'));
219-
}
203+
return back()->with('success', trans('usersmanagement.updateSuccess'));
220204
}
221205

222206
/**
@@ -227,7 +211,6 @@ public function update(Request $request, $id)
227211
*/
228212
public function destroy($id)
229213
{
230-
231214
$currentUser = Auth::user();
232215
$user = User::findOrFail($id);
233216
$ipAddress = new CaptureIpTrait;
@@ -239,7 +222,7 @@ public function destroy($id)
239222
$user->delete();
240223
return redirect('users')->with('success', trans('usersmanagement.deleteSuccess'));
241224
}
242-
return back()->with('error', trans('usersmanagement.deleteSelfError'));
243225

226+
return back()->with('error', trans('usersmanagement.deleteSelfError'));
244227
}
245228
}

0 commit comments

Comments
 (0)