robustness
This commit is contained in:
parent
ac85bdafd7
commit
5f8d5e776d
1 changed files with 11 additions and 8 deletions
|
|
@ -92,15 +92,18 @@ public class Zallery extends HttpServlet{
|
||||||
|
|
||||||
// Verify email address
|
// Verify email address
|
||||||
if( action.equalsIgnoreCase("verfemail") ){
|
if( action.equalsIgnoreCase("verfemail") ){
|
||||||
User verfuser = User.load(db, Long.parseLong(request.getParameter("id")));
|
User verfUser = User.load(db, Long.parseLong(request.getParameter("id")));
|
||||||
if( verfuser.verifyEmail(request.getParameter("hash")) ){
|
if (verfUser != null) {
|
||||||
ZalleryEmail.sendNewUserRegistrationToAdmin(verfuser, db);
|
if( verfUser.verifyEmail(request.getParameter("hash")) ){
|
||||||
verfuser.save(db);
|
ZalleryEmail.sendNewUserRegistrationToAdmin(verfUser, db);
|
||||||
msgs.add(MessageType.INFO, "Your email has been successfully verified.");
|
verfUser.save(db);
|
||||||
msgs.add(MessageType.WARNING, "The account is waiting account activation by an admin.");
|
msgs.add(MessageType.INFO, "Your email has been successfully verified.");
|
||||||
|
msgs.add(MessageType.WARNING, "The account is waiting account activation by an admin.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
msgs.add(MessageType.ERROR, "Email verification failed!");
|
||||||
}
|
}
|
||||||
else
|
else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
|
||||||
msgs.add(MessageType.ERROR, "Email verification failed!");
|
|
||||||
}
|
}
|
||||||
// auth with cookie
|
// auth with cookie
|
||||||
if( user == null ){
|
if( user == null ){
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue