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

Renamed lang references, switched to zutil UserMessageManager

Browse source
This commit is contained in:
Ziver Koc 2018-08-06 18:53:40 +02:00
parent b84f583d1c
commit 9c91d96ce7
27 changed files with 245 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/zall/page/GalleryServlet.java
View file

@ -1,13 +1,16 @@
package zall.page;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.Folder;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@ -30,7 +33,7 @@ public class GalleryServlet extends ZalleryServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
User user = AuthenticationManager.getUserSession(request.getSession());
Folder folder;
if (request.getParameter("folder") != null)
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")));
else {
@ -41,7 +44,7 @@ public class GalleryServlet extends ZalleryServlet {
folder.save(db);
}
}
List<Media> list = Media.load(db, folder);
List<Folder> subFolders = Folder.loadSubFolders(db, folder, user);
@ -55,11 +58,11 @@ public class GalleryServlet extends ZalleryServlet {
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
User user = AuthenticationManager.getUserSession(request.getSession());
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
long id = Long.parseLong(request.getParameter("id"));
if (request.getParameter("id") == null) {
msgs.add(UserMessage.MessageType.ERROR, "id" + lang.getString("error.not.found.parameter"));
msgs.add(new UserMessage(MessageLevel.ERROR, "id " + lang.getString("parameter.not.found")));
return;
}
@ -77,16 +80,16 @@ public class GalleryServlet extends ZalleryServlet {
folder.setPrivate(!folder.isPrivate());
folder.save(db);
if (folder.isPrivate())
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.modify.folder.is.private"));
msgs.add(new UserMessage(MessageLevel.SUCCESS, lang.getString("folder.modify.is.private")));
else
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.modify.folder.is.public"));
msgs.add(new UserMessage(MessageLevel.SUCCESS, lang.getString("folder.modify.is.public")));
} else
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.allowed.edit.folder"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("folder.modify.not.allowed")));
} else
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.folder"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("folder.not.found")));
break;
}
doGet(request, response, db);
}
}

8
src/zall/page/LoginServlet.java
View file

@ -1,11 +1,13 @@
package zall.page;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@ -46,7 +48,7 @@ public class LoginServlet extends ZalleryServlet {
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, ServletException, IOException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
User user = AuthenticationManager.authenticate(db,
request.getParameter(FORM_EMAIL),
request.getParameter(FORM_PASSWORD),
@ -59,7 +61,7 @@ public class LoginServlet extends ZalleryServlet {
}
// Failed login
else {
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.incorrect.user_or_pass"));
msgs.add(new UserMessageManager.UserMessage(MessageLevel.ERROR, lang.getString("incorrect.user_or_pass")));
}
doGet(request, response, db);

21
src/zall/page/MediaServlet.java
View file

@ -1,13 +1,16 @@
package zall.page;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.Comment;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@ -27,10 +30,10 @@ public class MediaServlet extends ZalleryServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, SQLException, IOException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
if (request.getParameter("id") == null && request.getParameter("type") == null) {
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.parameter"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found")));
return;
}
try {
@ -46,12 +49,12 @@ public class MediaServlet extends ZalleryServlet {
}
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, ServletException, IOException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
User user = AuthenticationManager.getUserSession(request.getSession());
long id = Long.parseLong(request.getParameter("id"));
if (request.getParameter("id") == null || request.getParameter("type") == null) {
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.parameter"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found")));
return;
}
@ -69,7 +72,7 @@ public class MediaServlet extends ZalleryServlet {
media.addComment(cm);
media.save(db);
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.created.comment"));
msgs.add(new UserMessage(MessageLevel.INFO, lang.getString("comment.created")));
break;
// -----------------------------------------
@ -83,11 +86,11 @@ public class MediaServlet extends ZalleryServlet {
media.setDescription(request.getParameter("description"));
media.save(db);
msgs.add(UserMessage.MessageType.INFO, lang.getString("info.modify.successfully"));
msgs.add(new UserMessage(MessageLevel.SUCCESS, lang.getString("modify.successfully")));
} else
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.allowed.edit.media"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("media.modify.not.allowed")));
} else
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.found.media"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("media.not.found")));
break;
}

45
src/zall/page/ProfileServlet.java
View file

@ -1,11 +1,14 @@
package zall.page;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@ -17,33 +20,33 @@ import java.util.logging.Logger;
@WebServlet(ProfileServlet.URI)
public class ProfileServlet extends ZalleryServlet {
private static Logger logger = LogUtil.getLogger();
private static Logger logger = LogUtil.getLogger();
public static final String URI = "/profile";
private static final String JSP_FILE = "page_profile.jsp";
public static final String URI = "/profile";
private static final String JSP_FILE = "page_profile.jsp";
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, IOException, SQLException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
User user = AuthenticationManager.getUserSession(request.getSession());
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, IOException, SQLException {
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
User user = AuthenticationManager.getUserSession(request.getSession());
if(request.getParameter("id") != null){
User profile_user = User.load(db, Long.parseLong( request.getParameter("id") ));
if(AuthenticationManager.canEdit(user, profile_user)){
request.setAttribute("profile_user", profile_user);
} else {
msgs.add(UserMessage.MessageType.ERROR, lang.getString("error.not.allowed.edit.user"));
}
} else {
request.setAttribute("profile_user", user);
}
if (request.getParameter("id") != null) {
User profile_user = User.load(db, Long.parseLong(request.getParameter("id")));
if (AuthenticationManager.canEdit(user, profile_user)) {
request.setAttribute("profile_user", profile_user);
} else {
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("user.modify.not.allowed")));
}
} else {
request.setAttribute("profile_user", user);
}
include(JSP_FILE, request, response);
include(JSP_FILE, request, response);
}
}
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
doGet(request, response, db);
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
doGet(request, response, db);
}
}

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

@ -1,13 +1,15 @@
package zall.page;
import zall.Zallery;
import zall.ZalleryServlet;
import zall.bean.User;
import zall.util.UserMessage.MessageType;
import zall.util.ZalleryEmail;
import zall.util.UserMessage;
import zall.manager.EmailManager;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@ -31,23 +33,27 @@ public class RegisterServlet extends ZalleryServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, IOException, SQLException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
// Verify email address
String verifyEmailHash = request.getParameter("verifyemail");
if(!ObjectUtil.isEmpty(verifyEmailHash)){
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);
if (verfUser.verifyEmail(request.getParameter("hash"))) {
EmailManager.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.");
msgs.add(new UserMessage(MessageLevel.SUCCESS, lang.getString("email.verification.success")));
msgs.add(new UserMessage(MessageLevel.WARNING, lang.getString("user.disabled")));
} else {
logger.severe("Email verification failed, incorrect hash " + verfUser.getEmail() +
"(user) " + request.getParameter("hash") + " = (server) " + verfUser.generateEmailVerificationHash());
msgs.add(new UserMessage(MessageLevel.ERROR, "Email verification failed."));
}
else
msgs.add(MessageType.ERROR, "Email verification failed!");
} else {
logger.severe("Email verification failed, unknown user: " + request.getParameter("id"));
msgs.add(new UserMessage(MessageLevel.ERROR, "Email verification failed."));
}
else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
}
include(JSP_FILE, request, response);
@ -55,33 +61,33 @@ public class RegisterServlet extends ZalleryServlet {
public void doPost(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws SQLException, IOException, ServletException {
UserMessage msgs = UserMessage.getUserMessage(request.getSession());
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
/*
* Check inputs
*/
String firstName = (String)request.getAttribute(INPUT_ID_FIRST_NAME);
String lastName = (String)request.getAttribute(INPUT_ID_LAST_NAME);
String email = (String)request.getAttribute(INPUT_ID_EMAIL);
String password = (String)request.getAttribute(INPUT_ID_PASSWORD);
String passwordRe = (String)request.getAttribute(INPUT_ID_PASSWORD_REPEATE);
String firstName = (String) request.getAttribute(INPUT_ID_FIRST_NAME);
String lastName = (String) request.getAttribute(INPUT_ID_LAST_NAME);
String email = (String) request.getAttribute(INPUT_ID_EMAIL);
String password = (String) request.getAttribute(INPUT_ID_PASSWORD);
String passwordRe = (String) request.getAttribute(INPUT_ID_PASSWORD_REPEATE);
if (firstName == null)
msgs.add(MessageType.ERROR, lang.getString("error.not.found.first.name"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found.first.name")));
if (lastName == null)
msgs.add(MessageType.ERROR, lang.getString("error.not.found.last.name"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found.last.name")));
if (email == null)
msgs.add(MessageType.ERROR, lang.getString("error.not.found.email"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found.email")));
if (password == null)
msgs.add(MessageType.ERROR, lang.getString("error.not.found.password"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found.password")));
if (passwordRe == null)
msgs.add(MessageType.ERROR, lang.getString("error.not.found.password"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.not.found.password")));
else if (passwordRe.equals(password))
msgs.add(MessageType.ERROR, lang.getString("error.incorrect.password.matching"));
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.incorrect.password.match")));
if(User.load(db, (String)request.getAttribute(INPUT_ID_EMAIL)) != null){
msgs.add(MessageType.ERROR, lang.getString("error.email_exists"));
if (User.load(db, (String) request.getAttribute(INPUT_ID_EMAIL)) != null) {
msgs.add(new UserMessage(MessageLevel.ERROR, lang.getString("parameter.email.exists")));
return;
}
@ -94,11 +100,11 @@ public class RegisterServlet extends ZalleryServlet {
user.setEmail(email);
user.setPassword(password);
user.save(db);
ZalleryEmail.sendVerificationEmail( user );
EmailManager.sendVerificationEmail(user);
request.getSession().setAttribute("user", user);
logger.info("Registered new user: "+user.getName()+".");
msgs.add(MessageType.INFO,
lang.getString("info.created.account") + " " + lang.getString("info.sent.email.verification"));
logger.info("Registered new user: " + user.getName() + ".");
msgs.add(new UserMessage(MessageLevel.INFO,
lang.getString("account.created") + " " + lang.getString("email.verification.sent")));
forward("/login", request, response);
}

4
src/zall/page/UserListServlet.java
View file

@ -22,10 +22,10 @@ public class UserListServlet extends ZalleryServlet {
private static final String JSP_FILE = "page_users.jsp";
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, SQLException, IOException {
public void doGet(HttpServletRequest request, HttpServletResponse response, DBConnection db) throws ServletException, SQLException, IOException {
List<User> users = User.load(db);
request.setAttribute("users", users);
include(JSP_FILE, request, response);
}
}
}