Merge branch 'release-0.9.6'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / CreateSonePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
index 04b5d37..a74204c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - CreateSonePage.java - Copyright © 2010 David Roden
+ * Sone - CreateSonePage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -28,10 +30,10 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-import net.pterodactylus.sone.web.page.Page.Request.Method;
-import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
 import freenet.clients.http.ToadletContext;
 
 /**
@@ -42,7 +44,7 @@ import freenet.clients.http.ToadletContext;
 public class CreateSonePage extends SoneTemplatePage {
 
        /** The logger. */
-       private static final Logger logger = Logging.getLogger(CreateSonePage.class);
+       private static final Logger logger = getLogger(CreateSonePage.class.getName());
 
        /**
         * Creates a new “create Sone” page.
@@ -94,10 +96,12 @@ public class CreateSonePage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-               super.processTemplate(request, dataProvider);
+       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
+               Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
+               templateContext.set("sones", localSones);
                List<OwnIdentity> ownIdentitiesWithoutSone = getOwnIdentitiesWithoutSone(webInterface.getCore());
-               dataProvider.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
+               templateContext.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
                if (request.getMethod() == Method.POST) {
                        String id = request.getHttpRequest().getPartAsStringFailsafe("identity", 44);
                        OwnIdentity selectedIdentity = null;
@@ -108,14 +112,13 @@ public class CreateSonePage extends SoneTemplatePage {
                                }
                        }
                        if (selectedIdentity == null) {
-                               dataProvider.set("errorNoIdentity", true);
+                               templateContext.set("errorNoIdentity", true);
                                return;
                        }
                        /* create Sone. */
-                       webInterface.getCore().getIdentityManager().addContext(selectedIdentity, "Sone");
                        Sone sone = webInterface.getCore().createSone(selectedIdentity);
                        if (sone == null) {
-                               logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: %s", selectedIdentity);
+                               logger.log(Level.SEVERE, String.format("Could not create Sone for OwnIdentity: %s", selectedIdentity));
                                /* TODO - go somewhere else */
                        }
 
@@ -130,7 +133,10 @@ public class CreateSonePage extends SoneTemplatePage {
         */
        @Override
        public boolean isEnabled(ToadletContext toadletContext) {
-               return getCurrentSone(toadletContext) == null;
+               if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
+                       return false;
+               }
+               return (getCurrentSone(toadletContext, false) == null) || (webInterface.getCore().getLocalSones().size() == 1);
        }
 
 }