X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=6785e81fbe1c0b727200fb252272c46314a96bd1;hp=161de321ed4730d22ff1ae163b07e1a761c22727;hb=aa94dcb712392b69cb431d1637e4948688d15791;hpb=2fef2b7dae1fb428e1b060b740b253189dc22bf7

diff --git a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
index 161de32..6785e81 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.web;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.pterodactylus.sone.core.Core.Preferences;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
@@ -57,19 +60,38 @@ public class OptionsPage extends SoneTemplatePage {
 		Preferences preferences = webInterface.getCore().getPreferences();
 		Sone currentSone = webInterface.getCurrentSone(request.getToadletContext(), false);
 		if (request.getMethod() == Method.POST) {
+			List<String> fieldErrors = new ArrayList<String>();
 			if (currentSone != null) {
 				boolean autoFollow = request.getHttpRequest().isPartSet("auto-follow");
 				currentSone.getOptions().getBooleanOption("AutoFollow").set(autoFollow);
 				webInterface.getCore().saveSone(currentSone);
 			}
 			Integer insertionDelay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("insertion-delay", 16));
-			preferences.setInsertionDelay(insertionDelay);
+			if (!preferences.validateInsertionDelay(insertionDelay)) {
+				fieldErrors.add("insertion-delay");
+			} else {
+				preferences.setInsertionDelay(insertionDelay);
+			}
 			Integer postsPerPage = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("posts-per-page", 4), null);
-			preferences.setPostsPerPage(postsPerPage);
+			if (!preferences.validatePostsPerPage(postsPerPage)) {
+				fieldErrors.add("posts-per-page");
+			} else {
+				preferences.setPostsPerPage(postsPerPage);
+			}
+			boolean requireFullAccess = request.getHttpRequest().isPartSet("require-full-access");
+			preferences.setRequireFullAccess(requireFullAccess);
 			Integer positiveTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("positive-trust", 3));
-			preferences.setPositiveTrust(positiveTrust);
+			if (!preferences.validatePositiveTrust(positiveTrust)) {
+				fieldErrors.add("positive-trust");
+			} else {
+				preferences.setPositiveTrust(positiveTrust);
+			}
 			Integer negativeTrust = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("negative-trust", 4));
-			preferences.setNegativeTrust(negativeTrust);
+			if (!preferences.validateNegativeTrust(negativeTrust)) {
+				fieldErrors.add("negative-trust");
+			} else {
+				preferences.setNegativeTrust(negativeTrust);
+			}
 			String trustComment = request.getHttpRequest().getPartAsStringFailsafe("trust-comment", 256);
 			if (trustComment.trim().length() == 0) {
 				trustComment = null;
@@ -87,13 +109,17 @@ public class OptionsPage extends SoneTemplatePage {
 			boolean reallyClearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("really-clear-on-next-restart", 5));
 			preferences.setReallyClearOnNextRestart(reallyClearOnNextRestart);
 			webInterface.getCore().saveConfiguration();
-			throw new RedirectException(getPath());
+			if (fieldErrors.isEmpty()) {
+				throw new RedirectException(getPath());
+			}
+			templateContext.set("fieldErrors", fieldErrors);
 		}
 		if (currentSone != null) {
 			templateContext.set("auto-follow", currentSone.getOptions().getBooleanOption("AutoFollow").get());
 		}
 		templateContext.set("insertion-delay", preferences.getInsertionDelay());
 		templateContext.set("posts-per-page", preferences.getPostsPerPage());
+		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());