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