FIX: Cleanup fields

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

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index 087f418e08208a901b08d1b044365151e3e127dc..f43d62d02b0f5a69e7731f251a8fc66487d71ef9 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -1,32 +1,60 @@
 package org.cacert.gigi.pages.account;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.User;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
+import org.cacert.gigi.pages.Page;
 
 public class ChangeForm extends Form {
-       private static Template t;
-       static {
-               t = new Template(new InputStreamReader(
-                               ChangePasswordPage.class
-                                               .getResourceAsStream("ChangePasswordForm.templ")));
-       }
-
-       @Override
-       public void outputContent(PrintWriter out, Language l,
-                       Map<String, Object> vars) {
-               t.output(out, l, vars);
-       }
-
-       @Override
-       public boolean submit(PrintWriter out, HttpServletRequest req) {
-               return false;
-       }
-
-}
\ No newline at end of file
+
+    private User target;
+
+    public ChangeForm(HttpServletRequest hsr, User target) {
+        super(hsr);
+        this.target = target;
+    }
+
+    private static Template t;
+    static {
+        t = new Template(ChangePasswordPage.class.getResource("ChangePasswordForm.templ"));
+    }
+
+    @Override
+    public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
+        t.output(out, l, vars);
+    }
+
+    @Override
+    public boolean submit(PrintWriter out, HttpServletRequest req) {
+        String oldpassword = req.getParameter("oldpassword");
+        String p1 = req.getParameter("pword1");
+        String p2 = req.getParameter("pword2");
+        GigiApiException error = new GigiApiException();
+        if (oldpassword == null || p1 == null || p2 == null) {
+            new GigiApiException("All fields are required.").format(out, Page.getLanguage(req));
+            return false;
+        }
+        if ( !p1.equals(p2)) {
+            new GigiApiException("New passwords do not match.").format(out, Page.getLanguage(req));
+            return false;
+        }
+        try {
+            target.changePassword(oldpassword, p1);
+        } catch (GigiApiException e) {
+            error.mergeInto(e);
+        }
+        if ( !error.isEmpty()) {
+            error.format(out, Page.getLanguage(req));
+            return false;
+        }
+        return true;
+    }
+
+}