Reference: #12979.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- config/firewall/rules.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 1b628df16..80985ca53 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -761,7 +761,7 @@ sub ipblocklist () { }
# Check if logging is enabled. - if($blocklistsettings{'LOGGING'} eq "on") { + if($blocklistsettings{'LOGGING'}) && ($blocklistsettings{'LOGGING'} eq "on")) { # Create logging rule. run("$IPTABLES -A ${blocklist}_DROP -j LOG -m limit --limit 10/second --log-prefix "BLKLST_$blocklist ""); }
Checkboxes does not submit any values if they are not checked. Default them to "off" in such a case.
This fixes the issue not beeing able to disable the logging.
Fixes #12979.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- html/cgi-bin/ipblocklist.cgi | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi index bb438129c..b79eb155f 100644 --- a/html/cgi-bin/ipblocklist.cgi +++ b/html/cgi-bin/ipblocklist.cgi @@ -72,6 +72,10 @@ my @blocklists = &IPblocklist::get_blocklists();
# Process actions if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { + # Assign checkbox values, in case they are not checked. + $cgiparams{'ENABLE'} = "off" unless($cgiparams{'ENABLE'}); + $cgiparams{'LOGGING'} = "off" unless($cgiparams{'LOGGING'}); + # Array to store if blocklists are missing on the system # and needs to be downloaded first. my @missing_blocklists = ();
Reviewed-by: Adolf Belka adolf.belka@ipfire.org
On 07/03/2023 13:17, Stefan Schantl wrote:
Checkboxes does not submit any values if they are not checked. Default them to "off" in such a case.
This fixes the issue not beeing able to disable the logging.
Fixes #12979.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
html/cgi-bin/ipblocklist.cgi | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi index bb438129c..b79eb155f 100644 --- a/html/cgi-bin/ipblocklist.cgi +++ b/html/cgi-bin/ipblocklist.cgi @@ -72,6 +72,10 @@ my @blocklists = &IPblocklist::get_blocklists(); # Process actions if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
- # Assign checkbox values, in case they are not checked.
- $cgiparams{'ENABLE'} = "off" unless($cgiparams{'ENABLE'});
- $cgiparams{'LOGGING'} = "off" unless($cgiparams{'LOGGING'});
# Array to store if blocklists are missing on the system # and needs to be downloaded first. my @missing_blocklists = ();
-
Adolf Belka -
Stefan Schantl