UPD: Use standart error output divs

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

diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.java b/src/org/cacert/gigi/pages/account/MailAddForm.java
index 543dff147e7205494fd49d01816d41c9ea3dd3b6..611fa76930db299e69156036adbb5de7195acf1a 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/MailAddForm.java
@@ -5,10 +5,13 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.Language;
+import org.cacert.gigi.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
+import org.cacert.gigi.pages.Page;
 
 public class MailAddForm extends Form {
        private static Template t;
@@ -16,9 +19,11 @@ public class MailAddForm extends Form {
        static {
                t = new Template(ChangePasswordPage.class.getResource("MailAddForm.templ"));
        }
+       User target;
 
-       public MailAddForm(HttpServletRequest hsr) {
+       public MailAddForm(HttpServletRequest hsr, User target) {
                super(hsr);
+               this.target = target;
        }
 
        @Override
@@ -26,17 +31,15 @@ public class MailAddForm extends Form {
                String formMail = req.getParameter("newemail");
                if (!EmailProvider.MAIL.matcher(formMail).matches()) {
                        // TODO Proper error output (css, maybe abstract)
-                       out.println("<b>Error: Invalid address!</b>");
+                       out.println("<div class='formError'>Error: Invalid address!</div>");
                        return false;
                }
                mail = formMail;
+               EmailAddress addr = new EmailAddress(mail, target);
+               addr.insert(Page.getLanguage(req));
                return true;
        }
 
-       public String getMail() {
-               return mail;
-       }
-
        @Override
        protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
                t.output(out, l, vars);