Merge branch 'master' into next

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

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index 6c3e5c5..dcfd8a7 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -68,7 +68,7 @@ public class LoginPage extends SoneTemplatePage {
                template.set("sones", localSones);
                if (request.getMethod() == Method.POST) {
                        String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
-                       Sone selectedSone = webInterface.getCore().getLocalSone(soneId);
+                       Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
                        if (selectedSone != null) {
                                setCurrentSone(request.getToadletContext(), selectedSone);
                                throw new RedirectException("index.html");
@@ -78,6 +78,17 @@ public class LoginPage extends SoneTemplatePage {
                template.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected String getRedirectTarget(Request request) {
+               if (getCurrentSone(request.getToadletContext()) != null) {
+                       return "index.html";
+               }
+               return null;
+       }
+
        //
        // SONETEMPLATEPAGE METHODS
        //