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=ac1e15f11677eba2a9ec3785ac23151b5e417982;hp=4d0fa3f833c3173abec9c562bf948d054d5d60de;hb=c28013c8a4bcb9776a1e2d82ffd6c4c8297ffb62;hpb=8572a749a619643392c776208027b3d0209e8f4c

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 4d0fa3f..ac1e15f 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -1,38 +1,32 @@
 package net.pterodactylus.sone.web.pages
 
-import freenet.clients.http.ToadletContext
+import freenet.clients.http.*
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.main.SonePlugin
 import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.web.SessionProvider
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.sone.web.page.FreenetTemplatePage
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.util.web.*
 import java.net.URLEncoder
 
 /**
  * Base page for the Sone web interface.
  */
-open class SoneTemplatePage(
+open class SoneTemplatePage @JvmOverloads constructor(
 		path: String,
-		protected val webInterface: WebInterface,
+		private val webInterface: WebInterface,
 		template: Template,
 		private val pageTitleKey: String? = null,
-		private val requiresLogin: Boolean = true
+		private val requiresLogin: Boolean = false,
+		private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
 ) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
 
-	@JvmOverloads
-	constructor(path: String, template: Template, pageTitleKey: String?, webInterface: WebInterface, requireLogin: Boolean = false) :
-			this(path, webInterface, template, pageTitleKey, requireLogin)
-
-	constructor(path: String, template: Template, webInterface: WebInterface, requireLogin: Boolean = true) :
-			this(path, webInterface, template, null, requireLogin)
-
 	private val core = webInterface.core
-	protected val sessionProvider: SessionProvider = webInterface
+	private val sessionProvider: SessionProvider = webInterface
 
 	protected fun getCurrentSone(toadletContext: ToadletContext, createSession: Boolean = true) =
 			sessionProvider.getCurrentSone(toadletContext, createSession)
@@ -42,8 +36,9 @@ open class SoneTemplatePage(
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(request: FreenetRequest) =
-			pageTitleKey?.let(webInterface.l10n::getString) ?: ""
+	override public fun getPageTitle(freenetRequest: FreenetRequest) = getPageTitle(freenetRequest.toSoneRequest(core, webInterface))
+
+	open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
 	override public fun getStyleSheets() =
 			listOf("css/sone.css")
@@ -58,7 +53,7 @@ open class SoneTemplatePage(
 					"href" to "http://${request.httpRequest.getHeader("host")}/Sone/OpenSearch.xml"
 			))
 
-	override public fun processTemplate(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+	final override public fun processTemplate(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
 		super.processTemplate(freenetRequest, templateContext)
 		templateContext["preferences"] = core.preferences
 		templateContext["currentSone"] = getCurrentSone(freenetRequest.toadletContext)
@@ -76,25 +71,32 @@ open class SoneTemplatePage(
 		handleRequest(freenetRequest, templateContext)
 	}
 
-	internal open fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+	open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		handleRequest(freenetRequest.toSoneRequest(core, webInterface), 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 } }
+	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 } }
 					.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
 	}
 
 	private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
-	override fun isEnabled(toadletContext: ToadletContext) = when {
-		requiresLogin && getCurrentSone(toadletContext) == null -> false
-		core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess -> false
+	override fun isEnabled(toadletContext: ToadletContext) =
+			isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, webInterface.sessionManager, core, webInterface))
+
+	open fun isEnabled(soneRequest: SoneRequest) = when {
+		requiresLogin && getCurrentSone(soneRequest.toadletContext) == null -> false
+		core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess -> false
 		else -> true
 	}