From 3bc5aa0aa636f100673cf3a07e33f190091c52b9 Mon Sep 17 00:00:00 2001
From: INOPIAE
Date: Fri, 10 Apr 2020 04:38:54 +0200
Subject: [PATCH] upd: add download tag and target tag to HTML links
fixes issue #183
Change-Id: I6ed8bddb48cee65e5af01f7c868ba317a76674b3
---
src/club/wpia/gigi/output/template/SprintfCommand.java | 2 +-
src/club/wpia/gigi/pages/RootCertPage.java | 2 +-
src/club/wpia/gigi/pages/RootCertPage.templ | 4 ++--
.../gigi/pages/account/certs/CertificateDisplay.templ | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/club/wpia/gigi/output/template/SprintfCommand.java b/src/club/wpia/gigi/output/template/SprintfCommand.java
index d313df8a..7a525ab7 100644
--- a/src/club/wpia/gigi/output/template/SprintfCommand.java
+++ b/src/club/wpia/gigi/output/template/SprintfCommand.java
@@ -116,7 +116,7 @@ public final class SprintfCommand implements Translatable {
throw new Error("Need an absolute link for the link service.");
}
String link = "//" + host + replacement.substring(2);
- out.print("");
+ out.print("");
} else if (replacement.startsWith("$")) {
Template.outputVar(out, l, externalVariables, replacement.substring(2), false);
} else {
diff --git a/src/club/wpia/gigi/pages/RootCertPage.java b/src/club/wpia/gigi/pages/RootCertPage.java
index 55e45003..ffde0966 100644
--- a/src/club/wpia/gigi/pages/RootCertPage.java
+++ b/src/club/wpia/gigi/pages/RootCertPage.java
@@ -62,7 +62,7 @@ public class RootCertPage extends Page {
@Override
public void output(PrintWriter out, Language l, Map vars) {
- out.println("");
+ out.println("");
out.println(HTMLEncoder.encodeHTML(target.getKeyname()));
out.println("");
out.println(HTMLEncoder.encodeHTML(target.getCertificate().getSubjectX500Principal().toString()));
diff --git a/src/club/wpia/gigi/pages/RootCertPage.templ b/src/club/wpia/gigi/pages/RootCertPage.templ
index 8c2711af..0bda407f 100644
--- a/src/club/wpia/gigi/pages/RootCertPage.templ
+++ b/src/club/wpia/gigi/pages/RootCertPage.templ
@@ -1,12 +1,12 @@
=_The Root certificate is available for download here. Choose your preferred format:?>
-PEM DER
+PEM DER
=_Root certificate fingerprints:?>
=_Fingerprint SHA-1?>:
=$fingerprintSHA1?>
=_Fingerprint SHA-256?>:
=$fingerprintSHA256?>
=_A p7b file with all intermediate certificates is available for download here:?>
-=$bundle?>
+=$bundle?>
=_Find information how to add the root and intermediate certificates to the truststore of your browser or operating system in our !(/kb/truststores)FAQ!''.?>
=_A full list of all DER-encoded intermediate certificates is provided below:?>
diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
index a688cfed..e761a5b2 100644
--- a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
+++ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ
@@ -39,14 +39,14 @@
=_Certificate and Chain?>*: |
- =_PEM encoded Certificate?> (CRT/PEM)
+ =_PEM encoded Certificate?> (CRT/PEM)
foreach($trustchain) { ?>
=_issued by?> =$name?>
} ?>
- =_PEM encoded Certificate Chain?> (CRT/PEM)
- =_PEM encoded Certificate Chain (Excluding Anchor)?> (CRT/PEM)
- =_PEM encoded Certificate Chain (Excluding Leaf)?> (CRT/PEM)
- =_DER encoded Certificate?> (CER)
+ =_PEM encoded Certificate Chain?> (CRT/PEM)
+ =_PEM encoded Certificate Chain (Excluding Anchor)?> (CRT/PEM)
+ =_PEM encoded Certificate Chain (Excluding Leaf)?> (CRT/PEM)
+ =_DER encoded Certificate?> (CER)
=_Install into browser.?>
=_Install into browser (Chrome)?>. =_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?>
* =_For information on how to install the root certificates into the truststore of your browser take a look at the !(/kb/rootcert)root certificate page in the FAQ!''!?>.
--
2.39.2
|