From 0066560d2cd8590a248a9b35205d576365d30dc6 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Mon, 6 Aug 2018 19:23:01 +0200 Subject: [PATCH] Fixed compilation errors --- src/zall/action/ZalleryAction.java | 60 +++++----- src/zall/action/media/CommentAction.java | 13 +-- src/zall/action/media/CreateFolderAction.java | 109 +++++++++--------- src/zall/action/media/ModifyMediaAction.java | 65 +++++------ src/zall/action/media/RemoveFolderAction.java | 60 +++++----- src/zall/action/media/RemoveMediaAction.java | 55 +++++---- .../action/media/TogglePrivateAction.java | 20 ++-- src/zall/action/user/ModifyUserAction.java | 75 ++++++------ .../action/user/ModifyUserStatusAction.java | 80 ++++++------- src/zall/action/user/RemoveUserAction.java | 64 +++++----- .../user/SendVerificationEmailAction.java | 62 +++++----- src/zall/action/user/VerifyEmailAction.java | 53 ++++----- 12 files changed, 344 insertions(+), 372 deletions(-) diff --git a/src/zall/action/ZalleryAction.java b/src/zall/action/ZalleryAction.java index c37f2a9..fcf2fef 100644 --- a/src/zall/action/ZalleryAction.java +++ b/src/zall/action/ZalleryAction.java @@ -7,38 +7,38 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import zall.bean.User; -import zall.util.UserMessage; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; public abstract class ZalleryAction { - private final String actionId; - private final boolean requireUser; - - public ZalleryAction(String actionId){ - this(actionId, false); - } - - public ZalleryAction(String actionId, boolean requireUser){ - this.actionId = actionId; - this.requireUser = requireUser; - } - - public abstract void handleRequest( - DBConnection db, - HttpServletRequest request, - HttpServletResponse response, - HttpSession session, - PrintWriter out, - User user, - UserMessage msgs) throws Exception; - - - public String getActionId(){ - return actionId; - } - - public boolean requireUser(){ - return requireUser; - } + private final String actionId; + private final boolean requireUser; + + public ZalleryAction(String actionId) { + this(actionId, false); + } + + public ZalleryAction(String actionId, boolean requireUser) { + this.actionId = actionId; + this.requireUser = requireUser; + } + + public abstract void handleRequest( + DBConnection db, + HttpServletRequest request, + HttpServletResponse response, + HttpSession session, + PrintWriter out, + User user, + UserMessageManager msgs) throws Exception; + + + public String getActionId() { + return actionId; + } + + public boolean requireUser() { + return requireUser; + } } diff --git a/src/zall/action/media/CommentAction.java b/src/zall/action/media/CommentAction.java index c82bff8..73a68ca 100644 --- a/src/zall/action/media/CommentAction.java +++ b/src/zall/action/media/CommentAction.java @@ -12,9 +12,10 @@ import zall.action.ZalleryAction; import zall.bean.Comment; import zall.bean.Media; import zall.bean.User; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; public class CommentAction extends ZalleryAction{ @@ -24,12 +25,11 @@ public class CommentAction extends ZalleryAction{ @Override public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { // Comments for media if( request.getParameter("id") == null || request.getParameter("type") == null ){ - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); return; } long id = Long.parseLong(request.getParameter("id")); @@ -41,8 +41,7 @@ public class CommentAction extends ZalleryAction{ media.addComment( cm ); media.save( db ); - if( out != null ) out.println("{ }"); - else msgs.add(MessageType.INFO, "Comment saved."); + msgs.add(new UserMessage(MessageLevel.INFO, "Comment saved.")); } diff --git a/src/zall/action/media/CreateFolderAction.java b/src/zall/action/media/CreateFolderAction.java index ffa6fcb..268c569 100644 --- a/src/zall/action/media/CreateFolderAction.java +++ b/src/zall/action/media/CreateFolderAction.java @@ -12,68 +12,67 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.Folder; import zall.bean.User; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; import zutil.log.LogUtil; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class CreateFolderAction extends ZalleryAction{ - private static final Logger logger = LogUtil.getLogger(); +public class CreateFolderAction extends ZalleryAction { + private static final Logger logger = LogUtil.getLogger(); - public CreateFolderAction() { - super("mkdir", true); - } + public CreateFolderAction() { + super("mkdir", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - // Create Folder - String path = request.getParameter("dir"); - Folder folder = Folder.load(db, path, user); - logger.info( "Creating new folder: /"+user.getName()+"/"+path ); - // parent folder - if( folder == null ){ - String[] dirs = path.split("/"); - Folder parent = Folder.loadRoot(db, user); - if( user.isSuperUser() && path.charAt(0) == '/' ) - path = ""; - else{ - path = "/{NAME}"; + // Create Folder + String path = request.getParameter("dir"); + Folder folder = Folder.load(db, path, user); + logger.info("Creating new folder: /" + user.getName() + "/" + path); + // parent folder + if (folder == null) { + String[] dirs = path.split("/"); + Folder parent = Folder.loadRoot(db, user); + if (user.isSuperUser() && path.charAt(0) == '/') + path = ""; + else { + path = "/{NAME}"; - // Get root folder - parent = Folder.load(db, path, user); // Get user root folder - if( parent == null ){ // Create root folder - parent = Folder.loadRoot(db, user); // get root folder - folder = new Folder(); - folder.setUser( user ); - folder.setParent( parent ); - folder.setName( "{NAME}" ); - folder.save( db ); - parent = folder; - } - } + // Get root folder + parent = Folder.load(db, path, user); // Get user root folder + if (parent == null) { // Create root folder + parent = Folder.loadRoot(db, user); // get root folder + folder = new Folder(); + folder.setUser(user); + folder.setParent(parent); + folder.setName("{NAME}"); + folder.save(db); + parent = folder; + } + } - for(String dir : dirs){ - if( dir.trim().isEmpty() ) // skip empty names - continue; - path += "/"+dir; - folder = Folder.load(db, path, user); - if(folder == null){ // create folder - folder = new Folder(); - folder.setUser( user ); - folder.setParent( parent ); - folder.setName( dir ); - folder.save( db ); - } - parent = folder; - } - if(out != null) out.print( "{\"id\":"+folder.getId()+", \"name\":\""+folder.getPath()+"\"}" ); - else msgs.add(MessageType.INFO, "Folder '"+path+"' has been successfully created.!"); - } - else if(out != null) out.println("{\"error\":\"The folder '"+path+"' already exists!\"}"); - else msgs.add(MessageType.ERROR, "The folder '"+path+"' already exists!"); - return; - } + for (String dir : dirs) { + if (dir.trim().isEmpty()) // skip empty names + continue; + path += "/" + dir; + folder = Folder.load(db, path, user); + if (folder == null) { // create folder + folder = new Folder(); + folder.setUser(user); + folder.setParent(parent); + folder.setName(dir); + folder.save(db); + } + parent = folder; + } + msgs.add(new UserMessage(MessageLevel.INFO, "Folder '" + path + "' has been successfully created.!")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "The folder '" + path + "' already exists!")); + + } } diff --git a/src/zall/action/media/ModifyMediaAction.java b/src/zall/action/media/ModifyMediaAction.java index 09dbf45..a70b4e4 100755 --- a/src/zall/action/media/ModifyMediaAction.java +++ b/src/zall/action/media/ModifyMediaAction.java @@ -12,44 +12,43 @@ import zall.action.ZalleryAction; import zall.bean.Media; import zall.bean.User; import zall.manager.AuthenticationManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class ModifyMediaAction extends ZalleryAction{ +public class ModifyMediaAction extends ZalleryAction { - public ModifyMediaAction() { - super("modmedia", true); - } + public ModifyMediaAction() { + super("modmedia", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - // Edit media information - if( request.getParameter("id") == null || request.getParameter("type") == null ){ - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); - return; - } - long id = Long.parseLong(request.getParameter("id")); - Media media = Media.load(db, request.getParameter("type"), id); - - if( media != null ){ - if( AuthenticationManager.canEdit(user, media) ){ - media.setTitle( request.getParameter("title") ); - media.setDescription( request.getParameter("description") ); - media.save(db); - - if(out != null) out.println("{}"); - else msgs.add(MessageType.INFO, "Item edited successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize to modify this item!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize to modify this item!"); - } - else if(out != null) out.println("{ \"error\": \"No such item!\"}"); - else msgs.add(MessageType.ERROR, "The item does not exist!"); + // Edit media information + if (request.getParameter("id") == null || request.getParameter("type") == null) { + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); + return; + } + long id = Long.parseLong(request.getParameter("id")); + Media media = Media.load(db, request.getParameter("type"), id); - } + if (media != null) { + if (AuthenticationManager.canEdit(user, media)) { + media.setTitle(request.getParameter("title")); + media.setDescription(request.getParameter("description")); + media.save(db); + + msgs.add(new UserMessage(MessageLevel.INFO, "Item edited successfully.")); + } + else + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to modify this item!")); + } + else + msgs.add(new UserMessage(MessageLevel.ERROR, "The item does not exist!")); + + } } diff --git a/src/zall/action/media/RemoveFolderAction.java b/src/zall/action/media/RemoveFolderAction.java index 696029e..d3cfa3a 100755 --- a/src/zall/action/media/RemoveFolderAction.java +++ b/src/zall/action/media/RemoveFolderAction.java @@ -12,44 +12,40 @@ import zall.action.ZalleryAction; import zall.bean.Folder; import zall.bean.User; import zall.manager.AuthenticationManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class RemoveFolderAction extends ZalleryAction{ +public class RemoveFolderAction extends ZalleryAction { - public RemoveFolderAction() { - super("rmdir", true); - } + public RemoveFolderAction() { + super("rmdir", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - //Remove Media - if( request.getParameter("id") == null){ - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); - return; - } - long id = Long.parseLong(request.getParameter("id")); - Folder folder = Folder.load(db, id); + //Remove Media + if (request.getParameter("id") == null) { + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); + return; + } + long id = Long.parseLong(request.getParameter("id")); + Folder folder = Folder.load(db, id); - if( folder != null ){ - if( !folder.isEmpty(db) ){ - if(out != null) out.println("{ \"error\": \"Folder is not empty!\"}"); - else msgs.add(MessageType.ERROR, "Folder is not empty!"); - } else if( AuthenticationManager.canEdit(user, folder) ){ - folder.delete( db ); - if(out != null) out.println("{}"); - else msgs.add(MessageType.INFO, "Folder removed successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize to delete this folder!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize to delete this folder!"); - } - else if(out != null) out.println("{ \"error\": \"No such folder!\"}"); - else msgs.add(MessageType.ERROR, "The folder does not exist!"); + if (folder != null) { + if (!folder.isEmpty(db)) { + msgs.add(new UserMessage(MessageLevel.ERROR, "Folder is not empty!")); + } else if (AuthenticationManager.canEdit(user, folder)) { + folder.delete(db); + msgs.add(new UserMessage(MessageLevel.INFO, "Folder removed successfully.")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete this folder!")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "The folder does not exist!")); - } + } } diff --git a/src/zall/action/media/RemoveMediaAction.java b/src/zall/action/media/RemoveMediaAction.java index a40d6a1..3d971df 100755 --- a/src/zall/action/media/RemoveMediaAction.java +++ b/src/zall/action/media/RemoveMediaAction.java @@ -12,42 +12,39 @@ import zall.action.ZalleryAction; import zall.bean.Media; import zall.bean.User; import zall.manager.AuthenticationManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class RemoveMediaAction extends ZalleryAction{ +public class RemoveMediaAction extends ZalleryAction { - public RemoveMediaAction() { - super("rmmedia", true); - } + public RemoveMediaAction() { + super("rmmedia", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - // Remove media - if( request.getParameter("id") == null || request.getParameter("type") == null ){ - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); - return; - } - long id = Long.parseLong(request.getParameter("id")); - Media media = Media.load(db, request.getParameter("type"), id); + // Remove media + if (request.getParameter("id") == null || request.getParameter("type") == null) { + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); + return; + } + long id = Long.parseLong(request.getParameter("id")); + Media media = Media.load(db, request.getParameter("type"), id); - if( media != null ){ - if( AuthenticationManager.canEdit(user, media) ){ - media.delete( db ); + if (media != null) { + if (AuthenticationManager.canEdit(user, media)) { + media.delete(db); - if(out != null) out.println("{}"); - else msgs.add(MessageType.INFO, "Item removed successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize to delete the item!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize to delete the item!"); - } - else if(out != null) out.println("{ \"error\": \"No such item!\"}"); - else msgs.add(MessageType.ERROR, "The item does not exist!"); + msgs.add(new UserMessage(MessageLevel.INFO, "Item removed successfully.")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete the item!")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "The item does not exist!")); - } + } } diff --git a/src/zall/action/media/TogglePrivateAction.java b/src/zall/action/media/TogglePrivateAction.java index dfb6b97..a905142 100755 --- a/src/zall/action/media/TogglePrivateAction.java +++ b/src/zall/action/media/TogglePrivateAction.java @@ -11,24 +11,24 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.Folder; import zall.bean.User; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; public class TogglePrivateAction extends ZalleryAction { - public TogglePrivateAction() { - super("mkprivate", true); - } + public TogglePrivateAction() { + super("mkprivate", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { // Toggle folder private if (request.getParameter("id") == null) { - if (out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); return; } long id = Long.parseLong(request.getParameter("id")); diff --git a/src/zall/action/user/ModifyUserAction.java b/src/zall/action/user/ModifyUserAction.java index 20e2843..d7abf58 100755 --- a/src/zall/action/user/ModifyUserAction.java +++ b/src/zall/action/user/ModifyUserAction.java @@ -11,49 +11,46 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.User; import zall.manager.EmailManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class ModifyUserAction extends ZalleryAction{ +public class ModifyUserAction extends ZalleryAction { - public ModifyUserAction() { - super("moduserstat", true); - } + public ModifyUserAction() { + super("moduserstat", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - // Administration things of users - if( user.isSuperUser() ){ - User target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); - // Enable user - if( request.getParameter("enable") != null ){ - target_user.setEnabled( true ); - // Email the user about the activation - EmailManager.sendActivationEmail(target_user); - } - // Disable user, can not disable one self! - else if( request.getParameter("disable") != null && !user.equals( target_user ) ) - target_user.setEnabled( false ); - // Promote user to Admin - else if( request.getParameter("setadmin") != null ) - target_user.setSuperUser( true ); - // Degrade Admin to normal user, can not degrade one self! - else if( request.getParameter("unadmin") != null && !user.equals( target_user ) ) - target_user.setSuperUser( false ); - else{ - if( out != null ) out.println("{ }"); - return; - } - target_user.save(db); - if( out != null ) - out.println("{ }"); - else - msgs.add(MessageType.INFO, "Account changes saved."); - return; - } - } + // Administration things of users + if (user.isSuperUser()) { + User target_user = User.load(db, Long.parseLong(request.getParameter("id"))); + // Enable user + if (request.getParameter("enable") != null) { + target_user.setEnabled(true); + // Email the user about the activation + EmailManager.sendActivationEmail(target_user); + } + // Disable user, can not disable one self! + else if (request.getParameter("disable") != null && !user.equals(target_user)) + target_user.setEnabled(false); + // Promote user to Admin + else if (request.getParameter("setadmin") != null) + target_user.setSuperUser(true); + // Degrade Admin to normal user, can not degrade one self! + else if (request.getParameter("unadmin") != null && !user.equals(target_user)) + target_user.setSuperUser(false); + else { + return; + } + target_user.save(db); + msgs.add(new UserMessage(MessageLevel.INFO, "Account changes saved.")); + return; + } + } } diff --git a/src/zall/action/user/ModifyUserStatusAction.java b/src/zall/action/user/ModifyUserStatusAction.java index 3465745..37adc0e 100755 --- a/src/zall/action/user/ModifyUserStatusAction.java +++ b/src/zall/action/user/ModifyUserStatusAction.java @@ -12,53 +12,49 @@ import zall.action.ZalleryAction; import zall.bean.User; import zall.manager.AuthenticationManager; import zall.manager.EmailManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class ModifyUserStatusAction extends ZalleryAction{ +public class ModifyUserStatusAction extends ZalleryAction { - public ModifyUserStatusAction() { - super("moduser", true); - } + public ModifyUserStatusAction() { + super("moduser", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - User target_user = null; - if( request.getParameter("id") != null ) - target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); - else // set target user to the logged in user - target_user = user; + User target_user = null; + if (request.getParameter("id") != null) + target_user = User.load(db, Long.parseLong(request.getParameter("id"))); + else // set target user to the logged in user + target_user = user; - if( AuthenticationManager.canEdit(user, target_user) ){ - if( request.getParameter("email") != null ) - target_user.setEmail( request.getParameter("email") ); - if( request.getParameter("password") != null ){ - if( target_user.getPassword() == null ) - target_user.setPassword( request.getParameter("password") ); - else if( request.getParameter("oldPassword") != null ) - if( target_user.getPassword().equals(request.getParameter("oldPassword")) ) - target_user.setPassword( request.getParameter("password") ); - else{ - if(out != null) out.println("{ \"error\": \"Wrong password!\"}"); - else msgs.add(MessageType.ERROR, "Wrong password!"); - return; - } - } - if( request.getParameter("name") != null ) - target_user.setName( request.getParameter("name") ); - target_user.save(db); - if( !user.isEmailVerified() ) - EmailManager.sendVerificationEmail( target_user ); - if( out != null ) - out.println("{ }"); - else - msgs.add(MessageType.INFO, "Settings saved successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize to change these values!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize to change these values!"); - } + if (AuthenticationManager.canEdit(user, target_user)) { + if (request.getParameter("email") != null) + target_user.setEmail(request.getParameter("email")); + if (request.getParameter("password") != null) { + if (target_user.getPassword() == null) + target_user.setPassword(request.getParameter("password")); + else if (request.getParameter("oldPassword") != null) + if (target_user.getPassword().equals(request.getParameter("oldPassword"))) + target_user.setPassword(request.getParameter("password")); + else { + msgs.add(new UserMessage(MessageLevel.ERROR, "Wrong password!")); + return; + } + } + if (request.getParameter("name") != null) + target_user.setName(request.getParameter("name")); + target_user.save(db); + if (!user.isEmailVerified()) + EmailManager.sendVerificationEmail(target_user); + msgs.add(new UserMessage(MessageLevel.INFO, "Settings saved successfully.")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to change these values!")); + } } diff --git a/src/zall/action/user/RemoveUserAction.java b/src/zall/action/user/RemoveUserAction.java index 96d5b6d..1c66d6d 100644 --- a/src/zall/action/user/RemoveUserAction.java +++ b/src/zall/action/user/RemoveUserAction.java @@ -10,44 +10,40 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.User; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class RemoveUserAction extends ZalleryAction{ +public class RemoveUserAction extends ZalleryAction { - public RemoveUserAction() { - super("rmuser", true); - } + public RemoveUserAction() { + super("rmuser", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { - - // Remove user - User target_user = null; - if( request.getParameter("id") != null ) - target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); - else { - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); - return; - } + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - if( target_user != null ){ - if( user.isSuperUser() ){ - target_user.delete(db); - - if( out != null ) out.println("{ }"); - else msgs.add(MessageType.INFO, "User removed successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize to delete that user!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize to delete that user!"); - } - else { - if(out != null) out.println("{ \"error\": \"No such user!\"}"); - else msgs.add(MessageType.ERROR, "No such user!"); - } - } + // Remove user + User target_user = null; + if (request.getParameter("id") != null) + target_user = User.load(db, Long.parseLong(request.getParameter("id"))); + else { + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); + return; + } + + if (target_user != null) { + if (user.isSuperUser()) { + target_user.delete(db); + + msgs.add(new UserMessage(MessageLevel.INFO, "User removed successfully.")); + } + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete that user!")); + } else { + msgs.add(new UserMessage(MessageLevel.ERROR, "No such user!")); + } + } } diff --git a/src/zall/action/user/SendVerificationEmailAction.java b/src/zall/action/user/SendVerificationEmailAction.java index 7a0cd56..e088d05 100755 --- a/src/zall/action/user/SendVerificationEmailAction.java +++ b/src/zall/action/user/SendVerificationEmailAction.java @@ -12,46 +12,42 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.User; import zall.manager.EmailManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; import zutil.log.LogUtil; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class SendVerificationEmailAction extends ZalleryAction{ - private static final Logger logger = LogUtil.getLogger(); +public class SendVerificationEmailAction extends ZalleryAction { + private static final Logger logger = LogUtil.getLogger(); - public SendVerificationEmailAction() { - super("sendverfemail", true); - } + public SendVerificationEmailAction() { + super("sendverfemail", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - User target_user = null; - if( request.getParameter("id") != null ) - target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); - else { - if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); - else msgs.add(MessageType.ERROR, "Missing parameters!"); - return; - } + User target_user = null; + if (request.getParameter("id") != null) + target_user = User.load(db, Long.parseLong(request.getParameter("id"))); + else { + msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!")); + return; + } - if( target_user != null ){ - if( user.isSuperUser() ){ - EmailManager.sendVerificationEmail(target_user); + if (target_user != null) { + if (user.isSuperUser()) { + EmailManager.sendVerificationEmail(target_user); - logger.info("Verification email sent successfully to: "+user.getEmail()); - if( out != null ) out.println("{ }"); - else msgs.add(MessageType.INFO, "Verification email sent successfully."); - } - else if(out != null) out.println("{ \"error\": \"You are not authorize send verification emails!\"}"); - else msgs.add(MessageType.ERROR, "You are not authorize send verification emails!"); - } - else { - if(out != null) out.println("{ \"error\": \"No such user!\"}"); - else msgs.add(MessageType.ERROR, "No such user!"); - } - } + logger.info("Verification email sent successfully to: " + user.getEmail()); + msgs.add(new UserMessage(MessageLevel.INFO, "Verification email sent successfully.")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize send verification emails!")); + } else { + msgs.add(new UserMessage(MessageLevel.ERROR, "No such user!")); + } + } } diff --git a/src/zall/action/user/VerifyEmailAction.java b/src/zall/action/user/VerifyEmailAction.java index 5919fc3..99ff8c8 100755 --- a/src/zall/action/user/VerifyEmailAction.java +++ b/src/zall/action/user/VerifyEmailAction.java @@ -11,39 +11,36 @@ import javax.servlet.http.HttpSession; import zall.action.ZalleryAction; import zall.bean.User; import zall.manager.EmailManager; -import zall.util.UserMessage; -import zall.util.UserMessage.MessageType; import zutil.db.DBConnection; +import zutil.ui.UserMessageManager; +import zutil.ui.UserMessageManager.MessageLevel; +import zutil.ui.UserMessageManager.UserMessage; -public class VerifyEmailAction extends ZalleryAction{ +public class VerifyEmailAction extends ZalleryAction { - public VerifyEmailAction() { - super("verfemail", true); - } + public VerifyEmailAction() { + super("verfemail", true); + } - @Override - public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, - PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException { + @Override + public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, + PrintWriter out, User user, UserMessageManager msgs) throws SQLException, IOException { - User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id"))); - if (verifiedUser != null) { - if (verifiedUser.verifyEmail(request.getParameter("hash"))) { - if (verifiedUser.isEnabled()) - if (out != null) out.println("{ }"); - else msgs.add(MessageType.INFO, "Your email has been successfully verified"); - else { - EmailManager.sendNewUserRegistrationToAdmin(verifiedUser, db); - if (out != null) out.println("{ }"); - else - msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin."); - } - verifiedUser.save(db); - } - else if (out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }"); - else msgs.add(MessageType.ERROR, "Invalid email verification hash!"); - } - else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id")); + User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id"))); + if (verifiedUser != null) { + if (verifiedUser.verifyEmail(request.getParameter("hash"))) { + if (verifiedUser.isEnabled()) + msgs.add(new UserMessage(MessageLevel.INFO, "Your email has been successfully verified")); + else { + EmailManager.sendNewUserRegistrationToAdmin(verifiedUser, db); + msgs.add(new UserMessage(MessageLevel.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin.")); + } + verifiedUser.save(db); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid email verification hash!")); + } else + msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid user id: " + request.getParameter("id"))); - } + } }