X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FChangeForm.java;h=5458b63d9f5ef9d94a9db148cccee44634194410;hb=562f4e5fabe180a8dfc4894241a89cae0d1655ee;hp=95975eadcb18bb4c7a30a3d17782770f82a6af0f;hpb=acfa4c6f382e61fbee8534b6234767fe3ea9efd2;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index 95975ead..5458b63d 100644
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -1,32 +1,59 @@
 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.GigiApiException;
 import org.cacert.gigi.Language;
+import org.cacert.gigi.User;
 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 {
+	User target;
+
+	public ChangeForm(HttpServletRequest hsr, User target) {
+		super(hsr);
+		this.target = target;
+	}
+
 	private static Template t;
 	static {
-		t = new Template(new InputStreamReader(
-				ChangePasswordPage.class
-						.getResourceAsStream("ChangePasswordForm.templ")));
+		t = new Template(ChangePasswordPage.class.getResource("ChangePasswordForm.templ"));
 	}
 
 	@Override
-	public void outputContent(PrintWriter out, Language l,
-			Map<String, Object> vars) {
+	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;
+		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;
 	}
 
 }