From 281534b0b0ec0c92bd9aac8c7d8bced2bdc6b56e Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 11 Jul 2017 02:15:17 +0000
Subject: [PATCH] Fix HTML tags across non-default conditional branches

---
 .../org/klomp/snark/web/I2PSnarkServlet.java  |  6 +++-
 .../i2ptunnel/I2PTunnelHTTPClientBase.java    |  5 ++-
 history.txt                                   |  1 +
 router/java/src/net/i2p/router/Blocklist.java | 31 +++++++++++--------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 56461f20e4..56c95d7d7f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -3506,6 +3506,8 @@ public class I2PSnarkServlet extends BasicServlet {
                     buf.append("</option>\n");
                 }
                 buf.append("</select>\n</td>");
+            } else {
+                buf.append("<td></td>");
             }
             if (esc) {
                 buf.append("<td id=\"addCommentText\"><textarea name=\"nofilter_newComment\" cols=\"44\" rows=\"4\"></textarea></td>");
@@ -3599,9 +3601,11 @@ public class I2PSnarkServlet extends BasicServlet {
                             buf.append("</div></td><td class=\"commentDelete\"><input type=\"checkbox\" class=\"optbox\" name=\"cdelete.")
                                .append(c.getID()).append("\" title=\"").append(_t("Mark for deletion")).append("\">");
                             ccount++;
+                        } else {
+                            buf.append("</td><td class=\"commentDelete\">"); // insert empty named columns to maintain table layout
                         }
                     } else {
-                        buf.append("</td><td class=\"commentDelete\">"); // insert empty named columns to maintain table layout .. fails to catch uncommented row when comments also shown
+                        buf.append("</td><td class=\"commentDelete\">"); // insert empty named columns to maintain table layout
                     }
                     buf.append("</td></tr>\n");
                 }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 04da4c8887..213874efe3 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -757,9 +757,12 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
                     out.write(_t("{0} jump service", jumphost));
                     out.write("</a>\n");
                 }
+                if (!first) { // We wrote out the opening <div>
+                    out.write("</div>\n");
+                }
             }
         }
-        out.write("</div>\n</div>\n");
+        out.write("</div>\n");
         writeFooter(out);
     }
 
diff --git a/history.txt b/history.txt
index bf1087f9f1..6e61546326 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,6 @@
 2017-07-11 str4d
  * I2PSnark: Fix I2PSnarkUtil.getCommentsName() to match its JavaDoc
+ * Fix HTML tags across non-default conditional branches
 
 2017-07-08 zzz
  * GeoIP, blocklist, translations update
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index 38a5b79399..6496da3b90 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -1014,13 +1014,13 @@ public class Blocklist {
     public void renderStatusHTML(Writer out) throws IOException {
         // move to the jsp
         //out.write("<h2>Banned IPs</h2>");
+        out.write("<table id=\"bannedips\"><tr><td>");
+        out.write("<table id=\"banneduntilrestart\"><tr><th align=\"center\"><b>");
+        out.write(_t("IPs Banned Until Restart"));
+        out.write("</b></th></tr>");
         Set<Integer> singles = new TreeSet<Integer>();
         singles.addAll(_singleIPBlocklist);
         if (!(singles.isEmpty() && _singleIPv6Blocklist.isEmpty())) {
-            out.write("<table id=\"bannedips\"><tr><td>");
-            out.write("<table id=\"banneduntilrestart\"><tr><th align=\"center\"><b>");
-            out.write(_t("IPs Banned Until Restart"));
-            out.write("</b></th></tr>");
             if (!singles.isEmpty()) {
                 out.write("<tr id=\"ipv4\" align=\"center\"><td><b>");
                 out.write(_t("IPv4 Addresses"));
@@ -1060,13 +1060,18 @@ public class Blocklist {
                      out.write("</td></tr>\n");
                 }
             }
-            out.write("</table>");
+        } else {
+            out.write("<tr><td><i>");
+            out.write(_t("none"));
+            out.write("</i></td></tr>");
         }
+        out.write("</table>");
+        out.write("</td><td>");
+        out.write("<table id=\"permabanned\"><tr><th align=\"center\" colspan=\"3\"><b>");
+        out.write(_t("IPs Permanently Banned"));
+        out.write("</b></th></tr>");
         if (_blocklistSize > 0) {
-            out.write("</td><td>");
-            out.write("<table id=\"permabanned\"><tr><th align=\"center\" colspan=\"3\"><b>");
-            out.write(_t("IPs Permanently Banned"));
-            out.write("</b></th></tr><tr><td align=\"center\" width=\"49%\"><b>");
+            out.write("<tr><td align=\"center\" width=\"49%\"><b>");
             out.write(_t("From"));
             out.write("</b></td><td></td><td align=\"center\" width=\"49%\"><b>");
             out.write(_t("To"));
@@ -1110,13 +1115,13 @@ public class Blocklist {
                 // very rare, don't bother translating
                 out.write("<tr><th colspan=2>First " + MAX_DISPLAY + " displayed, see the " +
                           BLOCKLIST_FILE_DEFAULT + " file for the full list</th></tr>");
-            out.write("</table>");
-            out.write("</td></tr></table>");
         } else {
-            out.write("<br><i>");
+            out.write("<tr><td><i>");
             out.write(_t("none"));
-            out.write("</i>");
+            out.write("</i></td></tr>");
         }
+        out.write("</table>");
+        out.write("</td></tr></table>");
         out.flush();
     }