X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=3d1eaadf62aa777233e5cfac690c6fd86aa62ebb;hb=bb2c8cb2d47a77bcef2d299ad4bf8e16f22a6198;hp=51ca6cd34cb9cf9e7c7f7168eb30f35471f23cb1;hpb=c996e8a5f69c0ccb4714847e8e70a453c377df87;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java index 51ca6cd..3d1eaad 100644 --- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java +++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java @@ -22,6 +22,7 @@ import java.util.List; import net.pterodactylus.sone.core.Core.Preferences; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired; import net.pterodactylus.sone.web.page.Page.Request.Method; import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; @@ -77,6 +78,12 @@ public class OptionsPage extends SoneTemplatePage { } else { preferences.setPostsPerPage(postsPerPage); } + Integer charactersPerPost = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("characters-per-post", 10), null); + if (!preferences.validateCharactersPerPost(charactersPerPost)) { + fieldErrors.add("characters-per-post"); + } else { + preferences.setCharactersPerPost(charactersPerPost); + } boolean requireFullAccess = request.getHttpRequest().isPartSet("require-full-access"); preferences.setRequireFullAccess(requireFullAccess); Integer positiveTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3)); @@ -96,8 +103,11 @@ public class OptionsPage extends SoneTemplatePage { trustComment = null; } preferences.setTrustComment(trustComment); - boolean soneRescueMode = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("sone-rescue-mode", 5)); - preferences.setSoneRescueMode(soneRescueMode); + boolean fcpInterfaceActive = request.getHttpRequest().isPartSet("fcp-interface-active"); + preferences.setFcpInterfaceActive(fcpInterfaceActive); + Integer fcpFullAccessRequiredInteger = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("fcp-full-access-required", 1), preferences.getFcpFullAccessRequired().ordinal()); + FullAccessRequired fcpFullAccessRequired = FullAccessRequired.values()[fcpFullAccessRequiredInteger]; + preferences.setFcpFullAccessRequired(fcpFullAccessRequired); boolean clearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("clear-on-next-restart", 5)); preferences.setClearOnNextRestart(clearOnNextRestart); boolean reallyClearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("really-clear-on-next-restart", 5)); @@ -113,11 +123,13 @@ public class OptionsPage extends SoneTemplatePage { } templateContext.set("insertion-delay", preferences.getInsertionDelay()); templateContext.set("posts-per-page", preferences.getPostsPerPage()); + templateContext.set("characters-per-post", preferences.getCharactersPerPost()); templateContext.set("require-full-access", preferences.isRequireFullAccess()); templateContext.set("positive-trust", preferences.getPositiveTrust()); templateContext.set("negative-trust", preferences.getNegativeTrust()); templateContext.set("trust-comment", preferences.getTrustComment()); - templateContext.set("sone-rescue-mode", preferences.isSoneRescueMode()); + templateContext.set("fcp-interface-active", preferences.isFcpInterfaceActive()); + templateContext.set("fcp-full-access-required", preferences.getFcpFullAccessRequired().ordinal()); templateContext.set("clear-on-next-restart", preferences.isClearOnNextRestart()); templateContext.set("really-clear-on-next-restart", preferences.isReallyClearOnNextRestart()); }