X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateSonePage.kt;h=a0fe7cb0a509127199da175aebd0ce561e7483e0;hb=369ba7692f167e5b7f9a27898a06a5d7920904ed;hp=600734638fab7a6b67e009b9dd1066df92a41580;hpb=5ba707d40f9d2a20094aaabc21647aeec1feed46;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
index 6007346..a0fe7cb 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
@@ -9,26 +9,27 @@ import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import java.util.logging.Level
 import java.util.logging.Logger
+import javax.inject.Inject
 
 /**
  * The “create Sone” page lets the user create a new Sone.
  */
-class CreateSonePage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("createSone.html", template, "Page.CreateSone.Title", webInterface, false) {
+class CreateSonePage @Inject constructor(template: Template, webInterface: WebInterface):
+		SoneTemplatePage("createSone.html", webInterface, template, "Page.CreateSone.Title") {
 
 	private val logger = Logger.getLogger(CreateSonePage::class.java.name)
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
 		templateContext["sones"] = webInterface.core.localSones.sortedWith(Sone.NICE_NAME_COMPARATOR)
 		templateContext["identitiesWithoutSone"] = webInterface.core.identityManager.allOwnIdentities.filterNot { "Sone" in it.contexts }.sortedBy { "${it.nickname}@${it.id}".toLowerCase() }
-		if (request.isPOST) {
-			val identity = request.httpRequest.getPartAsStringFailsafe("identity", 43)
+		if (freenetRequest.isPOST) {
+			val identity = freenetRequest.httpRequest.getPartAsStringFailsafe("identity", 43)
 			webInterface.core.identityManager.allOwnIdentities.firstOrNull { it.id == identity }?.let { ownIdentity ->
 				val sone = webInterface.core.createSone(ownIdentity)
 				if (sone == null) {
 					logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: $ownIdentity")
 				}
-				setCurrentSone(request.toadletContext, sone)
+				setCurrentSone(freenetRequest.toadletContext, sone)
 				throw RedirectException("index.html")
 			}
 			templateContext["errorNoIdentity"] = true
@@ -36,7 +37,7 @@ class CreateSonePage(template: Template, webInterface: WebInterface):
 	}
 
 	override fun isEnabled(toadletContext: ToadletContext) =
-			if (webInterface.core.preferences.isRequireFullAccess && !toadletContext.isAllowedFullAccess) {
+			if (webInterface.core.preferences.requireFullAccess && !toadletContext.isAllowedFullAccess) {
 				false
 			} else {
 				(getCurrentSone(toadletContext) == null) || (webInterface.core.localSones.size == 1)