Changeset a028bba
- Timestamp:
- Nov 12, 2015 8:39:58 PM (5 years ago)
- Branches:
- master
- Children:
- 8a1f02aa
- Parents:
- e93e76a
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
re93e76a ra028bba 245 245 if (_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_CLIENT_CHANGE) || 246 246 isAdvanced()) { 247 String desc = getJettyString(" desc" + cur);247 String desc = getJettyString("nofilter_desc" + cur); 248 248 if (desc != null) { 249 249 int spc = desc.indexOf(" "); … … 256 256 ca.className = clss; 257 257 ca.args = args; 258 ca.clientName = getJettyString("n ame" + cur);258 ca.clientName = getJettyString("nofilter_name" + cur); 259 259 } 260 260 } … … 265 265 isAdvanced()) { 266 266 int newClient = clients.size(); 267 String newDesc = getJettyString(" desc" + newClient);267 String newDesc = getJettyString("nofilter_desc" + newClient); 268 268 if (newDesc != null && newDesc.trim().length() > 0) { 269 269 // new entry … … 275 275 args = newDesc.substring(spc + 1); 276 276 } 277 String name = getJettyString("n ame" + newClient);277 String name = getJettyString("nofilter_name" + newClient); 278 278 if (name == null || name.trim().length() <= 0) name = "new client"; 279 279 ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000, 280 _settings.get(newClient + ".enabled") != null);280 _settings.get(newClient + ".enabled") == null); // true for disabled 281 281 clients.add(ca); 282 282 addFormNotice(_t("New client added") + ": " + name + " (" + clss + ")."); -
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
re93e76a ra028bba 323 323 boolean showEditButton, boolean showUpdateButton, boolean showStopButton, 324 324 boolean showDeleteButton, boolean showStartButton) { 325 String escapeddesc = DataHelper.escapeHTML(desc); 325 String escapedName = DataHelper.escapeHTML(name); 326 String escapedDesc = DataHelper.escapeHTML(desc); 326 327 buf.append("<tr><td class=\"mediumtags\" align=\"right\" width=\"25%\">"); 327 328 if (urlify && enabled) { 328 329 String link = "/"; 329 330 if (! RouterConsoleRunner.ROUTERCONSOLE.equals(name)) 330 link += name + "/";331 buf.append("<a href=\"").append(link).append("\">").append(_t( name)).append("</a>");331 link += escapedName + "/"; 332 buf.append("<a href=\"").append(link).append("\">").append(_t(escapedName)).append("</a>"); 332 333 } else if (edit && !ro) { 333 buf.append("<input type=\"text\" name=\"n ame").append(index).append("\" value=\"");334 buf.append("<input type=\"text\" name=\"nofilter_name").append(index).append("\" value=\""); 334 335 if (name.length() > 0) 335 buf.append(_t( name));336 buf.append(_t(escapedName)); 336 337 buf.append("\" >"); 337 338 } else { 338 339 if (name.length() > 0) 339 buf.append(_t( name));340 } 341 buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\"");340 buf.append(_t(escapedName)); 341 } 342 buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\""); 342 343 if (enabled) { 343 344 buf.append("checked=\"checked\" "); … … 367 368 buf.append("<button type=\"submit\" class=\"Xdelete\" name=\"action\" value=\"Delete ").append(index) 368 369 .append("\" onclick=\"if (!confirm('") 369 .append(_t("Are you sure you want to delete {0}?", _t( name)))370 .append(_t("Are you sure you want to delete {0}?", _t(escapedName))) 370 371 .append("')) { return false; }\">") 371 372 .append(_t("Delete")).append("<span class=hide> ").append(index).append("</span></button>"); … … 373 374 buf.append("</td><td align=\"left\" width=\"50%\">"); 374 375 if (edit && !ro) { 375 buf.append("<input type=\"text\" size=\"80\" spellcheck=\"false\" name=\" desc").append(index).append("\" value=\"");376 buf.append(escaped desc);376 buf.append("<input type=\"text\" size=\"80\" spellcheck=\"false\" name=\"nofilter_desc").append(index).append("\" value=\""); 377 buf.append(escapedDesc); 377 378 buf.append("\" >"); 378 379 } else { 379 buf.append( desc);380 buf.append(escapedDesc); 380 381 } 381 382 buf.append("</td></tr>\n"); -
history.txt
re93e76a ra028bba 1 2015-11-12 zzz 2 * Console /configclients: 3 = Fix filtering and escaping 4 - Fix autostart setting on new client, was inverted 5 1 6 2015-11-11 zzz 2 7 * i2psnark: 3 - Change log level to hide socket closed error at tunnel shutdown 8 - Change log level to hide socket closed error at tunnel shutdown (ticket #1687) 4 9 - Increase max pieces 5 10 * Timers: State fix 4th try (tickets #1694, #1705) 6 11 7 12 2015-11-05 zzz 8 * I2CP: Fix additional connections getting rejected during tunnel open (ticket #1650)13 * I2CP: Fix additional connections getting rejected during tunnel open (tickets #1650, #1698) 9 14 * Streaming: Split blacklist into one for EC and one for Ed 10 15 -
router/java/src/net/i2p/router/RouterVersion.java
re93e76a ra028bba 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 2 5;21 public final static long BUILD = 26; 22 22 23 23 /** for example "-test" */
Note: See TracChangeset
for help on using the changeset viewer.