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=c1ba3c121ab6143b249e67e40f79d9f9f86e415f;hp=5ed0c2fbd334f028fbbc09c1622ec17c5a7921ad;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;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..c1ba3c1 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,25 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Profile.DuplicateField
+import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.main.*
 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.sone.web.page.*
 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) {
+@MenuName("EditProfile")
+@TemplatePath("/templates/editProfile.html")
+class EditProfilePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("editProfile.html", "Page.EditProfile.Title", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		freenetRequest.currentSone!!.profile.let { profile ->
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		currentSone.profile.let { profile ->
 			templateContext["firstName"] = profile.firstName
 			templateContext["middleName"] = profile.middleName
 			templateContext["lastName"] = profile.lastName
@@ -24,43 +28,44 @@ class EditProfilePage(template: Template, webInterface: WebInterface):
 			templateContext["birthYear"] = profile.birthYear
 			templateContext["avatarId"] = profile.avatar
 			templateContext["fields"] = profile.fields
-			if (freenetRequest.isPOST) {
-				if (freenetRequest.httpRequest.getPartAsStringFailsafe("save-profile", 4) == "true") {
-					profile.firstName = freenetRequest.httpRequest.getPartAsStringFailsafe("first-name", 256).trim()
-					profile.middleName = freenetRequest.httpRequest.getPartAsStringFailsafe("middle-name", 256).trim()
-					profile.lastName = freenetRequest.httpRequest.getPartAsStringFailsafe("last-name", 256).trim()
-					profile.birthDay = freenetRequest.httpRequest.getPartAsStringFailsafe("birth-day", 256).trim().toIntOrNull()
-					profile.birthMonth = freenetRequest.httpRequest.getPartAsStringFailsafe("birth-month", 256).trim().toIntOrNull()
-					profile.birthYear = freenetRequest.httpRequest.getPartAsStringFailsafe("birth-year", 256).trim().toIntOrNull()
-					profile.setAvatar(webInterface.core.getImage(freenetRequest.httpRequest.getPartAsStringFailsafe("avatarId", 256).trim(), false))
+			if (soneRequest.isPOST) {
+				if (soneRequest.httpRequest.getPartAsStringFailsafe("save-profile", 4) == "true") {
+					profile.firstName = soneRequest.httpRequest.getPartAsStringFailsafe("first-name", 256).trim()
+					profile.middleName = soneRequest.httpRequest.getPartAsStringFailsafe("middle-name", 256).trim()
+					profile.lastName = soneRequest.httpRequest.getPartAsStringFailsafe("last-name", 256).trim()
+					profile.birthDay = soneRequest.httpRequest.getPartAsStringFailsafe("birth-day", 256).trim().toIntOrNull()
+					profile.birthMonth = soneRequest.httpRequest.getPartAsStringFailsafe("birth-month", 256).trim().toIntOrNull()
+					profile.birthYear = soneRequest.httpRequest.getPartAsStringFailsafe("birth-year", 256).trim().toIntOrNull()
+					profile.setAvatar(soneRequest.core.getImage(soneRequest.httpRequest.getPartAsStringFailsafe("avatarId", 256).trim(), false))
 					profile.fields.forEach { field ->
-						field.value = TextFilter.filter(freenetRequest.httpRequest.getHeader("Host"), freenetRequest.httpRequest.getPartAsStringFailsafe("field-${field.id}", 400).trim())
+						field.value = TextFilter.filter(soneRequest.httpRequest.getHeader("Host"), soneRequest.httpRequest.getPartAsStringFailsafe("field-${field.id}", 400).trim())
 					}
-					webInterface.core.touchConfiguration()
+					currentSone.profile = profile
+					soneRequest.core.touchConfiguration()
 					throw RedirectException("editProfile.html")
-				} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("add-field", 4) == "true") {
-					val fieldName = freenetRequest.httpRequest.getPartAsStringFailsafe("field-name", 100)
+				} else if (soneRequest.httpRequest.getPartAsStringFailsafe("add-field", 4) == "true") {
+					val fieldName = soneRequest.httpRequest.getPartAsStringFailsafe("field-name", 100)
 					try {
 						profile.addField(fieldName)
-						freenetRequest.currentSone!!.profile = profile
-						webInterface.core.touchConfiguration()
+						currentSone.profile = profile
+						soneRequest.core.touchConfiguration()
 						throw RedirectException("editProfile.html#profile-fields")
 					} catch (e: DuplicateField) {
 						templateContext["fieldName"] = fieldName
 						templateContext["duplicateFieldName"] = true
 					}
 				} else profile.fields.forEach { field ->
-					if (freenetRequest.httpRequest.getPartAsStringFailsafe("delete-field-${field.id}", 4) == "true") {
+					if (soneRequest.httpRequest.getPartAsStringFailsafe("delete-field-${field.id}", 4) == "true") {
 						throw RedirectException("deleteProfileField.html?field=${field.id}")
-					} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("edit-field-${field.id}", 4) == "true") {
+					} else if (soneRequest.httpRequest.getPartAsStringFailsafe("edit-field-${field.id}", 4) == "true") {
 						throw RedirectException("editProfileField.html?field=${field.id}")
-					} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("move-down-field-${field.id}", 4) == "true") {
+					} else if (soneRequest.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") {
+					} else if (soneRequest.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 +73,4 @@ class EditProfilePage(template: Template, webInterface: WebInterface):
 		}
 	}
 
-	private val FreenetRequest.currentSone get() = sessionProvider.getCurrentSone(toadletContext)
-
 }