From e4d9435bddb75a0d5c238518766d76b17d494d34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 23 May 2017 20:55:51 +0200 Subject: [PATCH] Replace logout page with Kotlin version --- .../pterodactylus/sone/web/pages/LogoutPage.java | 67 ---------------------- .../net/pterodactylus/sone/web/pages/LogoutPage.kt | 26 +++++++++ 2 files changed, 26 insertions(+), 67 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/LogoutPage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/LogoutPage.java b/src/main/java/net/pterodactylus/sone/web/pages/LogoutPage.java deleted file mode 100644 index 1f2261c..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/LogoutPage.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Sone - LogoutPage.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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.web.pages; - -import net.pterodactylus.sone.web.WebInterface; -import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; -import freenet.clients.http.ToadletContext; - -/** - * Logs a user out. - * - * @author David ‘Bombe’ Roden - */ -public class LogoutPage extends SoneTemplatePage { - - /** - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public LogoutPage(Template template, WebInterface webInterface) { - super("logout.html", template, "Page.Logout.Title", webInterface, true); - } - - // - // TEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - setCurrentSone(request.getToadletContext(), null); - throw new RedirectException("index.html"); - } - - /** - * {@inheritDoc} - */ - @Override - public boolean isEnabled(ToadletContext toadletContext) { - if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) { - return false; - } - return (getCurrentSone(toadletContext, false) != null) && (webInterface.getCore().getLocalSones().size() != 1); - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt new file mode 100644 index 0000000..12cf8b4 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt @@ -0,0 +1,26 @@ +package net.pterodactylus.sone.web.pages + +import freenet.clients.http.ToadletContext +import net.pterodactylus.sone.web.WebInterface +import net.pterodactylus.sone.web.page.FreenetRequest +import net.pterodactylus.util.template.Template +import net.pterodactylus.util.template.TemplateContext + +/** + * Logs a user out. + */ +class LogoutPage(template: Template, webInterface: WebInterface): + SoneTemplatePage("logout.html", template, "Page.Logout.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + setCurrentSone(request.toadletContext, null) + throw RedirectException("index.html") + } + + override fun isEnabled(toadletContext: ToadletContext): Boolean = + if (webInterface.core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess) { + false + } else + getCurrentSone(toadletContext) != null && webInterface.core.localSones.size != 1 + +} -- 2.7.4