FIX: Cleanup fields

[gigi.git] / src / org / cacert / gigi / output / Form.java

diff --git a/src/org/cacert/gigi/output/Form.java b/src/org/cacert/gigi/output/Form.java
index e5d05cb6c0e294fe80129aa19baf4e0f9c5211db..a6374e532b74c0b2b57f50015bbdd878fc7c9d56 100644 (file)
--- a/src/org/cacert/gigi/output/Form.java
+++ b/src/org/cacert/gigi/output/Form.java
@@ -8,7 +8,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.RandomToken;
 
@@ -16,7 +16,7 @@ public abstract class Form implements Outputable {
 
     public static final String CSRF_FIELD = "csrf";
 
-    String csrf;
+    private String csrf;
 
     public Form(HttpServletRequest hsr) {
         csrf = RandomToken.generateToken(32);
@@ -34,6 +34,7 @@ public abstract class Form implements Outputable {
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.println("<form method='POST' autocomplete='off'>");
+        failed = false;
         outputContent(out, l, vars);
         out.print("<input type='hidden' name='" + CSRF_FIELD + "' value='");
         out.print(getCSRFToken());
@@ -42,12 +43,39 @@ public abstract class Form implements Outputable {
 
     protected abstract void outputContent(PrintWriter out, Language l, Map<String, Object> vars);
 
-    protected void outputError(PrintWriter out, ServletRequest req, String text) {
+    boolean failed;
+
+    protected void outputError(PrintWriter out, ServletRequest req, String text, Object... contents) {
+        if ( !failed) {
+            failed = true;
+            out.println("<div class='formError'>");
+        }
         out.print("<div>");
-        out.print(Page.translate(req, text));
+        if (contents.length == 0) {
+            out.print(Page.translate(req, text));
+        } else {
+            out.print(String.format(Page.translate(req, text), contents));
+        }
         out.println("</div>");
     }
 
+    protected void outputErrorPlain(PrintWriter out, String text) {
+        if ( !failed) {
+            failed = true;
+            out.println("<div class='formError'>");
+        }
+        out.print("<div>");
+        out.print(text);
+        out.println("</div>");
+    }
+
+    public boolean isFailed(PrintWriter out) {
+        if (failed) {
+            out.println("</div>");
+        }
+        return failed;
+    }
+
     protected String getCSRFToken() {
         return csrf;
     }