Skip to content

Commit

Permalink
remove deprecated error call
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeremykenedy
jeremykenedy committed Sep 10, 2017
1 parent 1bb48bf commit 5bfbed0
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 93 deletions.
5 changes: 2 additions & 3 deletions app/Http/Controllers/Auth/RegisterController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use App\Traits\CaptureIpTrait;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Validator;

use jeremykenedy\LaravelRoles\Models\Role;

class RegisterController extends Controller {
Expand Down Expand Up @@ -43,8 +42,8 @@ class RegisterController extends Controller {
*/
public function __construct() {
$this->middleware('guest', [
'except' => 'logout'
]);
'except' => 'logout'
]);
}

/**
Expand Down
28 changes: 6 additions & 22 deletions app/Http/Controllers/ProfilesController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,7 @@ public function update($username, Request $request)
$profile_validator = $this->profile_validator($request->all());

if ($profile_validator->fails()) {

$this->throwValidationException(
$request, $profile_validator
);

return redirect('profile/'.$user->name.'/edit')->withErrors($validator)->withInput();
return back()->withErrors($profile_validator)->withInput();
}

if ($user->profile == null) {
Expand Down Expand Up @@ -200,7 +195,6 @@ public function validator(array $data)
*/
public function updateUserAccount(Request $request, $id)
{

$currentUser = \Auth::user();
$user = User::findOrFail($id);
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
Expand All @@ -221,9 +215,7 @@ public function updateUserAccount(Request $request, $id)
$validator = $this->validator($request->all(), $rules);

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
);
return back()->withErrors($validator)->withInput();
}

$user->name = $request->input('name');
Expand Down Expand Up @@ -252,7 +244,6 @@ public function updateUserAccount(Request $request, $id)
*/
public function updateUserPassword(Request $request, $id)
{

$currentUser = \Auth::user();
$user = User::findOrFail($id);
$ipAddress = new CaptureIpTrait;
Expand All @@ -270,9 +261,7 @@ public function updateUserPassword(Request $request, $id)
);

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
);
return back()->withErrors($validator)->withInput();
}

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

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

}

/**
Expand Down Expand Up @@ -357,16 +345,12 @@ public function deleteUserAccount(Request $request, $id)
]
);

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
);
}

if ($user->id != $currentUser->id) {

return redirect('profile/'.$user->name.'/edit')->with('error', trans('profile.errorDeleteNotYour'));
}

if ($validator->fails()) {
return back()->withErrors($validator)->withInput();
}

// Create and encrypt user account restore token
Expand Down
14 changes: 2 additions & 12 deletions app/Http/Controllers/ThemesManagementController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,7 @@ public function store(Request $request)
$validator = Validator::make($input, Theme::rules());

if ($validator->fails()) {

$this->throwValidationException(
$request, $validator
);

return redirect('themes/create')->withErrors($validator)->withInput();
return back()->withErrors($validator)->withInput();
}

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

if ($validator->fails()) {

$this->throwValidationException(
$request, $validator
);

return redirect('themes/'.$theme->id.'/edit')->withErrors($validator)->withInput();
return back()->withErrors($validator)->withInput();
}

$theme->fill($input)->save();
Expand Down
95 changes: 39 additions & 56 deletions app/Http/Controllers/UsersManagementController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public function index()
$roles = Role::all();

return View('usersmanagement.show-users', compact('users', 'roles'));

}

/**
Expand All @@ -50,7 +49,6 @@ public function index()
*/
public function create()
{

$roles = Role::all();

$data = [
Expand All @@ -68,7 +66,6 @@ public function create()
*/
public function store(Request $request)
{

$validator = Validator::make($request->all(),
[
'name' => 'required|max:255|unique:users',
Expand All @@ -94,34 +91,28 @@ public function store(Request $request)
);

if ($validator->fails()) {

$this->throwValidationException(
$request, $validator
);

} else {

$ipAddress = new CaptureIpTrait;
$profile = new Profile;

$user = User::create([
'name' => $request->input('name'),
'first_name' => $request->input('first_name'),
'last_name' => $request->input('last_name'),
'email' => $request->input('email'),
'password' => bcrypt($request->input('password')),
'token' => str_random(64),
'admin_ip_address' => $ipAddress->getClientIp(),
'activated' => 1
]);

$user->profile()->save($profile);
$user->attachRole($request->input('role'));
$user->save();

return redirect('users')->with('success', trans('usersmanagement.createSuccess'));

return back()->withErrors($validator)->withInput();
}

$ipAddress = new CaptureIpTrait;
$profile = new Profile;

$user = User::create([
'name' => $request->input('name'),
'first_name' => $request->input('first_name'),
'last_name' => $request->input('last_name'),
'email' => $request->input('email'),
'password' => bcrypt($request->input('password')),
'token' => str_random(64),
'admin_ip_address' => $ipAddress->getClientIp(),
'activated' => 1
]);

$user->profile()->save($profile);
$user->attachRole($request->input('role'));
$user->save();

return redirect('users')->with('success', trans('usersmanagement.createSuccess'));
}

/**
Expand All @@ -132,7 +123,6 @@ public function store(Request $request)
*/
public function show($id)
{

$user = User::find($id);

return view('usersmanagement.show-user')->withUser($user);
Expand All @@ -146,7 +136,6 @@ public function show($id)
*/
public function edit($id)
{

$user = User::findOrFail($id);
$roles = Role::all();

Expand All @@ -172,7 +161,6 @@ public function edit($id)
*/
public function update(Request $request, $id)
{

$currentUser = Auth::user();
$user = User::find($id);
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
Expand All @@ -190,33 +178,29 @@ public function update(Request $request, $id)
'password' => 'nullable|confirmed|min:6'
]);
}
if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
);
} else {
$user->name = $request->input('name');

$user->first_name = $request->input('first_name');
$user->last_name = $request->input('last_name');
if ($validator->fails()) {
return back()->withErrors($validator)->withInput();
}

if ($emailCheck) {
$user->email = $request->input('email');
}
$user->name = $request->input('name');
$user->first_name = $request->input('first_name');
$user->last_name = $request->input('last_name');

if ($request->input('password') != null) {
$user->password = bcrypt($request->input('password'));
}
if ($emailCheck) {
$user->email = $request->input('email');
}

$user->detachAllRoles();
$user->attachRole($request->input('role'));
//$user->activated = 1;
if ($request->input('password') != null) {
$user->password = bcrypt($request->input('password'));
}

$user->updated_ip_address = $ipAddress->getClientIp();
$user->detachAllRoles();
$user->attachRole($request->input('role'));
$user->updated_ip_address = $ipAddress->getClientIp();
$user->save();

$user->save();
return back()->with('success', trans('usersmanagement.updateSuccess'));
}
return back()->with('success', trans('usersmanagement.updateSuccess'));
}

/**
Expand All @@ -227,7 +211,6 @@ public function update(Request $request, $id)
*/
public function destroy($id)
{

$currentUser = Auth::user();
$user = User::findOrFail($id);
$ipAddress = new CaptureIpTrait;
Expand All @@ -239,7 +222,7 @@ public function destroy($id)
$user->delete();
return redirect('users')->with('success', trans('usersmanagement.deleteSuccess'));
}
return back()->with('error', trans('usersmanagement.deleteSelfError'));

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

0 comments on commit 5bfbed0

Please sign in to comment.