fixed most compilation errors
This commit is contained in:
parent
cd24ee74e3
commit
de503bd441
23 changed files with 208 additions and 475 deletions
|
|
@ -12,13 +12,8 @@ import javax.servlet.annotation.WebServlet;
|
|||
import javax.servlet.http.*;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Locale;
|
||||
import java.util.PropertyResourceBundle;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import static zall.ZalleryConstant.LANG_BASENAME;
|
||||
|
||||
@WebServlet("/register")
|
||||
public class RegisterServlet extends ZalleryServlet {
|
||||
private static Logger logger = LogUtil.getLogger();
|
||||
|
|
@ -38,8 +33,7 @@ public class RegisterServlet extends ZalleryServlet {
|
|||
|
||||
|
||||
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
|
||||
UserMessage msgHandler = UserMessage.getUserMessage(request.getSession());
|
||||
ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, Locale.getDefault());
|
||||
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
|
||||
|
||||
/*
|
||||
* Check inputs
|
||||
|
|
@ -52,20 +46,20 @@ public class RegisterServlet extends ZalleryServlet {
|
|||
String passwordRe = (String)request.getAttribute(INPUT_ID_PASSWORD_REPEATE);
|
||||
|
||||
if (firstName == null)
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.first_name_missing"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.first.name"));
|
||||
if (lastName == null)
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.last_name_missing"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.last.name"));
|
||||
if (email == null)
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.email_missing"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.email"));
|
||||
if (password == null)
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.password_missing"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.password"));
|
||||
if (passwordRe == null)
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.password_missing"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.password"));
|
||||
else if (passwordRe.equals(password))
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.password_not_matching"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.incorrect.password.matching"));
|
||||
|
||||
if(User.load(db, (String)request.getAttribute(INPUT_ID_EMAIL)) != null){
|
||||
msgHandler.add(UserMessage.MessageType.ERROR, lang.getString("error.email_exsists"));
|
||||
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.email_exists"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -81,8 +75,8 @@ public class RegisterServlet extends ZalleryServlet {
|
|||
ZalleryEmail.sendVerificationEmail( user );
|
||||
request.getSession().setAttribute("user", user);
|
||||
logger.info("Registered new user: "+user.getName()+".");
|
||||
msgHandler.add(UserMessage.MessageType.INFO,
|
||||
lang.getString("info.account_created") + lang.getString("info.verification_email_sent"));
|
||||
msgs.add(UserMessage.MessageType.INFO,
|
||||
lang.getString("info.created.account") + " " + lang.getString("info.sent.email.verification"));
|
||||
|
||||
include(JSP_FILE, request, response);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue