Put more intelligence into the "outputError"-function of "Form".

[gigi.git] / src / org / cacert / gigi / pages / wot / AssuranceForm.java

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 3d68716ec293670302669ed4181459b1b9ad5d56..e3dfe54c106f04b05b2635f259a092ac3c79a9d8 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -50,45 +50,34 @@ public class AssuranceForm extends Form {
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
-        out.println("<div class='formError'>");
-        boolean failed = false;
-
         if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("CCAAgreed")) || !"1".equals(req.getParameter("assertion"))) {
             outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of CAcert");
-            failed = true;
 
         }
         if (req.getParameter("date") == null || req.getParameter("date").equals("")) {
             outputError(out, req, "You must enter the date when you met the assuree.");
-            failed = true;
         } else {
             try {
                 Date d = sdf.parse(req.getParameter("date"));
                 if (d.getTime() > System.currentTimeMillis()) {
                     outputError(out, req, "You must not enter a date in the future.");
-                    failed = true;
                 }
             } catch (ParseException e) {
                 outputError(out, req, "You must enter the date in this format: YYYY-MM-DD.");
-                failed = true;
             }
         }
         // check location, min 3 characters
         if (req.getParameter("location") == null || req.getParameter("location").equals("")) {
             outputError(out, req, "You failed to enter a location of your meeting.");
-            failed = true;
         } else if (req.getParameter("location").length() <= 2) {
             outputError(out, req, "You must enter a location with at least 3 characters eg town and country.");
-            failed = true;
         }
         // TODO checkPoints
         String points = req.getParameter("points");
         if (points == null || "".equals(points)) {
-            // TODO message
-            failed = true;
+            outputError(out, req, "For an assurance, you need to enter points.");
         }
-        if (failed) {
-            out.println("</div>");
+        if (isFailed(out)) {
             return false;
         }
         try {
@@ -96,13 +85,11 @@ public class AssuranceForm extends Form {
             if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
                 outputError(out, req, success.getMessage());
             }
-            out.println("</div>");
             return success == AssuranceResult.ASSURANCE_SUCCEDED;
         } catch (SQLException e) {
             e.printStackTrace();
         }
 
-        out.println("</div>");
         return false;
     }