ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

updated email templates

Browse source
This commit is contained in:
Ziver Koc 2018-07-25 15:36:57 +02:00
parent de503bd441
commit 467151abd0
14 changed files with 106 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/zall/page/RegisterServlet.java
View file

@ -2,8 +2,10 @@ package zall.page;
import zall.ZalleryServlet;
import zall.bean.User;
import zall.util.UserMessage.MessageType;
import zall.util.ZalleryEmail;
import zall.util.UserMessage;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
@ -18,7 +20,7 @@ import java.util.logging.Logger;
public class RegisterServlet extends ZalleryServlet {
private static Logger logger = LogUtil.getLogger();
private static final String JSP_FILE = "register.jsp";
private static final String JSP_FILE = "page_register.jsp";
private static final String INPUT_ID_FIRST_NAME = "first-name";
private static final String INPUT_ID_LAST_NAME = "last-name";
@ -27,7 +29,26 @@ public class RegisterServlet extends ZalleryServlet {
private static final String INPUT_ID_PASSWORD_REPEATE = "password-re";
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, IOException {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, IOException, SQLException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
// Verify email address
String verifyEmailHash = request.getParameter("verifyemail");
if(!ObjectUtil.isEmpty(verifyEmailHash)){
User verfUser = User.load(db, Long.parseLong(request.getParameter("id")));
if (verfUser != null) {
if( verfUser.verifyEmail(request.getParameter("hash")) ){
ZalleryEmail.sendNewUserRegistrationToAdmin(verfUser, db);
verfUser.save(db);
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 msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
}
include(JSP_FILE, request, response);
}
@ -46,20 +67,20 @@ public class RegisterServlet extends ZalleryServlet {
String passwordRe = (String)request.getAttribute(INPUT_ID_PASSWORD_REPEATE);
if (firstName == null)
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.first.name"));
msgs.add(MessageType.ERROR, lang.getString("error.not.found.first.name"));
if (lastName == null)
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.last.name"));
msgs.add(MessageType.ERROR, lang.getString("error.not.found.last.name"));
if (email == null)
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.email"));
msgs.add(MessageType.ERROR, lang.getString("error.not.found.email"));
if (password == null)
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.password"));
msgs.add(MessageType.ERROR, lang.getString("error.not.found.password"));
if (passwordRe == null)
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.password"));
msgs.add(MessageType.ERROR, lang.getString("error.not.found.password"));
else if (passwordRe.equals(password))
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.incorrect.password.matching"));
msgs.add(MessageType.ERROR, lang.getString("error.incorrect.password.matching"));
if(User.load(db, (String)request.getAttribute(INPUT_ID_EMAIL)) != null){
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.email_exists"));
msgs.add(MessageType.ERROR, lang.getString("error.email_exists"));
return;
}
@ -75,9 +96,9 @@ public class RegisterServlet extends ZalleryServlet {
ZalleryEmail.sendVerificationEmail( user );
request.getSession().setAttribute("user", user);
logger.info("Registered new user: "+user.getName()+".");
msgs.add(UserMessage.MessageType.INFO,
msgs.add(MessageType.INFO,
lang.getString("info.created.account") + " " + lang.getString("info.sent.email.verification"));
include(JSP_FILE, request, response);
forward("/login", request, response);
}
}