X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditProfilePage.kt;h=f1805cfefcc32350a67db64c4ba6d32c2ad0cc45;hp=5ed0c2fbd334f028fbbc09c1622ec17c5a7921ad;hb=e28b0a9dd851f52f8e09a49f97eac5c1a26ecf48;hpb=3cb0e2c78bb37f2d70ecde92ad4fcf642de788a3

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
index 5ed0c2f..f1805cf 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
@@ -1,21 +1,23 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Profile.DuplicateField
+import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.text.TextFilter
 import net.pterodactylus.sone.utils.isPOST
 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 javax.inject.Inject
 
 /**
  * This page lets the user edit her profile.
  */
-class EditProfilePage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("editProfile.html", template, "Page.EditProfile.Title", webInterface, true) {
+class EditProfilePage @Inject constructor(template: Template, webInterface: WebInterface) :
+		LoggedInPage("editProfile.html", template, "Page.EditProfile.Title", webInterface) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		freenetRequest.currentSone!!.profile.let { profile ->
+	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
+		currentSone.profile.let { profile ->
 			templateContext["firstName"] = profile.firstName
 			templateContext["middleName"] = profile.middleName
 			templateContext["lastName"] = profile.lastName
@@ -36,13 +38,14 @@ class EditProfilePage(template: Template, webInterface: WebInterface):
 					profile.fields.forEach { field ->
 						field.value = TextFilter.filter(freenetRequest.httpRequest.getHeader("Host"), freenetRequest.httpRequest.getPartAsStringFailsafe("field-${field.id}", 400).trim())
 					}
+					currentSone.profile = profile
 					webInterface.core.touchConfiguration()
 					throw RedirectException("editProfile.html")
 				} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("add-field", 4) == "true") {
 					val fieldName = freenetRequest.httpRequest.getPartAsStringFailsafe("field-name", 100)
 					try {
 						profile.addField(fieldName)
-						freenetRequest.currentSone!!.profile = profile
+						currentSone.profile = profile
 						webInterface.core.touchConfiguration()
 						throw RedirectException("editProfile.html#profile-fields")
 					} catch (e: DuplicateField) {
@@ -56,11 +59,11 @@ class EditProfilePage(template: Template, webInterface: WebInterface):
 						throw RedirectException("editProfileField.html?field=${field.id}")
 					} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("move-down-field-${field.id}", 4) == "true") {
 						profile.moveFieldDown(field)
-						freenetRequest.currentSone!!.profile = profile
+						currentSone.profile = profile
 						throw RedirectException("editProfile.html#profile-fields")
 					} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("move-up-field-${field.id}", 4) == "true") {
 						profile.moveFieldUp(field)
-						freenetRequest.currentSone!!.profile = profile
+						currentSone.profile = profile
 						throw RedirectException("editProfile.html#profile-fields")
 					}
 				}
@@ -68,6 +71,4 @@ class EditProfilePage(template: Template, webInterface: WebInterface):
 		}
 	}
 
-	private val FreenetRequest.currentSone get() = sessionProvider.getCurrentSone(toadletContext)
-
 }