X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=4a3e2b158e129ee73f2fa858f4bacad82c682db5;hb=2c5b76a2fbce16ef33f079a3de9ae9fc9a9d30b8;hp=7e99b32e3e0fab31f65339dec6f1abd62962d9bc;hpb=8276173b917c67f253c59f5ddf99b4deb155a870;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java index 7e99b32..4a3e2b1 100644 --- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java +++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java @@ -17,10 +17,15 @@ package net.pterodactylus.sone.web; -import java.util.Set; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.logging.Logger; 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.Template; import freenet.clients.http.ToadletContext; @@ -31,6 +36,10 @@ import freenet.clients.http.ToadletContext; */ public class LoginPage extends SoneTemplatePage { + /** The logger. */ + @SuppressWarnings("unused") + private static final Logger logger = Logging.getLogger(LoginPage.class); + /** * Creates a new login page. * @@ -40,7 +49,7 @@ public class LoginPage extends SoneTemplatePage { * The Sone web interface */ public LoginPage(Template template, WebInterface webInterface) { - super("login.html", template, "Page.Login.Title", webInterface); + super("login.html", template, "Page.Login.Title", webInterface, false); } // @@ -52,12 +61,15 @@ public class LoginPage extends SoneTemplatePage { */ @Override protected void processTemplate(Request request, Template template) throws RedirectException { - Set localSones = webInterface.core().localSones(); + super.processTemplate(request, template); + /* get all own identities. */ + List localSones = new ArrayList(webInterface.core().getLocalSones()); + Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR); template.set("sones", localSones); if (request.getMethod() == Method.POST) { String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100); Sone selectedSone = null; - for (Sone sone : webInterface.core().localSones()) { + for (Sone sone : webInterface.core().getSones()) { if (sone.getId().equals(soneId)) { selectedSone = sone; break; @@ -68,8 +80,14 @@ public class LoginPage extends SoneTemplatePage { throw new RedirectException("index.html"); } } + List ownIdentitiesWithoutSone = CreateSonePage.getOwnIdentitiesWithoutSone(webInterface.core()); + template.set("identitiesWithoutSone", ownIdentitiesWithoutSone); } + // + // SONETEMPLATEPAGE METHODS + // + /** * {@inheritDoc} */