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

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index 5458b63d..667dc751 100644
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -6,54 +6,52 @@ 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.dbObjects.User;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Form;
 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(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;
-	}
+
+    private User target;
+
+    public ChangeForm(HttpServletRequest hsr, User target) {
+        super(hsr);
+        this.target = target;
+    }
+
+    private static final Template 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;
+    }
 
 }