X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fmail%2FMailManagementForm.java;h=c082a1be509743ab9b09963a0c2104a0966d0b69;hp=c8245026d8d6b8a0e47f0251e497318f758de6ab;hb=a8422ae5d5dc70c5a2776d3cead356c111e5b9d7;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index c8245026..c082a1be 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -1,7 +1,9 @@
 package org.cacert.gigi.pages.account.mail;
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -30,36 +32,29 @@ public class MailManagementForm extends Form {
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
-        if (req.getParameter("makedefault") != null) {
-            try {
-                String mailid = req.getParameter("emailid");
-                if (mailid == null) {
-                    return false;
+        Map<String, String[]> map = req.getParameterMap();
+        try {
+            for (Entry<String, String[]> e : map.entrySet()) {
+                String k = e.getKey();
+                String[] p = k.split(":", 2);
+                if (p[0].equals("default")) {
+                    target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(p[1])));
                 }
-                target.updateDefaultEmail(EmailAddress.getById(Integer.parseInt(mailid.trim())));
-            } catch (GigiApiException e) {
-                e.format(out, Page.getLanguage(req));
-                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 (GigiApiException e) {
-                    e.format(out, Page.getLanguage(req));
-                    return false;
+                if (p[0].equals("delete")) {
+                    target.deleteEmail(EmailAddress.getById(Integer.parseInt(p[1])));
+                }
+                if (p[0].equals("reping")) {
+                    EmailAddress.getById(Integer.parseInt(p[1])).requestReping(Page.getLanguage(req));
                 }
             }
-            return true;
-
+        } catch (GigiApiException e) {
+            e.format(out, Page.getLanguage(req));
+            return false;
+        } catch (IOException e1) {
+            new GigiApiException("Error while doing reping.").format(out, Page.getLanguage(req));
+            return false;
         }
-        return false;
+        return true;
     }
 
     @Override
@@ -78,9 +73,9 @@ public class MailManagementForm extends Form {
                 int mailID = emailAddress.getId();
                 vars.put("id", mailID);
                 if (emailAddress.getAddress().equals(target.getEmail())) {
-                    vars.put("checked", "checked");
+                    vars.put("default", " disabled");
                 } else {
-                    vars.put("checked", "");
+                    vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {
                     vars.put("verification", "Verified");