From 77351a6b768c0359cb0a25d540f5f2c1ff03e51f Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 22 Mar 2021 16:27:33 +0100
Subject: [PATCH] ids.cgi: Move configuration of ruleset autoupdate intervall
 to IDS main section.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 html/cgi-bin/ids.cgi | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 3f0ab07b2c..42d2ca7fbc 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -351,12 +351,6 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 		# Store settings into settings file.
 		&General::writehash("$IDS::rules_settings_file", \%cgiparams);
 
-		# Check if the the automatic rule update hass been touched.
-		if($cgiparams{'AUTOUPDATE_INTERVAL'} ne $oldsettings{'AUTOUPDATE_INTERVAL'}) {
-			# Call suricatactrl to set the new interval.
-			&IDS::call_suricatactrl("cron", $cgiparams{'AUTOUPDATE_INTERVAL'});
-		}
-
 		# Check if a ruleset is present - if not or the source has been changed download it.
 		if((! %idsrules) || ($oldsettings{'RULES'} ne $cgiparams{'RULES'})) {
 			# Check if the red device is active.
@@ -618,6 +612,12 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'save'}) {
 		&General::writehash("$IDS::ids_settings_file", \%cgiparams);
 	}
 
+	# Check if the the automatic rule update hass been touched.
+	if($cgiparams{'AUTOUPDATE_INTERVAL'} ne $oldidssettings{'AUTOUPDATE_INTERVAL'}) {
+		# Call suricatactrl to set the new interval.
+		&IDS::call_suricatactrl("cron", $cgiparams{'AUTOUPDATE_INTERVAL'});
+	}
+
 	# Generate file to store the home net.
 	&IDS::generate_home_net_file();
 
@@ -703,9 +703,9 @@ sub show_mainpage() {
 	&General::readhash("$IDS::rules_settings_file", \%rulessettings);
 
 	# If no autoupdate intervall has been configured yet, set default value.
-	unless(exists($rulessettings{'AUTOUPDATE_INTERVAL'})) {
+	unless(exists($idssettings{'AUTOUPDATE_INTERVAL'})) {
 		# Set default to "weekly".
-		$rulessettings{'AUTOUPDATE_INTERVAL'} = 'weekly';
+		$idssettings{'AUTOUPDATE_INTERVAL'} = 'weekly';
 	}
 
 	# Read-in ignored hosts.
@@ -866,6 +866,27 @@ END
 
 print <<END
 				</tr>
+
+				<tr>
+					<td><br><br></td>
+					<td><br><br></td>
+					<td><br><br></td>
+					<td><br><br></td>
+				</tr>
+
+				<tr>
+					<td colspan='4'><b>$Lang::tr{'ids automatic rules update'}</b></td>
+				</tr>
+
+				<tr>
+					<td>
+						<select name='AUTOUPDATE_INTERVAL'>
+							<option value='off' $selected{'AUTOUPDATE_INTERVAL'}{'off'} >- $Lang::tr{'Disabled'} -</option>
+							<option value='daily' $selected{'AUTOUPDATE_INTERVAL'}{'daily'} >$Lang::tr{'Daily'}</option>
+							<option value='weekly' $selected{'AUTOUPDATE_INTERVAL'}{'weekly'} >$Lang::tr{'Weekly'}</option>
+						</select>
+					</td>
+				</tr>
 			</table>
 
 			<br><br>
-- 
2.39.2