webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-13 16:11:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

urlfilter: Make redirect.cgi template selectable.

Browse Source
This commit is contained in:
Michael Tremer
2013-08-21 17:08:57 +02:00
parent e157791fe9
commit 87e33a423f
11 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
html/cgi-bin/urlfilter.cgi
View File

@@ -59,6 +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 $templatedir = "/srv/web/ipfire/html/redirect-templates";
my $repository = "/var/urlrepo";
my $hintcolour = '#FFFFCC';
@@ -142,6 +143,7 @@ $filtersettings{'ENABLE_LOG'} = 'off';
$filtersettings{'ENABLE_USERNAME_LOG'} = 'off';
$filtersettings{'ENABLE_CATEGORY_LOG'} = 'off';
$filtersettings{'ENABLE_AUTOUPDATE'} = 'off';
$filtersettings{'REDIRECT_TEMPLATE'} = 'legacy';
$filtersettings{'ACTION'} = '';
$filtersettings{'VALID'} = '';
@@ -1074,6 +1076,8 @@ foreach $category (@filtergroups) {
$checked{$category}{$filtersettings{$category}} = "checked='checked'";
}
$selected{'REDIRECT_TEMPLATE'}{$filtersettings{'REDIRECT_TEMPLATE'}} = "selected='selected'";
$selected{'DEFINITION'}{$tcsettings{'DEFINITION'}} = "selected='selected'";
$selected{'FROM_HOUR'}{$tcsettings{'FROM_HOUR'}} = "selected='selected'";
$selected{'FROM_MINUTE'}{$tcsettings{'FROM_MINUTE'}} = "selected='selected'";
@@ -1415,6 +1419,24 @@ print <<END
<tr>
<td colspan='4'><b>$Lang::tr{'urlfilter block settings'}</b></td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'urlfilter redirect template'}</td>
<td width='75%' colspan='2'>
<select name='REDIRECT_TEMPLATE'>
END
;
foreach (<$templatedir/*>) {
if ((-d "$_") && (-e "$_/template.html")) {
my $template = substr($_,rindex($_,"/")+1);
print "<option value='$template' $selected{'REDIRECT_TEMPLATE'}{$template}>$template</option>\n";
}
}
print <<END
</select>
</td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'urlfilter show category'}:</td>
<td width='12%'><input type='checkbox' name='SHOW_CATEGORY' $checked{'SHOW_CATEGORY'}{'on'} /></td>

2
html/html/redirect.cgi
View File

@@ -33,7 +33,7 @@ my %filtersettings;
&readhash("$swroot/urlfilter/settings", \%filtersettings);
# Read the template file.
my $template = $filtersettings{'ERROR_TEMPLATE'};
my $template = $filtersettings{'REDIRECT_TEMPLATE'};
if (($template eq '') || (! -e "$templateroot/$template")) {
$template = "legacy";
}