Merge remote-tracking branch 'origin/emailMgmt'

[gigi.git] / src / org / cacert / gigi / pages / account / MailManagementForm.java

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 842ad051f8e9f5f9969fae13fb5498b51cda9812..9dc6c8daf3392d2ef2a2656a90509b66d37bca52 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -27,14 +27,35 @@ 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>");
+                               out.println("<div class='formError'>Error precessing your request.</div>");
                                e.printStackTrace();
                                return false;
                        }
                        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("<div class='formError'>Error precessing your request.</div>");
+                                       e.printStackTrace();
+                                       return false;
+                               }
+                       }
+                       return true;
+
+               }
                return false;
        }