X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=094a9cf558792bc12205a22e35b58eb88c7f7cb6;hb=9cb50c365e3bf7a74ffa40a45630a0e7be40b526;hp=fbc8cf93af476c210bf6c53a62e88cf26f0def28;hpb=a47643aed43d118ca68044f95451bb5374cdb332;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 fbc8cf9..094a9cf 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - OptionsPage.java - Copyright © 2010–2012 David Roden
+ * Sone - OptionsPage.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
@@ -20,7 +20,7 @@ package net.pterodactylus.sone.web;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.pterodactylus.sone.core.Core.Preferences;
+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;
@@ -90,6 +90,12 @@ public class OptionsPage extends SoneTemplatePage {
 			} else {
 				preferences.setPostsPerPage(postsPerPage);
 			}
+			Integer imagesPerPage = Numbers.safeParseInteger(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);
 			if (!preferences.validateCharactersPerPost(charactersPerPost)) {
 				fieldErrors.add("characters-per-post");
@@ -126,10 +132,6 @@ public class OptionsPage extends SoneTemplatePage {
 			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));
-			preferences.setReallyClearOnNextRestart(reallyClearOnNextRestart);
 			webInterface.getCore().touchConfiguration();
 			if (fieldErrors.isEmpty()) {
 				throw new RedirectException(getPath());
@@ -146,6 +148,7 @@ public class OptionsPage extends SoneTemplatePage {
 		}
 		templateContext.set("insertion-delay", preferences.getInsertionDelay());
 		templateContext.set("posts-per-page", preferences.getPostsPerPage());
+		templateContext.set("images-per-page", preferences.getImagesPerPage());
 		templateContext.set("characters-per-post", preferences.getCharactersPerPost());
 		templateContext.set("post-cut-off-length", preferences.getPostCutOffLength());
 		templateContext.set("require-full-access", preferences.isRequireFullAccess());
@@ -154,8 +157,6 @@ 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("clear-on-next-restart", preferences.isClearOnNextRestart());
-		templateContext.set("really-clear-on-next-restart", preferences.isReallyClearOnNextRestart());
 	}
 
 }