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=abc58f5d9f0270d7525eda66e7aae908d5990b25;hp=54cd5cc99c5bfd51d72086a065c2ec6680612019;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=fc8e9ea5c978d2f5a00894e093364ae62f18934b

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 54cd5cc..abc58f5 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,16 @@
 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
 
 /**
@@ -18,7 +18,7 @@ import java.net.URLEncoder
  */
 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 = false,
@@ -36,7 +36,9 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	fun requiresLogin() = requiresLogin
 
-	override public fun getPageTitle(freenetRequest: FreenetRequest) = pageTitle(freenetRequest)
+	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")
@@ -69,7 +71,11 @@ open class SoneTemplatePage @JvmOverloads constructor(
 		handleRequest(freenetRequest, templateContext)
 	}
 
-	internal open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+	open fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		handleRequest(freenetRequest.toSoneRequest(core, webInterface), templateContext)
+	}
+
+	open fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 	}
 
 	override public fun getRedirectTarget(freenetRequest: FreenetRequest): String? {
@@ -85,9 +91,12 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
-	override fun isEnabled(toadletContext: ToadletContext) = when {
-		requiresLogin && getCurrentSone(toadletContext) == null -> false
-		core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess -> false
+	override fun isEnabled(toadletContext: ToadletContext) =
+			isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, core, webInterface))
+
+	open fun isEnabled(soneRequest: SoneRequest) = when {
+		requiresLogin && getCurrentSone(soneRequest.toadletContext) == null -> false
+		core.preferences.requireFullAccess && !soneRequest.toadletContext.isAllowedFullAccess -> false
 		else -> true
 	}