X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.kt;h=2da5edc6bff51cb1e03e6b72224abfe84bf3613a;hp=6ba842f9ab900f22b92fefc36af0d990d072aaca;hb=ea7ad5e87074576d17b7df74365a726bd95d7665;hpb=ea53134b4fc925265c9d58d22c650c4e4b7e685d;ds=sidebyside

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
index 6ba842f..2da5edc 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
@@ -19,12 +19,13 @@ abstract class JsonPage(private val path: String, protected val webInterface: We
 
 	private val objectMapper = ObjectMapper()
 	private val sessionProvider: SessionProvider = webInterface
+	protected val core = webInterface.core
 
 	override fun getPath() = path
 	override fun isPrefixPage() = false
 
-	open fun needsFormPassword() = true
-	open fun requiresLogin() = true
+	open val needsFormPassword = true
+	open val requiresLogin = true
 
 	protected fun createSuccessJsonObject() = JsonReturnObject(true)
 	protected fun createErrorJsonObject(error: String) =
@@ -34,13 +35,13 @@ abstract class JsonPage(private val path: String, protected val webInterface: We
 			sessionProvider.getCurrentSone(toadletContext, createSession)
 
 	override fun handleRequest(request: FreenetRequest, response: Response): Response {
-		if (webInterface.core.preferences.isRequireFullAccess && !request.toadletContext.isAllowedFullAccess) {
+		if (core.preferences.isRequireFullAccess && !request.toadletContext.isAllowedFullAccess) {
 			return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(createErrorJsonObject("auth-required").asJsonString())
 		}
-		if (needsFormPassword() && request.parameters["formPassword"] != webInterface.formPassword) {
+		if (needsFormPassword && request.parameters["formPassword"] != webInterface.formPassword) {
 			return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(createErrorJsonObject("auth-required").asJsonString())
 		}
-		if (requiresLogin() && (sessionProvider.getCurrentSone(request.toadletContext, false) == null)) {
+		if (requiresLogin && (sessionProvider.getCurrentSone(request.toadletContext, false) == null)) {
 			return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(createErrorJsonObject("auth-required").asJsonString())
 		}
 		return try {