X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditProfilePage.java;h=0d1f7d3442251b952a562f0d7cc004842c2067d8;hb=109f75c6995d2b673d5dcabe5c8b522722ba0635;hp=59c7e3e468e819ff07b944c9ad1b7ec44a6ece1b;hpb=45f92ec63dbf8134d92ceed67294faa38117b195;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index 59c7e3e..0d1f7d3 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditProfilePage.java - Copyright © 2010 David Roden
+ * Sone - EditProfilePage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.data.Identified.GET_ID;
+
 import java.util.List;
 
 import net.pterodactylus.sone.data.Profile;
@@ -52,9 +54,6 @@ public class EditProfilePage extends SoneTemplatePage {
 	// TEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -67,6 +66,7 @@ public class EditProfilePage extends SoneTemplatePage {
 		Integer birthDay = profile.getBirthDay();
 		Integer birthMonth = profile.getBirthMonth();
 		Integer birthYear = profile.getBirthYear();
+		String avatarId = profile.getAvatar();
 		List<Field> fields = profile.getFields();
 		if (request.getMethod() == Method.POST) {
 			if (request.getHttpRequest().getPartAsStringFailsafe("save-profile", 4).equals("true")) {
@@ -76,10 +76,10 @@ public class EditProfilePage extends SoneTemplatePage {
 				birthDay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-day", 256).trim());
 				birthMonth = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-month", 256).trim());
 				birthYear = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-year", 256).trim());
-				profile.setFirstName(firstName.length() > 0 ? firstName : null);
-				profile.setMiddleName(middleName.length() > 0 ? middleName : null);
-				profile.setLastName(lastName.length() > 0 ? lastName : null);
-				profile.setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear);
+				avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatarId", 36);
+				profile.modify().setFirstName(getNameFromFormField(firstName)).setMiddleName(getNameFromFormField(middleName)).setLastName(getNameFromFormField(lastName)).update();
+				profile.modify().setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear).update();
+				profile.setAvatar(webInterface.getCore().getImage(avatarId).transform(GET_ID));
 				for (Field field : fields) {
 					String value = request.getHttpRequest().getPartAsStringFailsafe("field-" + field.getId(), 400);
 					field.setValue(value);
@@ -136,9 +136,14 @@ public class EditProfilePage extends SoneTemplatePage {
 		templateContext.set("birthDay", birthDay);
 		templateContext.set("birthMonth", birthMonth);
 		templateContext.set("birthYear", birthYear);
+		templateContext.set("avatarId", avatarId);
 		templateContext.set("fields", fields);
 	}
 
+	private String getNameFromFormField(String name) {
+		return name.length() > 0 ? name : null;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -154,7 +159,7 @@ public class EditProfilePage extends SoneTemplatePage {
 	 * @return The parsed ID, or {@code null} if there was no part matching the
 	 *         given string
 	 */
-	private String getFieldId(FreenetRequest request, String partNameStart) {
+	private static String getFieldId(FreenetRequest request, String partNameStart) {
 		for (String partName : request.getHttpRequest().getParts()) {
 			if (partName.startsWith(partNameStart)) {
 				return partName.substring(partNameStart.length());