X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePage.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePage.kt;h=3f04236ac871b113de94e06cc19d2c47ecd241bd;hp=6f5de15ea0028ce0c1ffd6f4d9c6521f13e1d207;hb=3cb0e2c78bb37f2d70ecde92ad4fcf642de788a3;hpb=cec099ef08feaff5332b81885ad989dbcb0fdfba

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
index 6f5de15..3f04236 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -42,7 +42,7 @@ open class SoneTemplatePage(
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(request: FreenetRequest) =
+	override public fun getPageTitle(freenetRequest: FreenetRequest) =
 			pageTitleKey?.let(webInterface.l10n::getString) ?: ""
 
 	override public fun getStyleSheets() =
@@ -76,16 +76,16 @@ open class SoneTemplatePage(
 		handleRequest(freenetRequest, templateContext)
 	}
 
-	internal open fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+	internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
 	}
 
-	override public fun getRedirectTarget(request: FreenetRequest): String? {
-		if (requiresLogin && getCurrentSone(request.toadletContext) == null) {
-			val parameters = request.httpRequest.parameterNames
-					.flatMap { name -> request.httpRequest.getMultipleParam(name).map { name to it } }
+	override public fun getRedirectTarget(freenetRequest: FreenetRequest): String? {
+		if (requiresLogin && getCurrentSone(freenetRequest.toadletContext) == null) {
+			val parameters = freenetRequest.httpRequest.parameterNames
+					.flatMap { name -> freenetRequest.httpRequest.getMultipleParam(name).map { name to it } }
 					.joinToString("&") { "${it.first.urlEncode}=${it.second.urlEncode}" }
 					.emptyToNull
-			return "login.html?target=${request.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
+			return "login.html?target=${freenetRequest.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
 		}
 		return null
 	}