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

Fixed compilation errors

Browse source
This commit is contained in:
Ziver Koc 2018-08-06 19:23:01 +02:00
parent 9c91d96ce7
commit 0066560d2c
12 changed files with 344 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/zall/action/ZalleryAction.java
View file

@ -7,38 +7,38 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import zall.bean.User; import zall.bean.User;
import zall.util.UserMessage;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.ui.UserMessageManager;
public abstract class ZalleryAction { public abstract class ZalleryAction {
private final String actionId; private final String actionId;
private final boolean requireUser; private final boolean requireUser;
public ZalleryAction(String actionId){ public ZalleryAction(String actionId) {
this(actionId, false); this(actionId, false);
} }
public ZalleryAction(String actionId, boolean requireUser){ public ZalleryAction(String actionId, boolean requireUser) {
this.actionId = actionId; this.actionId = actionId;
this.requireUser = requireUser; this.requireUser = requireUser;
} }
public abstract void handleRequest( public abstract void handleRequest(
DBConnection db, DBConnection db,
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
HttpSession session, HttpSession session,
PrintWriter out, PrintWriter out,
User user, User user,
UserMessage msgs) throws Exception; UserMessageManager msgs) throws Exception;
public String getActionId(){ public String getActionId() {
return actionId; return actionId;
} }
public boolean requireUser(){ public boolean requireUser() {
return requireUser; return requireUser;
} }
} }

13
src/zall/action/media/CommentAction.java
View file

@ -12,9 +12,10 @@ import zall.action.ZalleryAction;
import zall.bean.Comment; import zall.bean.Comment;
import zall.bean.Media; import zall.bean.Media;
import zall.bean.User; import zall.bean.User;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
public class CommentAction extends ZalleryAction{ public class CommentAction extends ZalleryAction{
@ -24,12 +25,11 @@ public class CommentAction extends ZalleryAction{
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 // Comments for media
if( request.getParameter("id") == null || request.getParameter("type") == null ){ if( request.getParameter("id") == null || request.getParameter("type") == null ){
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!");
return; return;
} }
long id = Long.parseLong(request.getParameter("id")); long id = Long.parseLong(request.getParameter("id"));
@ -41,8 +41,7 @@ public class CommentAction extends ZalleryAction{
media.addComment( cm ); media.addComment( cm );
media.save( db ); media.save( db );
if( out != null ) out.println("{ }"); msgs.add(new UserMessage(MessageLevel.INFO, "Comment saved."));
else msgs.add(MessageType.INFO, "Comment saved.");
} }

109
src/zall/action/media/CreateFolderAction.java
View file

@ -12,68 +12,67 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.Folder; import zall.bean.Folder;
import zall.bean.User; import zall.bean.User;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
public class CreateFolderAction extends ZalleryAction{ public class CreateFolderAction extends ZalleryAction {
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
public CreateFolderAction() { public CreateFolderAction() {
super("mkdir", true); super("mkdir", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Create Folder // Create Folder
String path = request.getParameter("dir"); String path = request.getParameter("dir");
Folder folder = Folder.load(db, path, user); Folder folder = Folder.load(db, path, user);
logger.info( "Creating new folder: /"+user.getName()+"/"+path ); logger.info("Creating new folder: /" + user.getName() + "/" + path);
// parent folder // parent folder
if( folder == null ){ if (folder == null) {
String[] dirs = path.split("/"); String[] dirs = path.split("/");
Folder parent = Folder.loadRoot(db, user); Folder parent = Folder.loadRoot(db, user);
if( user.isSuperUser() && path.charAt(0) == '/' ) if (user.isSuperUser() && path.charAt(0) == '/')
path = ""; path = "";
else{ else {
path = "/{NAME}"; path = "/{NAME}";
// Get root folder // Get root folder
parent = Folder.load(db, path, user); // Get user root folder parent = Folder.load(db, path, user); // Get user root folder
if( parent == null ){ // Create root folder if (parent == null) { // Create root folder
parent = Folder.loadRoot(db, user); // get root folder parent = Folder.loadRoot(db, user); // get root folder
folder = new Folder(); folder = new Folder();
folder.setUser( user ); folder.setUser(user);
folder.setParent( parent ); folder.setParent(parent);
folder.setName( "{NAME}" ); folder.setName("{NAME}");
folder.save( db ); folder.save(db);
parent = folder; parent = folder;
} }
} }
for(String dir : dirs){ for (String dir : dirs) {
if( dir.trim().isEmpty() ) // skip empty names if (dir.trim().isEmpty()) // skip empty names
continue; continue;
path += "/"+dir; path += "/" + dir;
folder = Folder.load(db, path, user); folder = Folder.load(db, path, user);
if(folder == null){ // create folder if (folder == null) { // create folder
folder = new Folder(); folder = new Folder();
folder.setUser( user ); folder.setUser(user);
folder.setParent( parent ); folder.setParent(parent);
folder.setName( dir ); folder.setName(dir);
folder.save( db ); folder.save(db);
} }
parent = folder; parent = folder;
} }
if(out != null) out.print( "{\"id\":"+folder.getId()+", \"name\":\""+folder.getPath()+"\"}" ); msgs.add(new UserMessage(MessageLevel.INFO, "Folder '" + path + "' has been successfully created.!"));
else msgs.add(MessageType.INFO, "Folder '"+path+"' has been successfully created.!"); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "The folder '" + path + "' already exists!"));
else if(out != null) out.println("{\"error\":\"The folder '"+path+"' already exists!\"}");
else msgs.add(MessageType.ERROR, "The folder '"+path+"' already exists!"); }
return;
}
} }

61
src/zall/action/media/ModifyMediaAction.java
View file

@ -12,44 +12,43 @@ import zall.action.ZalleryAction;
import zall.bean.Media; import zall.bean.Media;
import zall.bean.User; import zall.bean.User;
import zall.manager.AuthenticationManager; import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public ModifyMediaAction() {
super("modmedia", true); super("modmedia", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Edit media information // Edit media information
if( request.getParameter("id") == null || request.getParameter("type") == null ){ if (request.getParameter("id") == null || request.getParameter("type") == null) {
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!"); return;
return; }
} long id = Long.parseLong(request.getParameter("id"));
long id = Long.parseLong(request.getParameter("id")); Media media = Media.load(db, request.getParameter("type"), id);
Media media = Media.load(db, request.getParameter("type"), id);
if( media != null ){ if (media != null) {
if( AuthenticationManager.canEdit(user, media) ){ if (AuthenticationManager.canEdit(user, media)) {
media.setTitle( request.getParameter("title") ); media.setTitle(request.getParameter("title"));
media.setDescription( request.getParameter("description") ); media.setDescription(request.getParameter("description"));
media.save(db); media.save(db);
if(out != null) out.println("{}"); msgs.add(new UserMessage(MessageLevel.INFO, "Item edited successfully."));
else msgs.add(MessageType.INFO, "Item edited successfully."); }
} else
else if(out != null) out.println("{ \"error\": \"You are not authorize to modify this item!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to modify this item!"));
else msgs.add(MessageType.ERROR, "You are not authorize to modify this item!"); }
} else
else if(out != null) out.println("{ \"error\": \"No such item!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "The item does not exist!"));
else msgs.add(MessageType.ERROR, "The item does not exist!");
} }
} }

60
src/zall/action/media/RemoveFolderAction.java
View file

@ -12,44 +12,40 @@ import zall.action.ZalleryAction;
import zall.bean.Folder; import zall.bean.Folder;
import zall.bean.User; import zall.bean.User;
import zall.manager.AuthenticationManager; import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public RemoveFolderAction() {
super("rmdir", true); super("rmdir", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
//Remove Media //Remove Media
if( request.getParameter("id") == null){ if (request.getParameter("id") == null) {
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!"); return;
return; }
} long id = Long.parseLong(request.getParameter("id"));
long id = Long.parseLong(request.getParameter("id")); Folder folder = Folder.load(db, id);
Folder folder = Folder.load(db, id);
if( folder != null ){ if (folder != null) {
if( !folder.isEmpty(db) ){ if (!folder.isEmpty(db)) {
if(out != null) out.println("{ \"error\": \"Folder is not empty!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Folder is not empty!"));
else msgs.add(MessageType.ERROR, "Folder is not empty!"); } else if (AuthenticationManager.canEdit(user, folder)) {
} else if( AuthenticationManager.canEdit(user, folder) ){ folder.delete(db);
folder.delete( db ); msgs.add(new UserMessage(MessageLevel.INFO, "Folder removed successfully."));
if(out != null) out.println("{}"); } else
else msgs.add(MessageType.INFO, "Folder removed successfully."); msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete this folder!"));
} } else
else if(out != null) out.println("{ \"error\": \"You are not authorize to delete this folder!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "The folder does not exist!"));
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!");
} }
} }

55
src/zall/action/media/RemoveMediaAction.java
View file

@ -12,42 +12,39 @@ import zall.action.ZalleryAction;
import zall.bean.Media; import zall.bean.Media;
import zall.bean.User; import zall.bean.User;
import zall.manager.AuthenticationManager; import zall.manager.AuthenticationManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public RemoveMediaAction() {
super("rmmedia", true); super("rmmedia", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Remove media // Remove media
if( request.getParameter("id") == null || request.getParameter("type") == null ){ if (request.getParameter("id") == null || request.getParameter("type") == null) {
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!"); return;
return; }
} long id = Long.parseLong(request.getParameter("id"));
long id = Long.parseLong(request.getParameter("id")); Media media = Media.load(db, request.getParameter("type"), id);
Media media = Media.load(db, request.getParameter("type"), id);
if( media != null ){ if (media != null) {
if( AuthenticationManager.canEdit(user, media) ){ if (AuthenticationManager.canEdit(user, media)) {
media.delete( db ); media.delete(db);
if(out != null) out.println("{}"); msgs.add(new UserMessage(MessageLevel.INFO, "Item removed successfully."));
else msgs.add(MessageType.INFO, "Item removed successfully."); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete the item!"));
else if(out != null) out.println("{ \"error\": \"You are not authorize to delete the item!\"}"); } else
else msgs.add(MessageType.ERROR, "You are not authorize to delete the item!"); msgs.add(new UserMessage(MessageLevel.ERROR, "The item does not exist!"));
}
else if(out != null) out.println("{ \"error\": \"No such item!\"}");
else msgs.add(MessageType.ERROR, "The item does not exist!");
} }
} }

20
src/zall/action/media/TogglePrivateAction.java
View file

@ -11,24 +11,24 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.Folder; import zall.bean.Folder;
import zall.bean.User; import zall.bean.User;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
public class TogglePrivateAction extends ZalleryAction { public class TogglePrivateAction extends ZalleryAction {
public TogglePrivateAction() { public TogglePrivateAction() {
super("mkprivate", true); super("mkprivate", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Toggle folder private // Toggle folder private
if (request.getParameter("id") == null) { if (request.getParameter("id") == null) {
if (out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!");
return; return;
} }
long id = Long.parseLong(request.getParameter("id")); long id = Long.parseLong(request.getParameter("id"));

75
src/zall/action/user/ModifyUserAction.java
View file

@ -11,49 +11,46 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.User; import zall.bean.User;
import zall.manager.EmailManager; import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public ModifyUserAction() {
super("moduserstat", true); super("moduserstat", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Administration things of users // Administration things of users
if( user.isSuperUser() ){ if (user.isSuperUser()) {
User target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); User target_user = User.load(db, Long.parseLong(request.getParameter("id")));
// Enable user // Enable user
if( request.getParameter("enable") != null ){ if (request.getParameter("enable") != null) {
target_user.setEnabled( true ); target_user.setEnabled(true);
// Email the user about the activation // Email the user about the activation
EmailManager.sendActivationEmail(target_user); EmailManager.sendActivationEmail(target_user);
} }
// Disable user, can not disable one self! // Disable user, can not disable one self!
else if( request.getParameter("disable") != null && !user.equals( target_user ) ) else if (request.getParameter("disable") != null && !user.equals(target_user))
target_user.setEnabled( false ); target_user.setEnabled(false);
// Promote user to Admin // Promote user to Admin
else if( request.getParameter("setadmin") != null ) else if (request.getParameter("setadmin") != null)
target_user.setSuperUser( true ); target_user.setSuperUser(true);
// Degrade Admin to normal user, can not degrade one self! // Degrade Admin to normal user, can not degrade one self!
else if( request.getParameter("unadmin") != null && !user.equals( target_user ) ) else if (request.getParameter("unadmin") != null && !user.equals(target_user))
target_user.setSuperUser( false ); target_user.setSuperUser(false);
else{ else {
if( out != null ) out.println("{ }"); return;
return; }
} target_user.save(db);
target_user.save(db); msgs.add(new UserMessage(MessageLevel.INFO, "Account changes saved."));
if( out != null ) return;
out.println("{ }"); }
else }
msgs.add(MessageType.INFO, "Account changes saved.");
return;
}
}
} }

80
src/zall/action/user/ModifyUserStatusAction.java
View file

@ -12,53 +12,49 @@ import zall.action.ZalleryAction;
import zall.bean.User; import zall.bean.User;
import zall.manager.AuthenticationManager; import zall.manager.AuthenticationManager;
import zall.manager.EmailManager; import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public ModifyUserStatusAction() {
super("moduser", true); super("moduser", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
User target_user = null; User target_user = null;
if( request.getParameter("id") != null ) if (request.getParameter("id") != null)
target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); target_user = User.load(db, Long.parseLong(request.getParameter("id")));
else // set target user to the logged in user else // set target user to the logged in user
target_user = user; target_user = user;
if( AuthenticationManager.canEdit(user, target_user) ){ if (AuthenticationManager.canEdit(user, target_user)) {
if( request.getParameter("email") != null ) if (request.getParameter("email") != null)
target_user.setEmail( request.getParameter("email") ); target_user.setEmail(request.getParameter("email"));
if( request.getParameter("password") != null ){ if (request.getParameter("password") != null) {
if( target_user.getPassword() == null ) if (target_user.getPassword() == null)
target_user.setPassword( request.getParameter("password") ); target_user.setPassword(request.getParameter("password"));
else if( request.getParameter("oldPassword") != null ) else if (request.getParameter("oldPassword") != null)
if( target_user.getPassword().equals(request.getParameter("oldPassword")) ) if (target_user.getPassword().equals(request.getParameter("oldPassword")))
target_user.setPassword( request.getParameter("password") ); target_user.setPassword(request.getParameter("password"));
else{ else {
if(out != null) out.println("{ \"error\": \"Wrong password!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Wrong password!"));
else msgs.add(MessageType.ERROR, "Wrong password!"); return;
return; }
} }
} if (request.getParameter("name") != null)
if( request.getParameter("name") != null ) target_user.setName(request.getParameter("name"));
target_user.setName( request.getParameter("name") ); target_user.save(db);
target_user.save(db); if (!user.isEmailVerified())
if( !user.isEmailVerified() ) EmailManager.sendVerificationEmail(target_user);
EmailManager.sendVerificationEmail( target_user ); msgs.add(new UserMessage(MessageLevel.INFO, "Settings saved successfully."));
if( out != null ) } else
out.println("{ }"); msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to change these values!"));
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!");
}
} }

60
src/zall/action/user/RemoveUserAction.java
View file

@ -10,44 +10,40 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.User; import zall.bean.User;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public RemoveUserAction() {
super("rmuser", true); super("rmuser", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
// Remove user // Remove user
User target_user = null; User target_user = null;
if( request.getParameter("id") != null ) if (request.getParameter("id") != null)
target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); target_user = User.load(db, Long.parseLong(request.getParameter("id")));
else { else {
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!"); return;
return; }
}
if( target_user != null ){ if (target_user != null) {
if( user.isSuperUser() ){ if (user.isSuperUser()) {
target_user.delete(db); target_user.delete(db);
if( out != null ) out.println("{ }"); msgs.add(new UserMessage(MessageLevel.INFO, "User removed successfully."));
else msgs.add(MessageType.INFO, "User removed successfully."); }
} msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete that user!"));
else if(out != null) out.println("{ \"error\": \"You are not authorize to delete that user!\"}"); } else {
else msgs.add(MessageType.ERROR, "You are not authorize to delete that user!"); msgs.add(new UserMessage(MessageLevel.ERROR, "No such user!"));
} }
else { }
if(out != null) out.println("{ \"error\": \"No such user!\"}");
else msgs.add(MessageType.ERROR, "No such user!");
}
}
} }

62
src/zall/action/user/SendVerificationEmailAction.java
View file

@ -12,46 +12,42 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.User; import zall.bean.User;
import zall.manager.EmailManager; import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import zutil.ui.UserMessageManager.MessageLevel;
import zutil.ui.UserMessageManager.UserMessage;
public class SendVerificationEmailAction extends ZalleryAction{ public class SendVerificationEmailAction extends ZalleryAction {
private static final Logger logger = LogUtil.getLogger(); private static final Logger logger = LogUtil.getLogger();
public SendVerificationEmailAction() { public SendVerificationEmailAction() {
super("sendverfemail", true); super("sendverfemail", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
User target_user = null; User target_user = null;
if( request.getParameter("id") != null ) if (request.getParameter("id") != null)
target_user = User.load(db, Long.parseLong( request.getParameter("id") ) ); target_user = User.load(db, Long.parseLong(request.getParameter("id")));
else { else {
if(out != null) out.println("{ \"error\": \"Missing parameters!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "Missing parameters!"));
else msgs.add(MessageType.ERROR, "Missing parameters!"); return;
return; }
}
if( target_user != null ){ if (target_user != null) {
if( user.isSuperUser() ){ if (user.isSuperUser()) {
EmailManager.sendVerificationEmail(target_user); EmailManager.sendVerificationEmail(target_user);
logger.info("Verification email sent successfully to: "+user.getEmail()); logger.info("Verification email sent successfully to: " + user.getEmail());
if( out != null ) out.println("{ }"); msgs.add(new UserMessage(MessageLevel.INFO, "Verification email sent successfully."));
else msgs.add(MessageType.INFO, "Verification email sent successfully."); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize send verification emails!"));
else if(out != null) out.println("{ \"error\": \"You are not authorize send verification emails!\"}"); } else {
else msgs.add(MessageType.ERROR, "You are not authorize send verification emails!"); msgs.add(new UserMessage(MessageLevel.ERROR, "No such user!"));
} }
else { }
if(out != null) out.println("{ \"error\": \"No such user!\"}");
else msgs.add(MessageType.ERROR, "No such user!");
}
}
} }

53
src/zall/action/user/VerifyEmailAction.java
View file

@ -11,39 +11,36 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction; import zall.action.ZalleryAction;
import zall.bean.User; import zall.bean.User;
import zall.manager.EmailManager; import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection; 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() { public VerifyEmailAction() {
super("verfemail", true); super("verfemail", true);
} }
@Override @Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session, 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 {
User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id"))); User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id")));
if (verifiedUser != null) { if (verifiedUser != null) {
if (verifiedUser.verifyEmail(request.getParameter("hash"))) { if (verifiedUser.verifyEmail(request.getParameter("hash"))) {
if (verifiedUser.isEnabled()) if (verifiedUser.isEnabled())
if (out != null) out.println("{ }"); msgs.add(new UserMessage(MessageLevel.INFO, "Your email has been successfully verified"));
else msgs.add(MessageType.INFO, "Your email has been successfully verified"); else {
else { EmailManager.sendNewUserRegistrationToAdmin(verifiedUser, db);
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."));
if (out != null) out.println("{ }"); }
else verifiedUser.save(db);
msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin."); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid email verification hash!"));
verifiedUser.save(db); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid user id: " + request.getParameter("id")));
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"));
} }
} }