chg: revoke certificates if repeated ping failed

[gigi.git] / src / club / wpia / gigi / output / template / Template.java

diff --git a/src/club/wpia/gigi/output/template/Template.java b/src/club/wpia/gigi/output/template/Template.java
index 454c0c5846d4b35df39bf62e44fa8566bc0a7840..65db37fe8314938d3b5237c644c47a9874d6a7e8 100644 (file)
--- a/src/club/wpia/gigi/output/template/Template.java
+++ b/src/club/wpia/gigi/output/template/Template.java
@@ -237,7 +237,7 @@ public class Template implements Outputable {
     protected void tryReload() {
         if (source != null && lastLoaded < source.lastModified()) {
             System.out.println("Reloading template.... " + source);
-            try (InputStreamReader r = new InputStreamReader(new FileInputStream(source), "UTF-8")) {
+            try (FileInputStream fis = new FileInputStream(source); InputStreamReader r = new InputStreamReader(fis, "UTF-8")) {
                 data = parse(r).getBlock(null);
                 r.close();
                 lastLoaded = source.lastModified() + 1000;
@@ -264,10 +264,14 @@ public class Template implements Outputable {
             out.print(((Boolean) s) ? l.getTranslation("yes") : l.getTranslation("no"));
         } else if (s instanceof Date) {
             SimpleDateFormat sdfUI = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-            out.print("<time datetime=\"" + sdf.format(s) + "\">");
-            out.print(sdfUI.format(s));
-            out.print(" UTC</time>");
+            if (vars.containsKey(Outputable.OUT_KEY_PLAIN)) {
+                out.print(sdfUI.format(s));
+            } else {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                out.print("<time datetime=\"" + sdf.format(s) + "\">");
+                out.print(sdfUI.format(s));
+                out.print(" UTC</time>");
+            }
         } else {
             out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
         }
@@ -322,7 +326,7 @@ public class Template implements Outputable {
         public void merge(ParseContext other) {
             line = other.line;
             column = other.column;
-            parseException.append(other.parseException);
+            append(other);
         }
 
         public void append(ParseContext other) {