X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLogoutPage.java;h=aa8f4016b069a44bbe758d9f5dd437bbc390ec6d;hp=f173bbbaf4c2bd1d9fc6e9d33c4d9e1f54d16e2b;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=48d71153c397d1715430773df3bb05102e962913 diff --git a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java index f173bbb..aa8f401 100644 --- a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java +++ b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java @@ -1,5 +1,5 @@ /* - * FreenetSone - LogoutPage.java - Copyright © 2010 David Roden + * Sone - LogoutPage.java - Copyright © 2010–2015 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,7 +17,9 @@ package net.pterodactylus.sone.web; +import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; import freenet.clients.http.ToadletContext; /** @@ -34,7 +36,7 @@ public class LogoutPage extends SoneTemplatePage { * The Sone web interface */ public LogoutPage(Template template, WebInterface webInterface) { - super("logout.html", template, "Page.Logout.Title", webInterface); + super("logout.html", template, "Page.Logout.Title", webInterface, true); } // @@ -45,9 +47,9 @@ public class LogoutPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, Template template) throws RedirectException { + protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { setCurrentSone(request.getToadletContext(), null); - super.processTemplate(request, template); + super.processTemplate(request, templateContext); throw new RedirectException("index.html"); } @@ -55,16 +57,11 @@ public class LogoutPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected boolean requiresLogin() { - return true; - } - - /** - * {@inheritDoc} - */ - @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); } }