From: Marcus Mängel <m.maengel@inopiae.de>
Date: Sun, 8 Sep 2019 14:03:28 +0000 (+0200)
Subject: Merge "upd: get enough space between radio/checkbox and following text"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=010f5d1a8bb003834222e6d854194a6c6e5e5cb7;hp=4964954f542d244fdddade0a974f45eb36f64d3f

Merge "upd: get enough space between radio/checkbox and following text"
---

diff --git a/src/club/wpia/gigi/database/SQLFileManager.java b/src/club/wpia/gigi/database/SQLFileManager.java
index 33649247..16f8fa21 100644
--- a/src/club/wpia/gigi/database/SQLFileManager.java
+++ b/src/club/wpia/gigi/database/SQLFileManager.java
@@ -42,7 +42,7 @@ public class SQLFileManager {
                 }
             }
         }
-        sql = sql.replaceAll("--[^\n]*\n", "\n");
+        sql = sql.replaceAll("(^|\n)--[^\n]*\n", "\n");
         sql = sql.replaceAll("#[^\n]*\n", "\n");
         String[] stmts = sql.split(";");
         Pattern p = Pattern.compile("\\s*DROP TABLE IF EXISTS \"([^\"]+)\"");
diff --git a/src/club/wpia/gigi/pages/LoginPage.templ b/src/club/wpia/gigi/pages/LoginPage.templ
index 621d9f85..d08ab021 100644
--- a/src/club/wpia/gigi/pages/LoginPage.templ
+++ b/src/club/wpia/gigi/pages/LoginPage.templ
@@ -4,5 +4,5 @@
 <label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" required/><br />
 <label for="password"><?=_Password?>:</label><input class="form-control" type='password' name='password' required/><br />
 <button type='submit' name="process" value="Login" class="btn btn-primary"><?=_Login?></button><br /><br />
-<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !(/kb/lostPassword)knowledge base!'</a>' for more information?></p>
+<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !(/kb/lostPassword)FAQ!'</a>' for more information?></p>
 </div>
diff --git a/src/club/wpia/gigi/pages/MainPageNotLogin.templ b/src/club/wpia/gigi/pages/MainPageNotLogin.templ
index 2e3ef1a3..4e604009 100644
--- a/src/club/wpia/gigi/pages/MainPageNotLogin.templ
+++ b/src/club/wpia/gigi/pages/MainPageNotLogin.templ
@@ -12,5 +12,5 @@ On the other hand, server certificates can be used to establish secure internet
 
 <hr/>
 
-<p><?=_For general documentation and help, please visit the ${appName} !(/kb/gigi)knowledge base!'</a>'.?>
+<p><?=_For general documentation and help, please visit the ${appName} !(/kb/gigi)FAQ!'</a>'.?>
 <?=_For specific policies, see the ${appName} !(/policy)Policies page!'</a>'.?></p>
\ No newline at end of file
diff --git a/src/club/wpia/gigi/pages/RootCertPage.templ b/src/club/wpia/gigi/pages/RootCertPage.templ
index 899470ec..10b20f8c 100644
--- a/src/club/wpia/gigi/pages/RootCertPage.templ
+++ b/src/club/wpia/gigi/pages/RootCertPage.templ
@@ -2,7 +2,7 @@
 <a href="?pem">PEM</a> <a href="?cer">DER</a></p>
 <p><?=_A p7b file with all intermediate certificates is available for download here:?><br/>
 <a href="?bundle"><?=$bundle?></a></p>
-<p><?=_Find information how to add the root and intermediate certificates to the truststore of your browser or operating system in our !(/kb/truststores)knowledge base!'</a>'.?></p>
+<p><?=_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>'.?></p>
 <p>
 <?=_A full list of all DER-encoded intermediate certificates is provided below:?>
 </p>
diff --git a/src/club/wpia/gigi/pages/main/KeyCompromiseForm.templ b/src/club/wpia/gigi/pages/main/KeyCompromiseForm.templ
index 9aadd3a0..8a8d1ad6 100644
--- a/src/club/wpia/gigi/pages/main/KeyCompromiseForm.templ
+++ b/src/club/wpia/gigi/pages/main/KeyCompromiseForm.templ
@@ -1,14 +1,9 @@
 <p>
-<?=_This form allows you to report a certificate whose private key has been compromised.?>
-<?=_You require to identify the certificate you need to report.?>
-<?=_You may upload the certificate (as PEM or DER) or may identify the certificate by serial.?>
+<?=_This form allows you to report a certificate whose private key has been compromised. You are required to identify the certificate you need to report. You may upload the certificate (as PEM or DER) or may identify the certificate by serial.?>
 </p>
 
 <p>
-<?=_Additionally you need to prove that you have access to the private key.?>
-<?=_There are also two possibilities available here:?>
-<?=_Either you may upload the plain private key (as PEM or DER) or you may only sign a given message with the according private key.?>
-<?=_You may create a fitting signature with this command:?>
+<?=_Additionally you need to prove that you have access to the private key. There are also two possibilities available here: Either you may upload the plain private key (as PEM or DER) or you may only sign a given message with the according private key. You may create a fitting signature with this command:?>
 </p>
 <p>
 <code data-challenge="<?=$challenge?>">
@@ -40,8 +35,7 @@ printf '%s' '<?=$challengePrefix?><?=$challenge?>' | openssl dgst -sha256 -sign
   </tr>
   <tr>
     <td colspan="4">
-      <?=_You may provide information on how the private key was compromised to help the certificate owner prevent further key compromises.?>
-      <?=_You can indicate that this information should not be sent to the certificate owner, but only be visible to ${appName} staff, by checking the checkbox below.?>
+      <?=_You may provide information on how the private key was compromised to help the certificate owner prevent further key compromises. You can indicate that this information should not be sent to the certificate owner, but only be visible to ${appName} staff, by checking the checkbox below.?>
       <p>
       <label for="confidential"><?=_Don't send the message to the certificate owner?></label>
       <input type='checkbox' name='confidential' id='confidential'>
diff --git a/src/club/wpia/gigi/pages/main/Signup.java b/src/club/wpia/gigi/pages/main/Signup.java
index 8cfaa2c4..60d85be6 100644
--- a/src/club/wpia/gigi/pages/main/Signup.java
+++ b/src/club/wpia/gigi/pages/main/Signup.java
@@ -53,7 +53,7 @@ public class Signup extends Form {
         vars.put("name", ni);
         vars.put("dob", myDoB);
         vars.put("email", HTMLEncoder.encodeHTML(email));
-        vars.put("helpOnNames", new SprintfCommand("Help on Names {0}in the knowledge base{1}", Arrays.asList("!(/kb/names", "!'</a>")));
+        vars.put("helpOnNames", new SprintfCommand("Help on Names in our {0}FAQ{1}", Arrays.asList("!(/kb/names", "!'</a>")));
         vars.put("csrf", getCSRFToken());
         vars.put("dobmin", User.MINIMUM_AGE + "");
         vars.put("countryCode", cs);
diff --git a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
index 6d8c4f2b..de3969b0 100644
--- a/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
+++ b/src/club/wpia/gigi/pages/orga/AffiliationForm.templ
@@ -10,7 +10,7 @@
     <td><?=$name?></td>
     <td><?=$e-mail?></td>
     <td><?=$master?></td>
-    <td><button class="btn btn-warning btn-confirm" data-confirm="<?=_Do you really want to delete the affiliation of ${e-mail} to this organisation??>" data-reply="<?=_Cancel?>,<?=_Delete?>" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
+    <td><button class="btn btn-warning btn-confirm" data-confirm="<?=_Do you really want to delete the affiliation of ${name} (${e-mail}) to this organisation??>" data-reply="<?=_Cancel?>,<?=_Delete?>" type="submit" name="del" value="<?=$e-mail?>">X</button> </td>
   </tr>
 <? } ?>
   <tr>
diff --git a/src/club/wpia/gigi/ping/PingerDaemon.java b/src/club/wpia/gigi/ping/PingerDaemon.java
index 895e8c83..dee4e90c 100644
--- a/src/club/wpia/gigi/ping/PingerDaemon.java
+++ b/src/club/wpia/gigi/ping/PingerDaemon.java
@@ -201,7 +201,7 @@ public class PingerDaemon extends Thread {
                         HashMap<String, Object> vars = new HashMap<>();
                         vars.put("valid", target.isVerified());
                         vars.put("domain", target.getSuffix());
-                        vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + "/" + EditDomain.PATH + target.getId());
+                        vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + target.getId());
                         vars.put("certs", new ArrayIterable<Certificate>(cs) {
 
                             @Override
diff --git a/tests/club/wpia/gigi/ping/TestTiming.java b/tests/club/wpia/gigi/ping/TestTiming.java
index f2b6fe10..2c36b03b 100644
--- a/tests/club/wpia/gigi/ping/TestTiming.java
+++ b/tests/club/wpia/gigi/ping/TestTiming.java
@@ -23,10 +23,13 @@ import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.DomainPingConfiguration;
 import club.wpia.gigi.dbObjects.DomainPingExecution;
 import club.wpia.gigi.dbObjects.DomainPingType;
+import club.wpia.gigi.pages.account.domain.EditDomain;
 import club.wpia.gigi.ping.DomainPinger.PingState;
 import club.wpia.gigi.testUtils.PingTest;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
 import club.wpia.gigi.util.RandomToken;
+import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 import club.wpia.gigi.util.SimpleSigner;
 
 public class TestTiming extends PingTest {
@@ -109,6 +112,7 @@ public class TestTiming extends PingTest {
                 pd.executeNeededPings(new Date(System.currentTimeMillis() + 15 * 24 * 60 * 60L * 1000));
                 // The user receives another warning mail.
                 mail = getMailReceiver().receive(u.getEmail());
+                assertThat(mail.getMessage(), CoreMatchers.containsString("https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + d.getId()));
                 assertThat(mail.getMessage(), CoreMatchers.containsString(d.getSuffix()));
                 assertThat(mail.getMessage(), CoreMatchers.containsString(c.getSerial()));
                 // And when the revocation is carried out