X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Furlfilter.cgi;h=6e99397ec0c40ce40c0375d7b7b2e95b69d155a5;hp=af0964e10437b86f811ce11957a4262bbc53f199;hb=d87b4a73cdb1f15e98f213369a65f86d65eeac6c;hpb=96d7683ecbf5eee7251bbd1c12354b0728bd86ca

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index af0964e104..6e99397ec0 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -59,7 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst";
 my $uqfile = "${General::swroot}/urlfilter/userquota";
 my $dbdir = "${General::swroot}/urlfilter/blacklists";
 my $editdir = "${General::swroot}/urlfilter/editor";
-my $repository = "/home/httpd/html/repository";
+my $repository = "/var/urlrepo";
 my $hintcolour = '#FFFFCC';
 
 my $sourceurlfile = "${General::swroot}/urlfilter/autoupdate/autoupdate.urls";
@@ -2973,7 +2973,24 @@ sub writeconfigfile
 	foreach $category (@categories) {
 		$blacklist = $category;
 		$category =~ s/\//_/g;
-		if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){next;}
+		
+		if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){
+			my $constraintrule = "false";
+			
+			foreach (@tclist){
+				chomp;
+				@tc = split(/\,/);
+				$tc[13] =~ s/\//_/g;
+				if ($tc[15] eq 'on' && $tc[13] =~ $category){
+					$constraintrule = "true";
+				}
+			}
+			
+			if ( $constraintrule eq "false"){
+				next;
+			}
+		}
+		
 		print FILE "dest $category {\n";
 		if (-e "$dbdir/$blacklist/domains") {
 			print FILE "    domainlist     $blacklist\/domains\n";