Reverting modifications to LoginFormBean class in r5832, r5834, because those changes did not take into consideration references from JSPs.

webapp/src/edu/cornell/mannlib/vedit/beans/LoginFormBean.java

@@ -2,6 +2,8 @@
 
 package edu.cornell.mannlib.vedit.beans;
 
+import java.util.Hashtable;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -12,24 +14,83 @@ import javax.servlet.http.HttpSession;
  */
 public class LoginFormBean {
 	public static final int ANYBODY = 0;
+
+	public int getAnybody() {
+		return ANYBODY;
+	}
+
 	public static final int NON_EDITOR = 1;
+
+	public int getNonEditor() {
+		return NON_EDITOR;
+	}
+
 	public static final int EDITOR = 4;
+
+	public int getEditor() {
+		return EDITOR;
+	}
+
 	public static final int CURATOR = 5;
+
+	public int getCurator() {
+		return CURATOR;
+	}
+
 	public static final int DBA = 50;
 
+	public int getDba() {
+		return DBA;
+	}
+
+	public boolean getBla() {
+		return true;
+	}
+
 	private String userURI;
 	private String sessionId;
+	private String loginBrowser;
 	private String loginRemoteAddr;
 	private String loginName;
+	private String loginPassword;
 	private String loginStatus;
+	private int loginUserId;
 	private String loginRole;
+	private String duplicatePassword;
+	private String emailAddress;
+	private Hashtable<String, String> errors;
+
+	public boolean validateLoginForm() {
+		boolean allOk = true;
+
+		if (loginName.equals("")) {
+			errors.put("loginName", "Please enter your Vivo user name");
+			loginName = "";
+			allOk = false;
+		}
+
+		if (loginPassword.equals("")) {
+			errors.put("loginPassword", "Please enter your Vivo password");
+			loginPassword = "";
+			allOk = false;
+		}
+
+		return allOk;
+	}
 
 	public LoginFormBean() {
 		sessionId = "";
+		loginBrowser = "";
 		loginRemoteAddr = "";
 		loginName = "";
+		loginPassword = "";
 		loginStatus = "none";
+		loginUserId = 0;
 		loginRole = "1";
+		duplicatePassword = "";
+		emailAddress = "";
+
+		errors = new Hashtable<String, String>();
 	}
 
 	public String toString() {
@@ -63,17 +124,14 @@ public class LoginFormBean {
 	}
 
 	public static boolean loggedIn(HttpServletRequest request, int minLevel) {
-		if (request == null) {
+		if (request == null)
 			return false;
-		}
 		HttpSession sess = request.getSession(false);
-		if (sess == null) {
+		if (sess == null)
 			return false;
-		}
 		Object obj = sess.getAttribute("loginHandler");
-		if (!(obj instanceof LoginFormBean)) {
+		if (obj == null || !(obj instanceof LoginFormBean))
 			return false;
-		}
 
 		LoginFormBean lfb = (LoginFormBean) obj;
 		return ("authenticated".equals(lfb.loginStatus) && Integer
@@ -90,6 +148,10 @@ public class LoginFormBean {
 		return sessionId;
 	}
 
+	public String getLoginBrowser() {
+		return loginBrowser;
+	}
+
 	public String getLoginRemoteAddr() {
 		return loginRemoteAddr;
 	}
@@ -98,14 +160,35 @@ public class LoginFormBean {
 		return loginName;
 	}
 
+	public String getLoginPassword() {
+		return loginPassword;
+	}
+
 	public String getLoginStatus() {
 		return loginStatus;
 	}
 
+	public int getLoginUserId() {
+		return loginUserId;
+	}
+
 	public String getLoginRole() {
 		return loginRole;
 	}
 
+	public String getDuplicatePassword() {
+		return duplicatePassword;
+	}
+
+	public String getEmailAddress() {
+		return emailAddress;
+	}
+
+	public String getErrorMsg(String s) {
+		String errorMsg = (String) errors.get(s.trim());
+		return (errorMsg == null) ? "" : errorMsg;
+	}
+
 	/********************** SET METHODS *********************/
 
 	public void setUserURI(String uri) {
@@ -116,6 +199,10 @@ public class LoginFormBean {
 		sessionId = id;
 	}
 
+	public void setLoginBrowser(String b) {
+		loginBrowser = b;
+	}
+
 	public void setLoginRemoteAddr(String ra) {
 		loginRemoteAddr = ra;
 	}
@@ -124,12 +211,32 @@ public class LoginFormBean {
 		loginName = ln;
 	}
 
+	public void setLoginPassword(String lp) {
+		loginPassword = lp;
+	}
+
 	public void setLoginStatus(String ls) {
 		loginStatus = ls;
 	}
 
+	public void setLoginUserId(int int_val) {
+		loginUserId = int_val;
+	}
+
 	public void setLoginRole(String lr) {
 		loginRole = lr;
 	}
 
+	public void setDuplicatePassword(String dp) {
+		duplicatePassword = dp;
+	}
+
+	public void setEmailAddress(String ea) {
+		emailAddress = ea;
+	}
+
+	public void setErrorMsg(String key, String msg) {
+		errors.put(key, msg);
+	}
+
 }