From 77cfe0be01967c05a7b8748d14870751851b90ce Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 3 Mar 2013 20:32:02 +0000 Subject: [PATCH] graphs.jsp: Fix saving settings (ticket #857) --- .../java/src/net/i2p/router/web/GraphHelper.java | 8 ++++---- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index f2fc06ec3..7742ff90f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -332,10 +332,10 @@ public class GraphHelper extends FormHandler { public String getForm() { if (StatSummarizer.isDisabled()) return ""; - String prev = System.getProperty("net.i2p.router.web.GraphHelper.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.GraphHelper.noncePrev", prev); - String nonce = "" + _context.random().nextLong(); - System.setProperty("net.i2p.router.web.GraphHelper.nonce", nonce); + // too hard to use the standard formhandler.jsi / FormHandler.java session nonces + // since graphs.jsp needs the refresh value in its . + // So just use the "shared/console nonce". + String nonce = CSSHelper.getNonce(); try { _out.write("

" + _("Configure Graph Display") + " [" + _("Select Stats") + "]

"); _out.write("
\n" + diff --git a/history.txt b/history.txt index 234f6c8d3..d5a2fc53c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2013-03-03 zzz + * graphs.jsp: Fix saving settings (ticket #857) + 2013-03-03 kytv * Update geoip.txt based on Maxmind GeoLite Country database from 2013-02-19 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 5a58b19bc..e36cd3b14 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 11; + public final static long BUILD = 12; /** for example "-test" */ public final static String EXTRA = "";