[freenet-cvs] r22364 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-09-03 12:38:01 +0000 (Wed, 03 Sep 2008)
New Revision: 22364

Modified:
   trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
Log:
If the user says no, don't ask them again!


Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2008-09-03 
12:31:58 UTC (rev 22363)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java   2008-09-03 
12:38:01 UTC (rev 22364)
@@ -124,11 +124,12 @@
                        boolean addedWarning = false;
                        String configName = 
"security-levels.networkThreatLevel";
                        String confirm = 
"security-levels.networkThreatLevel.confirm";
+                       String tryConfirm = 
"security-levels.networkThreatLevel.tryConfirm";
                        String networkThreatLevel = 
request.getPartAsString(configName, 128);
                        NETWORK_THREAT_LEVEL newThreatLevel = 
SecurityLevels.parseNetworkThreatLevel(networkThreatLevel);
                        if(newThreatLevel != null) {
                                if(newThreatLevel != 
node.securityLevels.getNetworkThreatLevel()) {
-                                       if(!request.isPartSet(confirm)) {
+                                       if(!request.isPartSet(confirm) && 
!request.isPartSet(tryConfirm)) {
                                                HTMLNode warning = 
node.securityLevels.getConfirmWarning(newThreatLevel, confirm);
                                                if(warning != null) {
                                                        if(pageNode == null) {
@@ -144,12 +145,13 @@
                                                        infobox.addChild("div", 
"class", "infobox-header", l10nSec("networkThreatLevelConfirmTitle", "mode", 
SecurityLevels.localisedName(newThreatLevel)));
                                                        HTMLNode infoboxContent 
= infobox.addChild("div", "class", "infobox-content");
                                                        
infoboxContent.addChild(warning);
+                                                       
infoboxContent.addChild("input", new String[] { "type", "name", "value" }, new 
String[] { "hidden", tryConfirm, "on" });
                                                        addedWarning = true;
                                                } else {
                                                        // Apply immediately, 
no confirm needed.
                                                        
node.securityLevels.setThreatLevel(newThreatLevel);
                                                }
-                                       } else {
+                                       } else if(request.isPartSet(confirm)) {
                                                // Apply immediately, user 
confirmed it.
                                                
node.securityLevels.setThreatLevel(newThreatLevel);
                                        }