From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 22 Apr 2022 03:45:56 +0000 (+0200)
Subject: ids.cgi: Avoid doubble locking the page when forcing a ruleset update.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1febad2ad41578d3e77195929076e3cbbc28a89f;p=people%2Fstevee%2Fipfire-2.x.git

ids.cgi: Avoid doubble locking the page when forcing a ruleset update.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index c961c91bf8..3a0f1fc972 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -433,7 +433,7 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 	unless ($errormessage) {
 		# Lock the webpage and print notice about downloading
 		# a new ruleset.
-		&working_notice("$Lang::tr{'ids download new ruleset'}");
+		&_open_working_notice("$Lang::tr{'ids download new ruleset'}");
 
 		# Call subfunction to download the ruleset.
 		my $return = &IDS::downloadruleset($provider);
@@ -450,11 +450,17 @@ if ($cgiparams{'RULESET'} eq $Lang::tr{'ids apply'}) {
 			# Call function to store the errormessage.
 			&IDS::_store_error_message($errormessage);
 
+			# Close the working notice.
+			&_close_working_notice();
+
 			# Preform a reload of the page.
 			&reload();
 		} else {
 			# Call subfunction to launch oinkmaster.
-			&oinkmaster_web();
+			&oinkmaster_web("nolock");
+
+			# Close the working notice.
+			&_close_working_notice();
 
 			# Check if the IDS is running.
 			if(&IDS::ids_is_running()) {