X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailAddForm.java;h=ad3344121f654466a035e4b7d7abfc1547698a9d;hb=76e3ad5851967bea57005ec9858625d4a7071d7c;hp=bdbf0a39602be9d109014b9c5541994cd432d8b6;hpb=d0df8a3544aeef4858a1c99d07252f69d659f98e;p=gigi.git
diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.java b/src/org/cacert/gigi/pages/account/MailAddForm.java
index bdbf0a39..ad334412 100644
--- a/src/org/cacert/gigi/pages/account/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/MailAddForm.java
@@ -5,45 +5,46 @@ 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.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.Template;
import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.util.RandomToken;
public class MailAddForm extends Form {
- private static Template t;
- private String mail;
- static {
- t = new Template(ChangePasswordPage.class.getResource("MailAddForm.templ"));
- }
- User target;
-
- public MailAddForm(HttpServletRequest hsr, User target) {
- super(hsr);
- this.target = target;
- }
-
- @Override
- public boolean submit(PrintWriter out, HttpServletRequest req) {
- String formMail = req.getParameter("newemail");
- if (!EmailProvider.MAIL.matcher(formMail).matches()) {
- // TODO Proper error output (css, maybe abstract)
- out.println("Error: Invalid address!");
- return false;
- }
- mail = formMail;
- EmailAddress addr = new EmailAddress(mail, target, RandomToken.generateToken(16));
- addr.insert(Page.getLanguage(req));
- return true;
- }
-
- @Override
- protected void outputContent(PrintWriter out, Language l, Map vars) {
- t.output(out, l, vars);
- }
+
+ private static Template t;
+
+ private String mail;
+ static {
+ t = new Template(ChangePasswordPage.class.getResource("MailAddForm.templ"));
+ }
+
+ private User target;
+
+ public MailAddForm(HttpServletRequest hsr, User target) {
+ super(hsr);
+ this.target = target;
+ }
+
+ @Override
+ public boolean submit(PrintWriter out, HttpServletRequest req) {
+ String formMail = req.getParameter("newemail");
+ mail = formMail;
+ try {
+ EmailAddress addr = new EmailAddress(target, mail);
+ addr.insert(Page.getLanguage(req));
+ } catch (IllegalArgumentException e) {
+ out.println("Error: Invalid address!
");
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ protected void outputContent(PrintWriter out, Language l, Map vars) {
+ t.output(out, l, vars);
+ }
}