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=b4178cc39b520c49421e6d0978156eff32232632;hb=58cf2922c76f6c75c55d2835cae2d18930c65cfc;hpb=d63b7445567b65ffdbd50fa8f7ffbfea1304dff9

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 b4178cc..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,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,
@@ -26,7 +26,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 ) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
 
 	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)
@@ -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.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
 	}