Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 22 → Rev 23

/trunk/src/struts.xml
41,7 → 41,7
<action name="Login" method="doLogin" class="ch.ffhs.webE.action.LoginAction">
<result name="admin" type="redirect">/admin/main.jsp</result>
<result name="user" type="redirect">/user/main.jsp</result>
<result name="failed" type="redirect">/index.jsp</result>
<result name="error" type="redirect">/index.jsp</result>
</action>
<action name="Logout" method="doLogout" class="ch.ffhs.webE.action.LoginAction">
/trunk/src/ch/ffhs/webE/action/LoginAction.java
32,12 → 32,12
//If password or user name are empty, the login fails.
if("".equals(getUserName()) || "".equals(getPw()) || getUserName() == null || getPw() == null) {
return "failed";
return ERROR;
}
String verifiedUser = verifyUser(getUserName(), getPw());
if(verifiedUser.equals("failed")) {
return "failed";
return ERROR;
} else {
//Put user name, password into session
64,11 → 64,11
//User does not exist
if(u == null)
return "failed";
return ERROR;
//User password does not match
if(!u.getPassword().equals(password))
return "failed";
return ERROR;
//User credentials are fine, check for admin rights
if(u.isAdmin()) {
98,8 → 98,4
public User getModel() {
return user;
}
 
 
}