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

Renamed lang references, switched to zutil UserMessageManager

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

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

@ -10,7 +10,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -32,7 +32,7 @@ public class ModifyUserAction extends ZalleryAction{
if( request.getParameter("enable") != null ){
target_user.setEnabled( true );
// Email the user about the activation
ZalleryEmail.sendActivationEmail(target_user);
EmailManager.sendActivationEmail(target_user);
}
// Disable user, can not disable one self!
else if( request.getParameter("disable") != null && !user.equals( target_user ) )
@ -48,9 +48,9 @@ public class ModifyUserAction extends ZalleryAction{
return;
}
target_user.save(db);
if( out != null )
if( out != null )
out.println("{ }");
else
else
msgs.add(MessageType.INFO, "Account changes saved.");
return;
}

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

@ -11,7 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.ZalleryEmail;
import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -41,7 +41,7 @@ public class ModifyUserStatusAction extends ZalleryAction{
else if( request.getParameter("oldPassword") != null )
if( target_user.getPassword().equals(request.getParameter("oldPassword")) )
target_user.setPassword( request.getParameter("password") );
else{
else{
if(out != null) out.println("{ \"error\": \"Wrong password!\"}");
else msgs.add(MessageType.ERROR, "Wrong password!");
return;
@ -51,8 +51,8 @@ public class ModifyUserStatusAction extends ZalleryAction{
target_user.setName( request.getParameter("name") );
target_user.save(db);
if( !user.isEmailVerified() )
ZalleryEmail.sendVerificationEmail( target_user );
if( out != null )
EmailManager.sendVerificationEmail( target_user );
if( out != null )
out.println("{ }");
else
msgs.add(MessageType.INFO, "Settings saved successfully.");

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

@ -11,7 +11,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -27,7 +27,7 @@ public class SendVerificationEmailAction extends ZalleryAction{
@Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException {
User target_user = null;
if( request.getParameter("id") != null )
target_user = User.load(db, Long.parseLong( request.getParameter("id") ) );
@ -39,8 +39,8 @@ public class SendVerificationEmailAction extends ZalleryAction{
if( target_user != null ){
if( user.isSuperUser() ){
ZalleryEmail.sendVerificationEmail(target_user);
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.");

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

@ -10,7 +10,7 @@ import javax.servlet.http.HttpSession;
import zall.action.ZalleryAction;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.manager.EmailManager;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
@ -32,7 +32,7 @@ public class VerifyEmailAction extends ZalleryAction{
if (out != null) out.println("{ }");
else msgs.add(MessageType.INFO, "Your email has been successfully verified");
else {
ZalleryEmail.sendNewUserRegistrationToAdmin(verifiedUser, db);
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.");