add: add boolean to separate groups for user and support

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

diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java
index 37e5afd224bf03a6e0f912dd52365f25f0fcc6a9..d0f0c124a38cfc135fe276218094284bb2fbd5b7 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateValiditySelector.java
+++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java
@@ -1,22 +1,19 @@
 package org.cacert.gigi.output;
 
 import java.io.PrintWriter;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.sql.Date;
+import java.text.ParseException;
 import java.util.Map;
-import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Outputable;
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class CertificateValiditySelector implements Outputable {
 
-    private static ThreadLocal<SimpleDateFormat> fmt = new ThreadLocal<>();
-
     private static final long DAY = 1000 * 60 * 60 * 24;
 
     private Date from;
@@ -27,19 +24,11 @@ public class CertificateValiditySelector implements Outputable {
 
     }
 
-    public static SimpleDateFormat getDateFormat() {
-        SimpleDateFormat local = fmt.get();
-        if (local == null) {
-            local = new SimpleDateFormat("yyyy-MM-dd");
-            local.setTimeZone(TimeZone.getTimeZone("UTC"));
-            fmt.set(local);
-        }
-        return local;
-    }
-
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-        out.print("<select name='validFrom'><option value='now'");
+        out.print("<label for='validFrom'>");
+        out.println(l.getTranslation("start: "));
+        out.print("</label><select name='validFrom'><option value='now'");
         if (from == null) {
             out.print(" selected='selected'");
         }
@@ -49,7 +38,7 @@ public class CertificateValiditySelector implements Outputable {
         long base = getCurrentDayBase();
         for (int i = 0; i < 14; i++) {
             long date = base + DAY * i;
-            String d = getDateFormat().format(new Date(date));
+            String d = DateSelector.getDateFormat().format(new Date(date));
             out.print("<option value='");
             out.print(d);
             out.print("'");
@@ -62,6 +51,9 @@ public class CertificateValiditySelector implements Outputable {
         }
         out.println("</select>");
 
+        out.print("<label for='validity'>");
+        out.println(l.getTranslation("end: "));
+        out.print("</label>");
         out.print("<input type='text' name='validity' value='");
         out.print(HTMLEncoder.encodeHTML(val));
         out.println("'>");
@@ -119,7 +111,7 @@ public class CertificateValiditySelector implements Outputable {
             }
         } else {
             try {
-                getDateFormat().parse(newval);
+                DateSelector.getDateFormat().parse(newval);
             } catch (ParseException e) {
                 throw new GigiApiException("The validity interval entered is invalid.");
             }
@@ -131,7 +123,7 @@ public class CertificateValiditySelector implements Outputable {
             this.from = null;
         } else {
             try {
-                this.from = new Date(getDateFormat().parse(from).getTime());
+                this.from = new Date(DateSelector.getDateFormat().parse(from).getTime());
             } catch (ParseException e) {
                 throw new GigiApiException("The validity start date entered is invalid.");
             }