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=3122c64648e363f81e0a523089324a035986c43d;hp=1ff35a819bfb86d5c5fdde7588b34418611c083d;hb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0;hpb=cd1f93dc057bdc6e89baeb41db0f749f2287224e

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 1ff35a8..3122c64 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -1,32 +1,31 @@
 package net.pterodactylus.sone.web.pages
 
 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.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 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.notify.*
+import net.pterodactylus.util.template.*
 import net.pterodactylus.util.web.*
-import java.net.URLEncoder
+import java.net.*
 
 /**
  * Base page for the Sone web interface.
  */
 open class SoneTemplatePage @JvmOverloads constructor(
 		path: String,
-		protected val webInterface: WebInterface,
-		template: Template,
+		private val webInterface: WebInterface,
+		loaders: Loaders,
+		templateRenderer: TemplateRenderer,
 		private val pageTitleKey: String? = null,
 		private val requiresLogin: Boolean = false,
 		private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
-) : FreenetTemplatePage(path, webInterface.templateContextFactory, template, "noPermission.html") {
+) : FreenetTemplatePage(path, templateRenderer, loaders, "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)
@@ -40,10 +39,9 @@ open class SoneTemplatePage @JvmOverloads constructor(
 
 	open fun getPageTitle(soneRequest: SoneRequest) = pageTitle(soneRequest)
 
-	override public fun getStyleSheets() =
-			listOf("css/sone.css")
+	override val styleSheets = listOf("css/sone.css")
 
-	override public fun getShortcutIcon() = "images/icon.png"
+	override val shortcutIcon = "images/icon.png"
 
 	override public fun getAdditionalLinkNodes(request: FreenetRequest) =
 			listOf(mapOf(
@@ -71,7 +69,7 @@ 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)
 	}
 
@@ -92,7 +90,7 @@ open class SoneTemplatePage @JvmOverloads constructor(
 	private val String.urlEncode: String get() = URLEncoder.encode(this, "UTF-8")
 
 	override fun isEnabled(toadletContext: ToadletContext) =
-			isEnabled(SoneRequest(toadletContext.uri, Method.GET, HTTPRequestImpl(toadletContext.uri, "GET"), toadletContext, webInterface.l10n, core, webInterface))
+			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