X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.kt;h=5b560319c82a6a42072a1574a29cb88038eecfd5;hb=fd54b109f461c97e527924b4a3752430298f586a;hp=1136616ccbee91b78181e8d9a838e4aeac1a279f;hpb=85b7420f3492af4e5591f62ad673309a76de7e04;p=Sone.git

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 1136616..5b56031 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/JsonPage.kt
@@ -24,8 +24,8 @@ abstract class JsonPage(private val path: String, protected val webInterface: We
 	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) =
@@ -35,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 (core.preferences.isRequireFullAccess && !request.toadletContext.isAllowedFullAccess) {
+		if (core.preferences.requireFullAccess && !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 {