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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-03 18:30:37 +0000 (Wed, 03 Sep 2008)
New Revision: 22377

Modified:
   trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
Log:
If invalid, go back to the step


Modified: trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java  
2008-09-03 18:19:35 UTC (rev 22376)
+++ trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java  
2008-09-03 18:30:37 UTC (rev 22377)
@@ -326,6 +326,10 @@
                        // FIXME should we have confirmation here???
                        String networkThreatLevel = 
request.getPartAsString("security-levels.networkThreatLevel", 128);
                        NETWORK_THREAT_LEVEL newThreatLevel = 
SecurityLevels.parseNetworkThreatLevel(networkThreatLevel);
+                       if(newThreatLevel == null) {
+                               super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.SECURITY_NETWORK);
+                               return;
+                       }
                        core.node.securityLevels.setThreatLevel(newThreatLevel);
                        super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.SECURITY_FRIENDS);
                } else 
if(request.isPartSet("security-levels.friendsThreatLevel")) {
@@ -334,6 +338,10 @@
                        // FIXME should we have confirmation here???
                        String friendsThreatLevel = 
request.getPartAsString("security-levels.friendsThreatLevel", 128);
                        FRIENDS_THREAT_LEVEL newThreatLevel = 
SecurityLevels.parseFriendsThreatLevel(friendsThreatLevel);
+                       if(newThreatLevel == null) {
+                               super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.SECURITY_FRIENDS);
+                               return;
+                       }
                        core.node.securityLevels.setThreatLevel(newThreatLevel);
                        super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.SECURITY_PHYSICAL);
                } else 
if(request.isPartSet("security-levels.physicalThreatLevel")) {
@@ -342,6 +350,10 @@
                        // FIXME should we have confirmation here???
                        String physicalThreatLevel = 
request.getPartAsString("security-levels.physicalThreatLevel", 128);
                        PHYSICAL_THREAT_LEVEL newThreatLevel = 
SecurityLevels.parsePhysicalThreatLevel(physicalThreatLevel);
+                       if(newThreatLevel == null) {
+                               super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.SECURITY_PHYSICAL);
+                               return;
+                       }
                        core.node.securityLevels.setThreatLevel(newThreatLevel);
                        core.storeConfig();
                        super.writeTemporaryRedirect(ctx, "step1", 
TOADLET_URL+"?step="+WIZARD_STEP.NAME_SELECTION+"&opennet="+core.node.isOpennetEnabled());