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=4290c3ab1ffa4372ac618304b019874fca90a9a7;hp=6f5de15ea0028ce0c1ffd6f4d9c6521f13e1d207;hb=dc47bafb2d0c4a2a440389158039993d10cbfd08;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..4290c3a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -6,8 +6,7 @@ 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
@@ -16,21 +15,15 @@ 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,
 		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
 
@@ -42,8 +35,7 @@ open class SoneTemplatePage(
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(request: FreenetRequest) =
-			pageTitleKey?.let(webInterface.l10n::getString) ?: ""
+	override public fun getPageTitle(freenetRequest: FreenetRequest) = pageTitle(freenetRequest)
 
 	override public fun getStyleSheets() =
 			listOf("css/sone.css")
@@ -76,16 +68,20 @@ open class SoneTemplatePage(
 		handleRequest(freenetRequest, templateContext)
 	}
 
-	internal open fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+	internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		handleRequest(freenetRequest.toSoneRequest(core), templateContext)
+	}
+
+	open fun handleRequest(soneRequest: SoneRequest, 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
 	}
@@ -94,7 +90,7 @@ open class SoneTemplatePage(
 
 	override fun isEnabled(toadletContext: ToadletContext) = when {
 		requiresLogin && getCurrentSone(toadletContext) == null -> false
-		core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess -> false
+		core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
 		else -> true
 	}