X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=133263861d556b5ff5e3a2c8b149cf49be336aeb;hb=9359e98d853739ec57c24ef0ff2d69c8ce29847d;hp=5001a7354f576162813affec66bc40cffa73d61a;hpb=e25b3f1ea99a8dffc55efe4b68246937a55ebd33;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 5001a73..1332638 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -17,15 +17,17 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import net.pterodactylus.sone.core.CompatibilityMode;
 import net.pterodactylus.sone.core.Preferences;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
@@ -78,31 +80,31 @@ public class OptionsPage extends SoneTemplatePage {
 				currentSone.getOptions().setShowCustomAvatars(ShowCustomAvatars.valueOf(showCustomAvatars));
 				webInterface.getCore().touchConfiguration();
 			}
-			Integer insertionDelay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("insertion-delay", 16));
+			Integer insertionDelay = parseInt(request.getHttpRequest().getPartAsStringFailsafe("insertion-delay", 16), null);
 			if (!preferences.validateInsertionDelay(insertionDelay)) {
 				fieldErrors.add("insertion-delay");
 			} else {
 				preferences.setInsertionDelay(insertionDelay);
 			}
-			Integer postsPerPage = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("posts-per-page", 4), null);
+			Integer postsPerPage = parseInt(request.getHttpRequest().getPartAsStringFailsafe("posts-per-page", 4), null);
 			if (!preferences.validatePostsPerPage(postsPerPage)) {
 				fieldErrors.add("posts-per-page");
 			} else {
 				preferences.setPostsPerPage(postsPerPage);
 			}
-			Integer imagesPerPage = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("images-per-page", 4), null);
+			Integer imagesPerPage = parseInt(request.getHttpRequest().getPartAsStringFailsafe("images-per-page", 4), null);
 			if (!preferences.validateImagesPerPage(imagesPerPage)) {
 				fieldErrors.add("images-per-page");
 			} else {
 				preferences.setImagesPerPage(imagesPerPage);
 			}
-			Integer charactersPerPost = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("characters-per-post", 10), null);
+			Integer charactersPerPost = parseInt(request.getHttpRequest().getPartAsStringFailsafe("characters-per-post", 10), null);
 			if (!preferences.validateCharactersPerPost(charactersPerPost)) {
 				fieldErrors.add("characters-per-post");
 			} else {
 				preferences.setCharactersPerPost(charactersPerPost);
 			}
-			Integer postCutOffLength = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("post-cut-off-length", 10), null);
+			Integer postCutOffLength = parseInt(request.getHttpRequest().getPartAsStringFailsafe("post-cut-off-length", 10), null);
 			if (!preferences.validatePostCutOffLength(postCutOffLength)) {
 				fieldErrors.add("post-cut-off-length");
 			} else {
@@ -110,13 +112,13 @@ public class OptionsPage extends SoneTemplatePage {
 			}
 			boolean requireFullAccess = request.getHttpRequest().isPartSet("require-full-access");
 			preferences.setRequireFullAccess(requireFullAccess);
-			Integer positiveTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3));
+			Integer positiveTrust = parseInt(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3), null);
 			if (!preferences.validatePositiveTrust(positiveTrust)) {
 				fieldErrors.add("positive-trust");
 			} else {
 				preferences.setPositiveTrust(positiveTrust);
 			}
-			Integer negativeTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("negative-trust", 4));
+			Integer negativeTrust = parseInt(request.getHttpRequest().getPartAsStringFailsafe("negative-trust", 4), null);
 			if (!preferences.validateNegativeTrust(negativeTrust)) {
 				fieldErrors.add("negative-trust");
 			} else {
@@ -129,9 +131,17 @@ public class OptionsPage extends SoneTemplatePage {
 			preferences.setTrustComment(trustComment);
 			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());
+			Integer fcpFullAccessRequiredInteger = parseInt(request.getHttpRequest().getPartAsStringFailsafe("fcp-full-access-required", 1), preferences.getFcpFullAccessRequired().ordinal());
 			FullAccessRequired fcpFullAccessRequired = FullAccessRequired.values()[fcpFullAccessRequiredInteger];
 			preferences.setFcpFullAccessRequired(fcpFullAccessRequired);
+
+			boolean compatOldElementIds = request.getHttpRequest().isPartSet("compat-old-element-ids");
+			if (compatOldElementIds) {
+				webInterface.getCore().setCompatibilityMode(CompatibilityMode.oldElementIds);
+			} else {
+				webInterface.getCore().clearCompatibilityMod(CompatibilityMode.oldElementIds);
+			}
+
 			webInterface.getCore().touchConfiguration();
 			if (fieldErrors.isEmpty()) {
 				throw new RedirectException(getPath());
@@ -157,6 +167,7 @@ public class OptionsPage extends SoneTemplatePage {
 		templateContext.set("trust-comment", preferences.getTrustComment());
 		templateContext.set("fcp-interface-active", preferences.isFcpInterfaceActive());
 		templateContext.set("fcp-full-access-required", preferences.getFcpFullAccessRequired().ordinal());
+		templateContext.set("compat-old-element-ids", webInterface.getCore().isCompatibilityMode(CompatibilityMode.oldElementIds));
 	}
 
 }