X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=eaa83517bc902225f741ff0c45aa32ad94605a1c;hb=d4fb65bed263c3d73eeae23c202d8fd8aa4e6735;hp=10f1f9f53deb1723d7083f4e0f9815177aca7917;hpb=9e4db46b86d084eba9029906e779ec1d96f78ac4;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 10f1f9f..eaa8351 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -72,7 +72,11 @@ public class LoginPage extends SoneTemplatePage {
 			Sone selectedSone = webInterface.getCore().getLocalSone(soneId, false);
 			if (selectedSone != null) {
 				setCurrentSone(request.getToadletContext(), selectedSone);
-				throw new RedirectException("index.html");
+				String target = request.getHttpRequest().getParam("target");
+				if ((target == null) || (target.length() == 0)) {
+					target = "index.html";
+				}
+				throw new RedirectException(target);
 			}
 		}
 		List<OwnIdentity> ownIdentitiesWithoutSone = CreateSonePage.getOwnIdentitiesWithoutSone(webInterface.getCore());
@@ -84,7 +88,7 @@ public class LoginPage extends SoneTemplatePage {
 	 */
 	@Override
 	protected String getRedirectTarget(Request request) {
-		if (getCurrentSone(request.getToadletContext()) != null) {
+		if (getCurrentSone(request.getToadletContext(), false) != null) {
 			return "index.html";
 		}
 		return null;
@@ -99,7 +103,7 @@ public class LoginPage extends SoneTemplatePage {
 	 */
 	@Override
 	public boolean isEnabled(ToadletContext toadletContext) {
-		return getCurrentSone(toadletContext) == null;
+		return getCurrentSone(toadletContext, false) == null;
 	}
 
 }