X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteProfileFieldPage.kt;h=6303b11c3ee7ee31aa7d1d2b21640718e446e8f1;hp=890ac74d987aef700a3be38f52571fd2a0731326;hb=aaf780d3c2a6f5ce47295786f3963c8b93f6a145;hpb=fdc047dd37e982776d55d827ca405868efe32c5a

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
index 890ac74..6303b11 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
@@ -1,28 +1,31 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
-import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
+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.template.*
+import javax.inject.*
 
 /**
  * Page that lets the user confirm the deletion of a profile field.
  */
-class DeleteProfileFieldPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("deleteProfileField.html", template, "Page.DeleteProfileField.Title", webInterface, true) {
+@TemplatePath("/templates/deleteProfileField.html")
+@ToadletPath("deleteProfileField.html")
+class DeleteProfileFieldPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.DeleteProfileField.Title", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		val currentSone = getCurrentSone(request.toadletContext)!!
-		val field = currentSone.profile.getFieldById(request.httpRequest.getPartAsStringFailsafe("field", 36)) ?: throw RedirectException("invalid.html")
-		templateContext["field"] = field
-		if (request.isPOST) {
-			if (request.httpRequest.getPartAsStringFailsafe("confirm", 4) == "true") {
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			val field = currentSone.profile.getFieldById(soneRequest.httpRequest.getPartAsStringFailsafe("field", 36)) ?: redirectTo("invalid.html")
+			if (soneRequest.httpRequest.getPartAsStringFailsafe("confirm", 4) == "true") {
 				currentSone.profile = currentSone.profile.apply { removeField(field) }
 			}
-			throw RedirectException("editProfile.html#profile-fields")
+			redirectTo("editProfile.html#profile-fields")
 		}
+		val field = currentSone.profile.getFieldById(soneRequest.httpRequest.getParam("field")) ?: redirectTo("invalid.html")
+		templateContext["field"] = field
 	}
 
 }