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

Moved email stuff to zutil and moved transoced to its own package

Browse source
This commit is contained in:
Ziver Koc 2016-12-22 16:24:46 +01:00
parent 05048442a1
commit 7cac4e155c
20 changed files with 518 additions and 537 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/zall/action/RegisterAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -40,7 +41,7 @@ public class RegisterAction extends ZalleryAction{
user.setPassword( request.getParameter("password") );
user.setName( request.getParameter("name") );
user.save(db);
ZalleryAjax.sendEmailVerification( user );
ZalleryEmail.sendVerificationEmail( user );
logger.info("Registered new user: "+user.getName()+".");
session.setAttribute("user", user);
if(out != null) out.println("{ \"id\":"+user.getId()+" }");

11
src/zall/action/user/ModifyUserAction.java Normal file → Executable file
View file

@ -11,8 +11,9 @@ import javax.servlet.http.HttpSession;
import zall.Zallery;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.Email;
import zall.util.Email.ContentType;
import zall.util.ZalleryEmail;
import zutil.net.smtp.Email;
import zutil.net.smtp.Email.ContentType;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -34,11 +35,7 @@ public class ModifyUserAction extends ZalleryAction{
if( request.getParameter("enable") != null ){
target_user.setEnabled( true );
// Email the user about the activation
Email email = new Email("admin@koc.se", target_user.getEmail());
email.setSubject("Account activation at "+Zallery.getWebsiteName());
email.setContentType(ContentType.HTML);
email.setMessage("Your account has now been activated by an admin. You can now login and use the site. " +
"<a href='"+Zallery.getWebsiteURL()+"'>"+Zallery.getWebsiteURL()+"</a>");
ZalleryEmail.sendActivationEmail(target_user);
}
// Disable user, can not disable one self!
else if( request.getParameter("disable") != null && !user.equals( target_user ) )

4
src/zall/action/user/ModifyUserStatusAction.java Normal file → Executable file
View file

@ -8,9 +8,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -50,7 +50,7 @@ public class ModifyUserStatusAction extends ZalleryAction{
target_user.setName( request.getParameter("name") );
target_user.save(db);
if( !user.isEmailVerified() )
ZalleryAjax.sendEmailVerification( target_user );
ZalleryEmail.sendVerificationEmail( target_user );
if( out != null )
out.println("{ }");
else

4
src/zall/action/user/SendVerificationEmailAction.java Normal file → Executable file
View file

@ -9,9 +9,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -39,7 +39,7 @@ public class SendVerificationEmailAction extends ZalleryAction{
if( target_user != null ){
if( user.isSuperUser() ){
ZalleryAjax.sendEmailVerification(target_user);
ZalleryEmail.sendVerificationEmail(target_user);
logger.info("Verification email sent successfully to: "+user.getEmail());
if( out != null ) out.println("{ }");

11
src/zall/action/user/VerifyEmailAction.java Normal file → Executable file
View file

@ -11,6 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.ZalleryAjax;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.msg.UserMessage;
import zall.util.msg.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -25,17 +26,17 @@ public class VerifyEmailAction extends ZalleryAction{
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException {
User verfuser = User.load(db, Long.parseLong(request.getParameter("id")));
if( verfuser.verifyEmail(request.getParameter("hash")) ){
if( verfuser.isEnabled() )
User verifiedUser = User.load(db, Long.parseLong(request.getParameter("id")));
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 {
ZalleryAjax.sendEmailNewUserToAdmin(verfuser, db);
ZalleryEmail.sendNewUserRegistrationToAdmin(verifiedUser, db);
if(out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified, the account is waiting account activation by an admin.");
}
verfuser.save(db);
verifiedUser.save(db);
}
else if(out != null) out.println("{ \"error\":\"Invalid email verification hash!\" }");
else msgs.add(MessageType.ERROR, "Invalid email verification hash!");