Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into vpn-statistic1

This commit is contained in:
Alexander Marx
2014-09-26 12:53:05 +02:00
45 changed files with 1197 additions and 189 deletions

View File

@@ -336,7 +336,7 @@ print <<END
END
;
if ($sid ne "n/a") {
print "<a href='http://www.snort.org/search/sid/$sid' ";
print "<a href='https://www.snort.org/rule_docs/$sid' ";
print "target='_blank'>$sid</a></td>\n";
} else {
print $sid;

View File

@@ -935,7 +935,7 @@ if (($besettings{'ACTION'} eq $Lang::tr{'urlfilter install blacklist'}) && ($bes
close FILE;
system("rm -f $dbdir/$besettings{'BE_NAME'}/*.db");
system("/usr/sbin/squidGuard -c $editdir/install.conf -C all");
system("/usr/bin/squidGuard -c $editdir/install.conf -C all");
system("chmod a+w $dbdir/$besettings{'BE_NAME'}/*.db");
&readblockcategories;