]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
ids.cgi: Avoid doubble locking the page when forcing a ruleset update.
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 22 Apr 2022 03:45:56 +0000 (05:45 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 22 Apr 2022 03:45:56 +0000 (05:45 +0200)
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
html/cgi-bin/ids.cgi

index c961c91bf8e5228edc350b3be1602f9188b0ae0b..3a0f1fc972184fc1a1f0246e063f22b9d3e8998e 100644 (file)
@@ -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()) {