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

fixed most compilation errors

Browse source
This commit is contained in:
Ziver Koc 2018-07-24 16:23:53 +02:00
parent cd24ee74e3
commit de503bd441
23 changed files with 208 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/zall/action/LoginAction.java
View file

@ -1,42 +0,0 @@
package zall.action;
import java.io.PrintWriter;
import java.sql.SQLException;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.bean.User;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
public class LoginAction extends ZalleryAction{
private static final Logger logger = LogUtil.getLogger();
public LoginAction() {
super("login");
}
@Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
PrintWriter out, User user, UserMessage msgs) throws SQLException {
user = User.load(request, response, db, request.getParameter("email"), request.getParameter("password") );
if( user != null ){
logger.info("Used user input to auth \""+user.getName()+"\"");
session.setAttribute("user", user);
if( out != null )
out.println("{ }");
}
else if(out != null) out.println("{ \"error\":\"Wrong username or password!\"}");
else msgs.add(MessageType.ERROR, "Wrong username or password!");
}
}

51
src/zall/action/RegisterAction.java
View file

@ -1,51 +0,0 @@
package zall.action;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.SQLException;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.bean.User;
import zall.util.ZalleryEmail;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
public class RegisterAction extends ZalleryAction{
private static final Logger logger = LogUtil.getLogger();
public RegisterAction() {
super("register");
}
@Override
public void handleRequest(DBConnection db, HttpServletRequest request, HttpServletResponse response, HttpSession session,
PrintWriter out, User user, UserMessage msgs) throws SQLException, IOException {
if( request.getParameter("email") == null ){
msgs.add(MessageType.ERROR, "Please provide a valid email!");
return;
}
if(User.load(db, request.getParameter("email")) != null){
msgs.add(MessageType.ERROR, "An account with that email already exists!");
return;
}
user = new User();
user.setEmail( request.getParameter("email") );
user.setPassword( request.getParameter("password") );
user.setName( request.getParameter("name") );
user.save(db);
ZalleryEmail.sendVerificationEmail( user );
logger.info("Registered new user: "+user.getName()+".");
session.setAttribute("user", user);
if(out != null) out.println("{ \"id\":"+user.getId()+" }");
else msgs.add(MessageType.INFO, "Your account has successfully been created. A verification email has been sent to your email, please click the link to continue.");
}
}

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

@ -39,7 +39,7 @@ public class ModifyUserStatusAction extends ZalleryAction{
if( target_user.getPassword() == null )
target_user.setPassword( request.getParameter("password") );
else if( request.getParameter("oldPassword") != null )
if( target_user.equalsPassword(request.getParameter("oldPassword")) )
if( target_user.getPassword().equals(request.getParameter("oldPassword")) )
target_user.setPassword( request.getParameter("password") );
else{
if(out != null) out.println("{ \"error\": \"Wrong password!\"}");