mwalbeck/laravel-elearning
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed the view you are redirected when creating a user, and changed password compare to use the laravel validator instead

Browse source
This commit is contained in:
mwalbeck 2016-10-31 14:35:00 +01:00
parent 1c28345ddf
commit 614258af16
5 changed files with 8 additions and 18 deletions

4
app/Http/Controllers/AdministrativeUserController.php
View file

@ -59,7 +59,7 @@ class AdministrativeUserController extends Controller
$user = new User;
$user->addUser($request->all());
return redirect("/" . Auth::user()->getAdminPath() . '/users');
return redirect("/" . Auth::user()->getAdminPath() . "/users/$user->id");
}
/**
@ -81,7 +81,7 @@ class AdministrativeUserController extends Controller
public function updateUser(User $user, StoreUser $request)
{
$this->authorize('update', $user);
$user->updateUser($request->all());
return redirect("/" . Auth::user()->getAdminPath() . "/users/group/$user->group_id");
}

11
app/Http/Controllers/HomeController.php
View file

@ -44,8 +44,8 @@ class HomeController extends Controller
public function updatePassword(Request $request)
{
$this->validate($request, [
"password1_new" => "required|string|alpha_dash|min:8",
"password2_new" => "required|string|alpha_dash|min:8"
"password" => "required|min:8|confirmed",
"password_confirmation" => "required_with:password"
]);
$user = Auth::user();
@ -55,12 +55,7 @@ class HomeController extends Controller
return redirect('/settings');
}
if (!$user->passwordCompare($request->get("password1_new"), $request->get("password2_new"))) {
$request->session()->flash("status_failed", "The new password didn't match");
return redirect('/settings');
}
$user->updatePassword($request->get("password1_new"));
$user->updatePassword($request->get("password"));
$request->session()->flash('status', 'Your password was updated successfully!');
return redirect('/settings');
}

2
app/Http/Requests/StoreUser.php
View file

@ -45,7 +45,7 @@ class StoreUser extends FormRequest
Rule::unique('users')->ignore($user_id),
"max:255",
],
"password" => "required|alpha_dash|min:8",
"password" => "required|min:8",
"group_id" => "integer|exists:groups,id|min:1",
"enabled" => "required|boolean",
"access_level" => "required|integer|min:1|max:3|access_mod",

5
app/User.php
View file

@ -50,11 +50,6 @@ class User extends Authenticatable
$this->password = password_hash($password, PASSWORD_DEFAULT);
}
public function passwordCompare($password1, $password2)
{
return $password1 === $password2;
}
public function passwordVerify($password)
{
return password_verify($password, $this->password);

4
resources/views/users/settings.blade.php
View file

@ -43,10 +43,10 @@
<input type="password" class="form-control" name="password_old" required>
<br>
<label>New Password</label>
<input type="password" class="form-control" name="password1_new" required>
<input type="password" class="form-control" name="password" required>
<br>
<label>Repeat New Password</label>
<input type="password" class="form-control" name="password2_new" required>
<input type="password" class="form-control" name="password_confirmation" required>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form>