From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 29 Aug 2009 19:48:45 +0000 (+0200)
Subject: Fixed 2 CGIs for core31
X-Git-Tag: v2.5-core31~54
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8fb1a115bd39dba0e1db65de76b3682645eb1f0b

Fixed 2 CGIs for core31
---

diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index 5e000f07e5..e9799f0713 100644
--- 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 af0964e104..f1862f1cf0 100644
--- 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";