Fixed Cache Cleaning Status of Update Booster

[people/teissler/ipfire-2.x.git] / html / cgi-bin / urlfilter.cgi

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 23410835dc7c5e3aa391604136d56236200fa23a..5ae2d8dc7a74b74e021934e595d7a5683b6fbf5e 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -353,15 +353,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
                $filtersettings{'VALID'} = 'yes';
                &savesettings;
 
-               system("chown -R nobody.nobody $dbdir");
-
-               if (-e "$dbdir/custom/allowed/domains.db") { unlink("$dbdir/custom/allowed/domains.db"); }
-               if (-e "$dbdir/custom/allowed/urls.db")    { unlink("$dbdir/custom/allowed/urls.db"); }
-               if (-e "$dbdir/custom/blocked/domains.db") { unlink("$dbdir/custom/blocked/domains.db"); }
-               if (-e "$dbdir/custom/blocked/urls.db")    { unlink("$dbdir/custom/blocked/urls.db"); }
-
-               &setpermissions ($dbdir);
-
                system('/usr/local/bin/squidctrl restart >/dev/null 2>&1');
        }
 }
@@ -2542,6 +2533,13 @@ sub savesettings
        delete $filtersettings{'BACKGROUND'};
        delete $filtersettings{'UPDATEFILE'};
 
+       system("chown -R nobody.nobody $dbdir");
+       system('/usr/bin/squidGuard -C custom/allowed/domains >/dev/null 2>&1');
+       system('/usr/bin/squidGuard -C custom/allowed/urls >/dev/null 2>&1');
+       system('/usr/bin/squidGuard -C custom/blocked/domains >/dev/null 2>&1');
+       system('/usr/bin/squidGuard -C custom/blocked/urls >/dev/null 2>&1 ');
+       &setpermissions ($dbdir);
+
        &General::writehash("${General::swroot}/urlfilter/settings", \%filtersettings);
 }
 
@@ -2558,7 +2556,7 @@ sub readblockcategories
        @filtergroups = @categories;
 
        foreach (@filtergroups) {
-               s/\//_SLASH_/g;
+               s/\//_/g;
                tr/a-z/A-Z/;
                $_ = "FILTER_".$_;
        }