Fixed 2 CGIs for core31

diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index 5e000f07e50ab1d342e9aa2412ef430abf340dd4..e9799f07137c241c360126d65612105a0d2d42ea 100644 (file)
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -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;

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index af0964e10437b86f811ce11957a4262bbc53f199..f1862f1cf064f5ca27cfe1f1b57ba32ca5b66dbf 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -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";