echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Console: Fix HTML errors in form message box,

Browse Source 
logs.jsp, netdb.jsp, profiles.jsp, stats.jsp
This commit is contained in:
zzz
2011-03-12 16:11:10 +00:00
parent 8e672ea548
commit 0f91899aa9
9 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
View File

@ -95,18 +95,18 @@ public class FormHandler {
if (_errors.isEmpty() && _notices.isEmpty())
return "";
StringBuilder buf = new StringBuilder(512);
buf.append("<div class=\"messages\" id=\"messages\"><p>");
buf.append("<div class=\"messages\" id=\"messages\">");
if (!_errors.isEmpty()) {
buf.append("<span class=\"error\">");
buf.append("<div class=\"error\">");
buf.append(render(_errors));
buf.append("</span>");
buf.append("</div>");
}
if (!_notices.isEmpty()) {
buf.append("<span class=\"notice\">");
buf.append("<div class=\"notice\">");
buf.append(render(_notices));
buf.append("</span>");
buf.append("</div>");
}
buf.append("</p></div>");
buf.append("</div>");
return buf.toString();
}

3
apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
View File

@ -53,7 +53,6 @@ public class LogsHelper extends HelperBase {
boolean colorize = Boolean.valueOf(_context.getProperty("routerconsole.logs.color")).booleanValue();
StringBuilder buf = new StringBuilder(16*1024);
buf.append("<ul>");
buf.append("<code>\n");
for (int i = msgs.size(); i > 0; i--) {
String msg = msgs.get(i - 1);
msg = msg.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
@ -87,7 +86,7 @@ public class LogsHelper extends HelperBase {
}
buf.append("</li>\n");
}
buf.append("</code></ul>\n");
buf.append("</ul>\n");
return buf.toString();
}

9
apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
View File

@ -264,7 +264,7 @@ public class NetDbRenderer {
buf.append("<table border=\"0\" cellspacing=\"30\"><tr><th colspan=\"3\">")
.append(_("Network Database Router Statistics"))
.append("</th><tr><td style=\"vertical-align: top;\">");
.append("</th></tr><tr><td style=\"vertical-align: top;\">");
// versions table
List<String> versionList = new ArrayList(versions.objects());
if (!versionList.isEmpty()) {
@ -345,9 +345,9 @@ public class NetDbRenderer {
} else {
buf.append("<b>" + _("Peer info for") + ":</b> ").append(hash).append("\n");
if (full) {
buf.append("[<a href=\"netdb\" >Back</a>]</th></tr><td>\n");
buf.append("[<a href=\"netdb\" >Back</a>]</th></tr><tr><td>\n");
} else {
buf.append("[<a href=\"netdb?r=").append(hash.substring(0, 6)).append("\" >").append(_("Full entry")).append("</a>]</th></tr><td>\n");
buf.append("[<a href=\"netdb?r=").append(hash.substring(0, 6)).append("\" >").append(_("Full entry")).append("</a>]</th></tr><tr><td>\n");
}
}
@ -393,9 +393,8 @@ public class NetDbRenderer {
buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("<br>\n");
}
buf.append("</code></td></tr>\n");
} else {
}
buf.append("</td></tr>\n");
buf.append("</table>\n");
}
private static final int SSU = 1;

3
apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java
View File

@ -213,7 +213,6 @@ class ProfileOrganizerRenderer {
buf.append("<td align=\"center\">").append(DataHelper.stripHTML(info.getCapabilities())).append("</td>");
else
buf.append("<td>&nbsp;</td>");
buf.append("</code></td>");
buf.append("<td align=\"right\">").append(num(prof.getIntegrationValue())).append("</td>");
long time;
time = now - prof.getLastHeardAbout();
@ -261,7 +260,7 @@ class ProfileOrganizerRenderer {
buf.append("<li><b>").append(_("capacity")).append("</b>: ").append(_("how many tunnels can we ask them to join in an hour?")).append("</li>");
buf.append("<li><b>").append(_("integration")).append("</b>: ").append(_("how many new peers have they told us about lately?")).append("</li>");
buf.append("<li><b>").append(_("status")).append("</b>: ").append(_("is the peer banned, or unreachable, or failing tunnel tests?")).append("</li>");
buf.append("</ul></i>");
buf.append("</ul>");
out.write(buf.toString());
out.flush();
}

3
apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java
View File

@ -93,6 +93,7 @@ public class StatsGenerator {
}
out.write("</ul><br>\n");
}
out.write("</div>");
out.flush();
}
@ -167,7 +168,7 @@ public class StatsGenerator {
buf.append("<li>");
renderPeriod(buf, periods[i], _("rate"));
if (curRate.getLastEventCount() > 0) {
buf.append(_("Average")).append(":</i> ");
buf.append(_("Average")).append(": ");
buf.append(num(curRate.getAverageValue()));
buf.append("; ");
buf.append(_("Highest average"));

4
installer/resources/themes/console/classic/console.css
View File

@ -516,11 +516,11 @@ div.messages li, div.messages ul {
margin: -10px 0 0 0;
}
div.messages span.error {
div.error {
color: #d00000;
}
div.messages span.notice {
div.notice {
font-style: italic;
}

4
installer/resources/themes/console/dark/console.css
View File

@ -421,11 +421,11 @@ div.messages {
color: #4f4;
}
div.messages span.error {
div.error {
color: #d90;
}
div.messages span.notice {
div.notice {
font-style: italic;
}

4
installer/resources/themes/console/light/console.css
View File

@ -508,11 +508,11 @@ div.messages {
box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
}
div.messages span.error {
div.error {
color: #d00000;
}
div.messages span.notice {
div.notice {
font-style: italic;
}

4
installer/resources/themes/console/midnight/console.css
View File

@ -533,11 +533,11 @@ div.main li b{
font-size: 9.5pt;
}
div.messages span.error {
div.error {
color: #d00000;
}
div.messages span.notice {
div.notice {
font-style: italic;
}