X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FLoginPage.kt;h=4313a596d5806f3e0aa6dca04eec45e7fd2c5196;hp=442aa7b50f81742dbc15ceccfea9d61f78e32da0;hb=fc8e9ea5c978d2f5a00894e093364ae62f18934b;hpb=5ba707d40f9d2a20094aaabc21647aeec1feed46

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
index 442aa7b..4313a59 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@ -8,19 +8,20 @@ import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * The login page lets the user log in.
  */
-class LoginPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("login.html", template, "Page.Login.Title", webInterface) {
+class LoginPage @Inject constructor(template: Template, webInterface: WebInterface):
+		SoneTemplatePage("login.html", webInterface, template, "Page.Login.Title") {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		if (request.isPOST) {
-			val soneId = request.httpRequest.getPartAsStringFailsafe("sone-id", 43)
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		if (freenetRequest.isPOST) {
+			val soneId = freenetRequest.httpRequest.getPartAsStringFailsafe("sone-id", 43)
 			webInterface.core.getLocalSone(soneId)?.let { sone ->
-				setCurrentSone(request.toadletContext, sone)
-				val target = request.httpRequest.getParam("target").emptyToNull ?: "index.html"
+				setCurrentSone(freenetRequest.toadletContext, sone)
+				val target = freenetRequest.httpRequest.getParam("target").emptyToNull ?: "index.html"
 				throw RedirectException(target)
 			}
 		}
@@ -28,11 +29,11 @@ class LoginPage(template: Template, webInterface: WebInterface):
 		templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}" }
 	}
 
-	override public fun getRedirectTarget(request: FreenetRequest) =
-			getCurrentSone(request.toadletContext)?.let { "index.html" }
+	override fun getRedirectTarget(freenetRequest: FreenetRequest) =
+			getCurrentSone(freenetRequest.toadletContext)?.let { "index.html" }
 
 	override fun isEnabled(toadletContext: ToadletContext) = when {
-		webInterface.core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess -> false
+		webInterface.core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
 		else -> getCurrentSone(toadletContext, false) == null
 	}