I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* replaceAll() -> replace() when not using regex

Browse Source 
* ampersand escaping (lots more to do)
This commit is contained in:
zzz
2010-10-19 14:39:29 +00:00
parent 8c7a39f00a
commit 466128c179
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@ -142,7 +142,7 @@ public class ConfigUpdateHandler extends FormHandler {
}
if ( (_updateURL != null) && (_updateURL.length() > 0) ) {
_updateURL = _updateURL.replaceAll("\r\n", ",").replaceAll("\n", ",");
_updateURL = _updateURL.replace("\r\n", ",").replace("\n", ",");
String oldURL = _context.router().getConfigSetting(PROP_UPDATE_URL);
if ( (oldURL == null) || (!_updateURL.equals(oldURL)) ) {
_context.router().setConfigSetting(PROP_UPDATE_URL, _updateURL);
@ -151,7 +151,7 @@ public class ConfigUpdateHandler extends FormHandler {
}
if ( (_trustedKeys != null) && (_trustedKeys.length() > 0) ) {
_trustedKeys = _trustedKeys.replaceAll("\r\n", ",").replaceAll("\n", ",");
_trustedKeys = _trustedKeys.replace("\r\n", ",").replace("\n", ",");
String oldKeys = new TrustedUpdate(_context).getTrustedKeysString();
if ( (oldKeys == null) || (!_trustedKeys.equals(oldKeys)) ) {
_context.router().setConfigSetting(PROP_TRUSTED_KEYS, _trustedKeys);

2
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
View File

@ -40,7 +40,7 @@ public class ConfigUpdateHelper extends HelperBase {
public String getUpdateURL() {
String url = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_URL);
if (url != null)
return url.replaceAll(",", "\n");
return url.replace(",", "\n");
else
return ConfigUpdateHandler.DEFAULT_UPDATE_URL;
}

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

@ -33,7 +33,7 @@ public class LogsHelper extends HelperBase {
if (str == null)
return "";
else {
str = str.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
str = str.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
return _("File location") + ": <b><code>" + f.getAbsolutePath() + "</code></b> <pre>" + str + "</pre>";
}
}
@ -54,12 +54,14 @@ public class LogsHelper extends HelperBase {
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;");
buf.append("<li>");
if (colorize) {
String color;
// Homeland Security Advisory System
// http://www.dhs.gov/xinfoshare/programs/Copy_of_press_release_0046.shtm
// but pink instead of yellow for WARN
// FIXME doesnt work for translated levels
if (msg.contains("CRIT"))
color = "#cc0000";
else if (msg.contains("ERROR"))
@ -71,7 +73,7 @@ public class LogsHelper extends HelperBase {
else
color = "#006600";
buf.append("<font color=\"").append(color).append("\">");
buf.append(msg.replaceAll("<", "&lt;").replaceAll(">", "&gt;"));
buf.append(msg);
buf.append("</font>");
} else {
buf.append(msg);