X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUnlockSonePage.java;h=56ee2b7c46accfb238d7c538e3cbbfc43f0a5acd;hb=fd88107b013522d7620f5297386472206f320e10;hp=fe5c894f1bb4fa7e5f060539de975eac41e0570a;hpb=c93070476a62e3db94f175576e3cdabf49db1086;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java index fe5c894..56ee2b7 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java @@ -1,5 +1,5 @@ /* - * Sone - LockSonePage.java - Copyright © 2010 David Roden + * Sone - UnlockSonePage.java - Copyright © 2010–2013 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,8 +17,13 @@ package net.pterodactylus.sone.web; +import net.pterodactylus.sone.data.LocalSone; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; + +import com.google.common.base.Optional; /** * This page lets the user unlock a {@link Sone} to allow its insertion. @@ -47,14 +52,14 @@ public class UnlockSonePage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, Template template) throws RedirectException { - super.processTemplate(request, template); + protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { + super.processTemplate(request, templateContext); String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44); - Sone sone = webInterface.getCore().getLocalSone(soneId, false); - if (sone != null) { - webInterface.getCore().unlockSone(sone); + Optional localSone = webInterface.getCore().getLocalSone(soneId); + if (localSone.isPresent()) { + webInterface.getCore().unlockSone(localSone.get()); } - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64); + String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); throw new RedirectException(returnPage); }