ipblocklist.cgi: Adjust code to work with latest ipblocklist-functions.pl

changes

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

diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi
index b79eb155fe8f63d5da863e0dec46dc7c8d1f497d..907659f7e7754b542fa79e03c3b61e0063eb429d 100644 (file)
--- a/html/cgi-bin/ipblocklist.cgi
+++ b/html/cgi-bin/ipblocklist.cgi
@@ -86,10 +86,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
                next if($cgiparams{$blocklist} ne "on");
 
                # Get the file name which keeps the converted blocklist.
-               my $ipset_db_file = &IPblocklist::get_ipset_db_file($blocklist);
+               my $cached_file = &IPblocklist::get_cached_blocklist_file($blocklist);
 
                # Check if the blocklist already has been downloaded.
-               if(-f "$ipset_db_file") {
+               if(-f "$cached_file") {
                        # Blocklist already exits, we can skip it.
                        next;
                } else {
@@ -107,7 +107,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
                # Loop over the array of missing blocklists.
                foreach my $missing_blocklist (@missing_blocklists) {
                        # Call the download and convert function to get the missing blocklist.
-                       my $status = &IPblocklist::download_and_create_blocklist($missing_blocklist);
+                       my $status = &IPblocklist::download_blocklist($missing_blocklist);
 
                        # Check if there was an error during download.
                        if ($status eq "dl_error") {