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

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

@ -7,8 +7,8 @@ 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 {
@ -31,7 +31,7 @@ public abstract class ZalleryAction {
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() {

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.");
} }

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

@ -12,10 +12,11 @@ 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();
@ -26,7 +27,7 @@ public class CreateFolderAction 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 {
// Create Folder // Create Folder
String path = request.getParameter("dir"); String path = request.getParameter("dir");
@ -68,12 +69,10 @@ public class CreateFolderAction extends ZalleryAction{
} }
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;
} }
} }

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

@ -12,9 +12,10 @@ 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 {
@ -24,12 +25,11 @@ public class ModifyMediaAction 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 {
// 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"));
@ -41,14 +41,13 @@ public class ModifyMediaAction extends ZalleryAction{
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 if(out != null) out.println("{ \"error\": \"You are not authorize to modify this item!\"}"); else
else msgs.add(MessageType.ERROR, "You are not authorize to modify this item!"); msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to modify this item!"));
} }
else if(out != null) out.println("{ \"error\": \"No such item!\"}"); else
else msgs.add(MessageType.ERROR, "The item does not exist!"); msgs.add(new UserMessage(MessageLevel.ERROR, "The item does not exist!"));
} }

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

@ -12,9 +12,10 @@ 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 {
@ -24,12 +25,11 @@ public class RemoveFolderAction 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 {
//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"));
@ -37,18 +37,14 @@ public class RemoveFolderAction extends ZalleryAction{
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);
if(out != null) out.println("{}"); msgs.add(new UserMessage(MessageLevel.INFO, "Folder removed successfully."));
else msgs.add(MessageType.INFO, "Folder removed successfully."); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete this folder!"));
else if(out != null) out.println("{ \"error\": \"You are not authorize to delete this folder!\"}"); } else
else msgs.add(MessageType.ERROR, "You are not authorize to delete this folder!"); msgs.add(new UserMessage(MessageLevel.ERROR, "The folder does not exist!"));
}
else if(out != null) out.println("{ \"error\": \"No such folder!\"}");
else msgs.add(MessageType.ERROR, "The folder does not exist!");
} }

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

@ -12,9 +12,10 @@ 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 {
@ -24,12 +25,11 @@ public class RemoveMediaAction 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 {
// 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"));
@ -39,14 +39,11 @@ public class RemoveMediaAction extends ZalleryAction{
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!");
} }

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

@ -11,9 +11,10 @@ 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 {
@ -23,12 +24,11 @@ public class TogglePrivateAction 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 {
// 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"));

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

@ -11,9 +11,10 @@ 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 {
@ -23,7 +24,7 @@ public class ModifyUserAction 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 {
// Administration things of users // Administration things of users
if (user.isSuperUser()) { if (user.isSuperUser()) {
@ -44,14 +45,10 @@ public class ModifyUserAction extends ZalleryAction{
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);
if( out != null ) msgs.add(new UserMessage(MessageLevel.INFO, "Account changes saved."));
out.println("{ }");
else
msgs.add(MessageType.INFO, "Account changes saved.");
return; return;
} }
} }

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

@ -12,9 +12,10 @@ 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 {
@ -24,7 +25,7 @@ public class ModifyUserStatusAction 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 {
User target_user = null; User target_user = null;
if (request.getParameter("id") != null) if (request.getParameter("id") != null)
@ -42,8 +43,7 @@ public class ModifyUserStatusAction extends ZalleryAction{
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;
} }
} }
@ -52,13 +52,9 @@ public class ModifyUserStatusAction extends ZalleryAction{
target_user.save(db); target_user.save(db);
if (!user.isEmailVerified()) if (!user.isEmailVerified())
EmailManager.sendVerificationEmail(target_user); EmailManager.sendVerificationEmail(target_user);
if( out != null ) msgs.add(new UserMessage(MessageLevel.INFO, "Settings saved successfully."));
out.println("{ }"); } else
else msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to change these values!"));
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!");
} }
} }

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

@ -10,9 +10,10 @@ 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 {
@ -22,15 +23,14 @@ public class RemoveUserAction 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 {
// 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;
} }
@ -38,15 +38,11 @@ public class RemoveUserAction extends ZalleryAction{
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.");
} }
else if(out != null) out.println("{ \"error\": \"You are not authorize to delete that user!\"}"); msgs.add(new UserMessage(MessageLevel.ERROR, "You are not authorize to delete that user!"));
else msgs.add(MessageType.ERROR, "You are not authorize to delete that user!"); } else {
} 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!");
} }
} }

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

@ -12,10 +12,11 @@ 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();
@ -26,14 +27,13 @@ public class SendVerificationEmailAction 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 {
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;
} }
@ -42,15 +42,11 @@ public class SendVerificationEmailAction extends ZalleryAction{
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!");
} }
} }

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

@ -11,9 +11,10 @@ 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 {
@ -23,26 +24,22 @@ public class VerifyEmailAction 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 {
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);
if (out != null) out.println("{ }"); msgs.add(new UserMessage(MessageLevel.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin."));
else
msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting for activation by an admin.");
} }
verifiedUser.save(db); verifiedUser.save(db);
} } else
else if (out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }"); msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid email verification hash!"));
else msgs.add(MessageType.ERROR, "Invalid email verification hash!"); } else
} msgs.add(new UserMessage(MessageLevel.ERROR, "Invalid user id: " + request.getParameter("id")));
else msgs.add(MessageType.ERROR, "Invalid user id: "+request.getParameter("id"));
} }