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=20251c086557b628069dae53f8c7718475274882;hp=4313a596d5806f3e0aa6dca04eec45e7fd2c5196;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=acf40290db822d7cbdaed590850f692953f51ac1

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 4313a59..20251c0 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@ -5,7 +5,7 @@ import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import javax.inject.Inject
@@ -16,25 +16,25 @@ import javax.inject.Inject
 class LoginPage @Inject constructor(template: Template, webInterface: WebInterface):
 		SoneTemplatePage("login.html", webInterface, template, "Page.Login.Title") {
 
-	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(freenetRequest.toadletContext, sone)
-				val target = freenetRequest.httpRequest.getParam("target").emptyToNull ?: "index.html"
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			val soneId = soneRequest.httpRequest.getPartAsStringFailsafe("sone-id", 43)
+			soneRequest.core.getLocalSone(soneId)?.let { sone ->
+				setCurrentSone(soneRequest.toadletContext, sone)
+				val target = soneRequest.httpRequest.getParam("target").emptyToNull ?: "index.html"
 				throw RedirectException(target)
 			}
 		}
-		templateContext["sones"] = webInterface.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
-		templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}" }
+		templateContext["sones"] = soneRequest.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
+		templateContext["identitiesWithoutSone"] = soneRequest.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}" }
 	}
 
 	override fun getRedirectTarget(freenetRequest: FreenetRequest) =
 			getCurrentSone(freenetRequest.toadletContext)?.let { "index.html" }
 
-	override fun isEnabled(toadletContext: ToadletContext) = when {
-		webInterface.core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
-		else -> getCurrentSone(toadletContext, false) == null
+	override fun isEnabled(soneRequest: SoneRequest) = when {
+		soneRequest.core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess -> false
+		else -> getCurrentSone(soneRequest.toadletContext, false) == null
 	}
 
 }