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=54cd5cc99c5bfd51d72086a065c2ec6680612019;hp=4d0fa3f833c3173abec9c562bf948d054d5d60de;hb=fc8e9ea5c978d2f5a00894e093364ae62f18934b;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..54cd5cc 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -16,21 +16,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 +36,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")
@@ -58,7 +51,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,16 +69,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
 	}
@@ -94,7 +87,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
 	}