X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailManagementForm.java;h=c6a96543251300f08f77a4e3565d8b61d366b752;hp=842ad051f8e9f5f9969fae13fb5498b51cda9812;hb=2cbe88c14309c3a10dab336cb395c3e995d81ec5;hpb=9b8c6af2b684cee31142449955b83ae66cb9ab34

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 842ad051..c6a96543 100644
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -27,7 +27,11 @@ public class MailManagementForm extends Form {
 	public boolean submit(PrintWriter out, HttpServletRequest req) {
 		if (req.getParameter("makedefault") != null) {
 			try {
-				target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(req.getParameter("emailid").trim())));
+				String mailid = req.getParameter("emailid");
+				if (mailid == null) {
+					return false;
+				}
+				target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(mailid.trim())));
 			} catch (Exception e) {
 				out.println("<b>Error precessing your request.</b>");
 				e.printStackTrace();
@@ -35,6 +39,23 @@ public class MailManagementForm extends Form {
 			}
 			return true;
 		}
+		if (req.getParameter("delete") != null) {
+			String[] toDel = req.getParameterValues("delid[]");
+			if (toDel == null) {
+				return false;
+			}
+			for (int i = 0; i < toDel.length; i++) {
+				try {
+					target.deleteEmail(EmailAddress.getById(Integer.parseInt(toDel[i].trim())));
+				} catch (Exception e) {
+					out.println("<b>Error precessing your request.</b>");
+					e.printStackTrace();
+					return false;
+				}
+			}
+			return true;
+
+		}
 		return false;
 	}