X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPage.java;h=63ed6a72422a4a7708796ce283ab6750db4fb04d;hb=e31ead2b972074c1e5ecc5213b2bdc34c453d8b6;hp=0f9051d5a92e9ea75f74049444ec747e5ea077d0;hpb=31e30cfca6caf4288d265486dcee86b6dce4ac96;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 0f9051d..63ed6a7 100644
--- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.web;
 import net.pterodactylus.sone.core.Options;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -38,7 +39,7 @@ public class OptionsPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public OptionsPage(Template template, WebInterface webInterface) {
-		super("options.html", template, "Page.Options.Title", webInterface);
+		super("options.html", template, "Page.Options.Title", webInterface, false);
 	}
 
 	//
@@ -49,33 +50,25 @@ public class OptionsPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
-		Options options = webInterface.core().getOptions();
+	protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+		super.processTemplate(request, dataProvider);
+		Options options = webInterface.getCore().getOptions();
 		if (request.getMethod() == Method.POST) {
 			Integer insertionDelay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("insertion-delay", 16));
 			options.getIntegerOption("InsertionDelay").set(insertionDelay);
+			boolean soneRescueMode = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("sone-rescue-mode", 5));
+			options.getBooleanOption("SoneRescueMode").set(soneRescueMode);
 			boolean clearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("clear-on-next-restart", 5));
 			options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
 			boolean reallyClearOnNextRestart = Boolean.parseBoolean(request.getHttpRequest().getPartAsStringFailsafe("really-clear-on-next-restart", 5));
 			options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
+			webInterface.getCore().saveConfiguration();
 			throw new RedirectException(getPath());
 		}
-		template.set("insertion-delay", options.getIntegerOption("InsertionDelay").get());
-		template.set("clear-on-next-restart", options.getBooleanOption("ClearOnNextRestart").get());
-		template.set("really-clear-on-next-restart", options.getBooleanOption("ReallyClearOnNextRestart").get());
-	}
-
-	//
-	// SONETEMPLATEPAGE METHODS
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected boolean requiresLogin() {
-		return false;
+		dataProvider.set("insertion-delay", options.getIntegerOption("InsertionDelay").get());
+		dataProvider.set("sone-rescue-mode", options.getBooleanOption("SoneRescueMode").get());
+		dataProvider.set("clear-on-next-restart", options.getBooleanOption("ClearOnNextRestart").get());
+		dataProvider.set("really-clear-on-next-restart", options.getBooleanOption("ReallyClearOnNextRestart").get());
 	}
 
 }