Convert Pinglog into form.

[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 99af485d7802f1d0dfe20024833cca4d4036e146..ad3344121f654466a035e4b7d7abfc1547698a9d 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/MailAddForm.java
@@ -5,9 +5,9 @@ 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.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;
@@ -21,7 +21,7 @@ public class MailAddForm extends Form {
         t = new Template(ChangePasswordPage.class.getResource("MailAddForm.templ"));
     }
 
-    User target;
+    private User target;
 
     public MailAddForm(HttpServletRequest hsr, User target) {
         super(hsr);
@@ -33,7 +33,7 @@ public class MailAddForm extends Form {
         String formMail = req.getParameter("newemail");
         mail = formMail;
         try {
-            EmailAddress addr = new EmailAddress(mail, target);
+            EmailAddress addr = new EmailAddress(target, mail);
             addr.insert(Page.getLanguage(req));
         } catch (IllegalArgumentException e) {
             out.println("<div class='formError'>Error: Invalid address!</div>");