User can now change password
This commit is contained in:
parent
a59c36ab1a
commit
39af9758ee
|
@ -164,26 +164,31 @@ class UserController extends Controller
|
|||
|
||||
//$user->save();
|
||||
} else {
|
||||
if ($request->input('password') != $request->input('confirmpassword')) {
|
||||
return Response::detect("users.editpass");
|
||||
} elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
|
||||
return Response::detect("users.editpass");
|
||||
} else {
|
||||
/** @var User $user */
|
||||
$user->update($data);
|
||||
Auth::logout();
|
||||
if ($request->input('password') != null) {
|
||||
if ($request->input('password') != $request->input('confirmpassword')) {
|
||||
return Response::detect("users.editpass");
|
||||
} elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
|
||||
return Response::detect("users.editpass");
|
||||
} else {
|
||||
/** @var User $user */
|
||||
$user->update($data);
|
||||
Auth::logout();
|
||||
|
||||
return redirect()->route("users.login");
|
||||
return redirect()->route("users.login");
|
||||
}
|
||||
} else {
|
||||
$user->update($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// }
|
||||
|
||||
//$users = User::query()->paginate(20);
|
||||
$users = User::query()->paginate(20);
|
||||
|
||||
//return Response::detect("users.index", [
|
||||
// "users" => $users
|
||||
//]);
|
||||
return Response::detect("users.index", [
|
||||
"users" => $users
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue