UPD: Cleanup User-class.

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

diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
index 278892aae62fb422890b20da01931935620310b2..6a2bb2c51d9b7550bd97ebdff654a6b0f7bee683 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java
@@ -5,13 +5,13 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.pages.account.ChangePasswordPage;
 
 public class MailAddForm extends Form {
 
@@ -19,7 +19,7 @@ public class MailAddForm extends Form {
 
     private String mail;
     static {
-        t = new Template(ChangePasswordPage.class.getResource("MailAddForm.templ"));
+        t = new Template(MailAddForm.class.getResource("MailAddForm.templ"));
     }
 
     private User target;
@@ -34,11 +34,13 @@ public class MailAddForm extends Form {
         String formMail = req.getParameter("newemail");
         mail = formMail;
         try {
-            EmailAddress addr = new EmailAddress(target, mail);
-            addr.insert(Page.getLanguage(req));
+            new EmailAddress(target, mail, Page.getLanguage(req).getLocale());
         } catch (IllegalArgumentException e) {
             out.println("<div class='formError'>Error: Invalid address!</div>");
             return false;
+        } catch (GigiApiException e) {
+            e.format(out, Page.getLanguage(req));
+            return false;
         }
         return true;
     }