X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePage.kt;h=d031a00bcfc89bdcb3b6a068d77216dcfaac07db;hp=3df343a6c30c0ac3bd624d2f9156443bf9ef1ec5;hb=76f3cee76957a00d6cb8f1ebcef9a2af3be7b603;hpb=110a933c2724aba6a604fc5eed6372ff1e1e6144

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 3df343a..d031a00 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -1,16 +1,15 @@
 package net.pterodactylus.sone.web.pages
 
 import freenet.clients.http.*
-import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.main.*
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.web.SessionProvider
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.util.notify.*
+import net.pterodactylus.util.template.*
 import net.pterodactylus.util.web.*
-import java.net.URLEncoder
+import java.net.*
 
 /**
  * Base page for the Sone web interface.
@@ -36,7 +35,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(freenetRequest: FreenetRequest) = getPageTitle(freenetRequest.toSoneRequest(core, webInterface))
+	override public fun getPageTitle(request: FreenetRequest) = getPageTitle(request.toSoneRequest(core, webInterface))
 
 	open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
@@ -52,22 +51,22 @@ open class SoneTemplatePage @JvmOverloads constructor(
 					"href" to "http://${request.httpRequest.getHeader("host")}/Sone/OpenSearch.xml"
 			))
 
-	final override public fun processTemplate(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		super.processTemplate(freenetRequest, templateContext)
+	final override public fun processTemplate(request: FreenetRequest, templateContext: TemplateContext) {
+		super.processTemplate(request, templateContext)
 		templateContext["preferences"] = core.preferences
-		templateContext["currentSone"] = getCurrentSone(freenetRequest.toadletContext)
+		templateContext["currentSone"] = getCurrentSone(request.toadletContext)
 		templateContext["localSones"] = core.localSones
-		templateContext["request"] = freenetRequest
+		templateContext["request"] = request
 		templateContext["currentVersion"] = SonePlugin.getPluginVersion()
 		templateContext["hasLatestVersion"] = core.updateChecker.hasLatestVersion()
 		templateContext["latestEdition"] = core.updateChecker.latestEdition
 		templateContext["latestVersion"] = core.updateChecker.latestVersion
 		templateContext["latestVersionTime"] = core.updateChecker.latestVersionDate
-		webInterface.getNotifications(getCurrentSone(freenetRequest.toadletContext)).sortedBy(Notification::getCreatedTime).run {
+		webInterface.getNotifications(getCurrentSone(request.toadletContext)).sortedBy(Notification::getCreatedTime).run {
 			templateContext["notifications"] = this
 			templateContext["notificationHash"] = this.hashCode()
 		}
-		handleRequest(freenetRequest, templateContext)
+		handleRequest(request, templateContext)
 	}
 
 	open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
@@ -77,13 +76,13 @@ open class SoneTemplatePage @JvmOverloads constructor(
 	open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 	}
 
-	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 } }
+	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 } }
 					.joinToString("&") { "${it.first.urlEncode}=${it.second.urlEncode}" }
 					.emptyToNull
-			return "login.html?target=${freenetRequest.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
+			return "login.html?target=${request.httpRequest.path}${parameters?.let { ("?" + it).urlEncode } ?: ""}"
 		}
 		return null
 	}