From 33a7f3351b3952fadad6858b5c0a40278e3efc92 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Mon, 17 Aug 2009 13:24:08 +0000
Subject: [PATCH] Start of validation cleanup.

---
 .../java/src/net/i2p/router/web/SummaryHelper.java     |  4 ++--
 apps/routerconsole/jsp/summary.jsp                     |  4 ++--
 apps/routerconsole/jsp/summaryframe.jsp                |  4 ++--
 apps/routerconsole/jsp/summarynoframe.jsp              |  6 +++---
 router/java/src/net/i2p/router/Blocklist.java          |  2 +-
 .../router/peermanager/ProfileOrganizerRenderer.java   |  2 +-
 .../net/i2p/router/transport/CommSystemFacadeImpl.java |  2 +-
 .../net/i2p/router/tunnel/pool/TunnelPoolManager.java  | 10 +++++-----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index a204b25f0..0105e0aeb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -347,9 +347,9 @@ public class SummaryHelper extends HelperBase {
             
             buf.append("<tr><td align=\"right\"><img src=\"/themes/console/images/");
             if (_context.clientManager().shouldPublishLeaseSet(h))
-                buf.append("server.png\" alt=\"Server\" title=\"Server\" />");
+                buf.append("server.png\" alt=\"Server\" title=\"Server\">");
             else
-                buf.append("client.png\" alt=\"Client\" title=\"Client\" />");
+                buf.append("client.png\" alt=\"Client\" title=\"Client\">");
             buf.append("</td><td align=\"left\"><b><a href=\"tunnels.jsp#").append(h.toBase64().substring(0,4));
             buf.append("\" target=\"_top\" title=\"Show tunnels\">");
             if (name.length() < 16)
diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp
index d8a79d3f0..c7672d4f3 100644
--- a/apps/routerconsole/jsp/summary.jsp
+++ b/apps/routerconsole/jsp/summary.jsp
@@ -11,7 +11,7 @@
         // pass the new delay parameter to the iframe
         newDelay = "?refresh=" + d;
     if (!"0".equals(d))
-        out.print("<iframe src=\"summaryframe.jsp" + newDelay + "\" height=\"1500\" width=\"200\" scrolling=\"auto\" frameborder=\"0\" allowtransparency=\"true\">\n");
+        out.print("<iframe src=\"summaryframe.jsp" + newDelay + "\" height=\"1500\" width=\"200\" scrolling=\"auto\" frameborder=\"0\" title=\"sidepanel\">\n");
 %>
 <div class="routersummary">
 <%@include file="summarynoframe.jsp" %>
@@ -28,4 +28,4 @@
         out.print("</form></div>\n");
     }
 %>
-</div></div>
+</div>
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 705b8adc9..05ad49ad7 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -54,7 +54,7 @@
 <%
     // d and shutdownSoon defined above
     if (!shutdownSoon) {
-        out.print("<hr><p><form action=\"summaryframe.jsp\" method=\"GET\">\n");
+        out.print("<hr><form action=\"summaryframe.jsp\" method=\"GET\">\n");
         if ("0".equals(d)) {
             out.print("<b>Refresh (s):<b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" align=\"right\" />\n");
             out.print("<button type=\"submit\">Enable</button>\n");
@@ -63,7 +63,7 @@
             out.print("<input type=\"hidden\" name=\"refresh\" value=\"0\" />\n");
             out.print("<button type=\"submit\">Disable " + d + "s Refresh</button>\n");
         }
-        out.print("</form></p><hr>\n");
+        out.print("</form><hr>\n");
     }
 %>
 </div></body></html>
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index 065fced19..b5c0e69fa 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -12,7 +12,7 @@
 <jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
 <jsp:setProperty name="update" property="*" />
 <jsp:setProperty name="update" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-<a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a><hr>
+<a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"></a><hr>
 <% java.io.File lpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html");
     // you better have target="_top" for the links in there...
     if (lpath.exists()) { %>
@@ -98,9 +98,9 @@
             if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev);
             System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+"");
             String uri = request.getRequestURI();
-            out.print("<p><form action=\"" + uri + "\" method=\"GET\">\n");
+            out.print("<form action=\"" + uri + "\" method=\"GET\">\n");
             out.print("<input type=\"hidden\" name=\"reseedNonce\" value=\"" + nonce + "\" />\n");
-            out.print("<button type=\"submit\" >Reseed</button></form></p>\n");
+            out.print("<button type=\"submit\" >Reseed</button></form>\n");
         }
     }
     // If a new reseed ain't running, and the last reseed had errors, show error message
diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java
index b50017ca5..fa5c0df49 100644
--- a/router/java/src/net/i2p/router/Blocklist.java
+++ b/router/java/src/net/i2p/router/Blocklist.java
@@ -775,7 +775,7 @@ public class Blocklist {
                  if (to != from) {
                      out.write(toStr(to)); out.write("</td></tr>\n");
                  } else
-                     out.write("&nbsp</td></tr>\n");
+                     out.write("&nbsp;</td></tr>\n");
             }
             out.write("</table>");
         } else {
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
index 65e22814d..55bf85e28 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
@@ -149,7 +149,7 @@ class ProfileOrganizerRenderer {
                 if (total / fails <= 10)   // hide if < 10%
                     buf.append(' ').append(fails).append('/').append(total).append(" Test Fails");
             }
-            buf.append("&nbsp</td>");
+            buf.append("&nbsp;</td>");
             buf.append("<td nowrap align=\"center\"><a target=\"_blank\" href=\"dumpprofile.jsp?peer=").append(peer.toBase64().substring(0,6)).append("\">profile</a>");
             buf.append("&nbsp;<a href=\"configpeer.jsp?peer=").append(peer.toBase64()).append("\">+-</a></td>\n");
             buf.append("</tr>");
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index ebbe205b4..6a7eaca84 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -483,7 +483,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
         buf.append(h);
         if (found)
             buf.append("</a>");
-        buf.append("</font></tt>");
+        buf.append("</tt>");
         return buf.toString();
     }
 }
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index 530d3f1af..6bd7ba646 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -493,8 +493,8 @@ public class TunnelPoolManager implements TunnelManagerFacade {
             processed += cfg.getProcessedMessagesCount();
         }
         out.write("</table>\n");
-        out.write("<div class=\"statusnotes\"><center><b>Inactive participating tunnels: " + inactive + "</b></div>\n");
-        out.write("<div class=\"statusnotes\"><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B</b></center></div>\n");
+        out.write("<div class=\"statusnotes\"><b>Inactive participating tunnels: " + inactive + "</b></div>\n");
+        out.write("<div class=\"statusnotes\"><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B</b></div>\n");
         renderPeers(out);
     }
     
@@ -542,9 +542,9 @@ public class TunnelPoolManager implements TunnelManagerFacade {
                 continue; // don't display tunnels in their grace period
             live++;
             if (info.isInbound())
-                out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound\"/></td>");
+                out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound\"></td>");
             else
-                out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"/></td>");
+                out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"></td>");
             out.write(" <td class=\"cells\" align=\"center\">" + DataHelper.formatDuration(timeLeft) + "</td>\n");
             out.write(" <td class=\"cells\" align=\"center\">" + info.getProcessedMessagesCount() + "KB</td>\n");
             for (int j = 0; j < info.getLength(); j++) {
@@ -558,7 +558,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
                 }
                 if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) {
                     for (int k = info.getLength(); k < maxLength; k++)
-                        out.write(" <td class=\"cells\" align=\"center\">&nbsp</td>");
+                        out.write(" <td class=\"cells\" align=\"center\">&nbsp;</td>");
                 }
             }
             out.write("</tr>\n");