X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=8e612eae5b1e498c77c9b505c3b509ddee516171;hb=ed57f849f204eee0a3074c1acb7c290ef20ada3a;hp=10f1f9f53deb1723d7083f4e0f9815177aca7917;hpb=ecf753a31601e558b681daab0598009fe9eec99a;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..8e612ea 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - LoginPage.java - Copyright © 2010 David Roden
+ * Sone - LoginPage.java - Copyright © 2010 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
@@ -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,10 @@ public class LoginPage extends SoneTemplatePage {
 	 */
 	@Override
 	public boolean isEnabled(ToadletContext toadletContext) {
-		return getCurrentSone(toadletContext) == null;
+		if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
+			return false;
+		}
+		return getCurrentSone(toadletContext, false) == null;
 	}
 
 }