Fixed 2 CGIs for core31
authorChristian Schmidt <maniacikarus@ipfire.org>
Sat, 29 Aug 2009 19:48:45 +0000 (21:48 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sat, 29 Aug 2009 19:48:45 +0000 (21:48 +0200)
html/cgi-bin/chpasswd.cgi
html/cgi-bin/urlfilter.cgi

index 5e000f0..e9799f0 100644 (file)
@@ -103,7 +103,7 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
                $errormessage = $tr{'advproxy errmsg password incorrect'};
                goto ERROR;
        }
-       $returncode = system("/usr/bin/htpasswd -b $userdb $username $cgiparams{'NEW_PASSWORD_1'}");
+       $returncode = system("/usr/sbin/htpasswd -b $userdb $username $cgiparams{'NEW_PASSWORD_1'}");
        if ($returncode == 0)
        {
                $success = 1;
index af0964e..f1862f1 100644 (file)
@@ -2973,7 +2973,7 @@ 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" ){next;}
                print FILE "dest $category {\n";
                if (-e "$dbdir/$blacklist/domains") {
                        print FILE "    domainlist     $blacklist\/domains\n";