X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditProfilePage.java;h=422004be6bbb1fd118ed32834950d2515ce6d47a;hp=c1bac4a1a5314a9501818c17114ea701080e70c3;hb=63df577f7ced52acfa93e4a7f329292069d8ba9d;hpb=80d93d9da3f7913ebe3863384a78e821329ac3d3 diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java index c1bac4a..422004b 100644 --- a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java +++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java @@ -17,14 +17,16 @@ package net.pterodactylus.sone.web; -import java.util.Map; +import java.util.List; import net.pterodactylus.sone.data.Profile; +import net.pterodactylus.sone.data.Profile.Field; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.web.page.Page.Request.Method; +import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.number.Numbers; -import net.pterodactylus.util.template.DataProvider; import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; +import net.pterodactylus.util.web.Method; import freenet.clients.http.ToadletContext; /** @@ -54,8 +56,8 @@ public class EditProfilePage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { - super.processTemplate(request, dataProvider); + protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { + super.processTemplate(request, templateContext); ToadletContext toadletContenxt = request.getToadletContext(); Sone currentSone = getCurrentSone(toadletContenxt); Profile profile = currentSone.getProfile(); @@ -65,7 +67,8 @@ public class EditProfilePage extends SoneTemplatePage { Integer birthDay = profile.getBirthDay(); Integer birthMonth = profile.getBirthMonth(); Integer birthYear = profile.getBirthYear(); - Map fields = profile.getFields(); + String avatarId = profile.getAvatar(); + List fields = profile.getFields(); if (request.getMethod() == Method.POST) { if (request.getHttpRequest().getPartAsStringFailsafe("save-profile", 4).equals("true")) { firstName = request.getHttpRequest().getPartAsStringFailsafe("first-name", 256).trim(); @@ -74,16 +77,18 @@ 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()); + avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatar-id", 36); 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); - for (int fieldIndex = 0; fieldIndex < profile.getFieldNames().size(); ++fieldIndex) { - String value = request.getHttpRequest().getPartAsStringFailsafe("field-" + fieldIndex, 400); - profile.setField(fieldIndex, value); + profile.setAvatar(webInterface.getCore().getImage(avatarId, false)); + for (Field field : fields) { + String value = request.getHttpRequest().getPartAsStringFailsafe("field-" + field.getId(), 400); + field.setValue(value); } currentSone.setProfile(profile); - webInterface.getCore().saveSone(currentSone); + webInterface.getCore().touchConfiguration(); throw new RedirectException("editProfile.html"); } else if (request.getHttpRequest().getPartAsStringFailsafe("add-field", 4).equals("true")) { String fieldName = request.getHttpRequest().getPartAsStringFailsafe("field-name", 256).trim(); @@ -91,42 +96,51 @@ public class EditProfilePage extends SoneTemplatePage { profile.addField(fieldName); currentSone.setProfile(profile); fields = profile.getFields(); - webInterface.getCore().saveSone(currentSone); + webInterface.getCore().touchConfiguration(); throw new RedirectException("editProfile.html#profile-fields"); } catch (IllegalArgumentException iae1) { - dataProvider.set("fieldName", fieldName); - dataProvider.set("duplicateFieldName", true); + templateContext.set("fieldName", fieldName); + templateContext.set("duplicateFieldName", true); } } else { - int deleteFieldIndex = getFieldIndex(request, "delete-field-"); - if (deleteFieldIndex > -1) { - throw new RedirectException("deleteProfileField.html?field=" + deleteFieldIndex); + String id = getFieldId(request, "delete-field-"); + if (id != null) { + throw new RedirectException("deleteProfileField.html?field=" + id); } - int moveUpFieldIndex = getFieldIndex(request, "move-up-field-"); - if (moveUpFieldIndex > -1) { - profile.moveFieldUp(moveUpFieldIndex); + id = getFieldId(request, "move-up-field-"); + if (id != null) { + Field field = profile.getFieldById(id); + if (field == null) { + throw new RedirectException("invalid.html"); + } + profile.moveFieldUp(field); currentSone.setProfile(profile); throw new RedirectException("editProfile.html#profile-fields"); } - int moveDownFieldIndex = getFieldIndex(request, "move-down-field-"); - if (moveDownFieldIndex > -1) { - profile.moveFieldDown(moveDownFieldIndex); + id = getFieldId(request, "move-down-field-"); + if (id != null) { + Field field = profile.getFieldById(id); + if (field == null) { + throw new RedirectException("invalid.html"); + } + profile.moveFieldDown(field); currentSone.setProfile(profile); throw new RedirectException("editProfile.html#profile-fields"); } - int editFieldIndex = getFieldIndex(request, "edit-field-"); - if (editFieldIndex > -1) { - throw new RedirectException("editProfileField.html?field=" + editFieldIndex); + id = getFieldId(request, "edit-field-"); + if (id != null) { + throw new RedirectException("editProfileField.html?field=" + id); } } } - dataProvider.set("firstName", firstName); - dataProvider.set("middleName", middleName); - dataProvider.set("lastName", lastName); - dataProvider.set("birthDay", birthDay); - dataProvider.set("birthMonth", birthMonth); - dataProvider.set("birthYear", birthYear); - dataProvider.set("fields", fields); + templateContext.set("firstName", firstName); + templateContext.set("middleName", middleName); + templateContext.set("lastName", lastName); + templateContext.set("birthDay", birthDay); + templateContext.set("birthMonth", birthMonth); + templateContext.set("birthYear", birthYear); + templateContext.set("avatar-id", avatarId); + templateContext.set("fields", fields); } // @@ -135,21 +149,21 @@ public class EditProfilePage extends SoneTemplatePage { /** * Searches for a part whose names starts with the given {@code String} and - * extracts the number from the located name. + * extracts the ID from the located name. * * @param request * The request to get the parts from * @param partNameStart * The start of the name of the requested part - * @return The parsed number, or {@code -1} if the number could not be - * parsed + * @return The parsed ID, or {@code null} if there was no part matching the + * given string */ - private int getFieldIndex(Request request, String partNameStart) { + private String getFieldId(FreenetRequest request, String partNameStart) { for (String partName : request.getHttpRequest().getParts()) { if (partName.startsWith(partNameStart)) { - return Numbers.safeParseInteger(partName.substring(partNameStart.length()), -1); + return partName.substring(partNameStart.length()); } } - return -1; + return null; } }