Changeset 281534b

Timestamp:

Jul 11, 2017 2:15:17 AM (4 years ago)

Author:

str4d <str4d@…>

Branches:

master

Children:

19fcb9e

Parents:

4fff747

Message:

Fix HTML tags across non-default conditional branches

Files:

• apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java (modified) (2 diffs)
• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java (modified) (1 diff)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/Blocklist.java (modified) (3 diffs)

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -3507 +3507 @@
                 }
                 buf.append("</select>\n</td>");
+            } else {
+                buf.append("<td></td>");
             }
             if (esc) {
@@ -3600 +3602 @@
                                .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");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

@@ -758 +758 @@
                     out.write("</a>\n");
                 }
-            }
-        }
-        out.write("</div>\n</div>\n");
+                if (!first) { // We wrote out the opening <div>
+                    out.write("</div>\n");
+                }
+            }
+        }
+        out.write("</div>\n");
         writeFooter(out);
     }

history.txt

@@ -1 +1 @@
 2017-07-11 str4d
  * I2PSnark: Fix I2PSnarkUtil.getCommentsName() to match its JavaDoc
+ * Fix HTML tags across non-default conditional branches
 
 2017-07-08 zzz

router/java/src/net/i2p/router/Blocklist.java

@@ -1015 +1015 @@
         // 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>");
@@ -1061 +1061 @@
                 }
             }
-            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>");
@@ -1111 +1116 @@
                 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();
     }