webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change redirector children settings to proxy cgi

Browse Source
This commit is contained in:
Christian Schmidt
2008-04-16 20:53:05 +02:00
parent ecb280f59f
commit 62459123fa
8 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
html/cgi-bin/proxy.cgi
View File

@@ -161,16 +161,6 @@ close(FILE);
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
$filtersettings{'CHILDREN'} = '5';
if (-e "${General::swroot}/urlfilter/settings") {
&General::readhash("${General::swroot}/urlfilter/settings", \%filtersettings);
}
$xlratorsettings{'CHILDREN'} = '5';
if (-e "${General::swroot}/updatexlrator/settings") {
&General::readhash("${General::swroot}/updatexlrator/settings", \%xlratorsettings);
}
&Header::showhttpheaders();
$proxysettings{'ACTION'} = '';
@@ -263,6 +253,7 @@ $proxysettings{'IDENT_USER_ACL'} = 'positive';
$proxysettings{'ENABLE_FILTER'} = 'off';
$proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
$proxysettings{'ENABLE_CLAMAV'} = 'off';
$proxysettings{'CHILDREN'} = '5';
$ncsa_buttontext = $Lang::tr{'advproxy NCSA create user'};
@@ -377,6 +368,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
{
$errormessage = $Lang::tr{'invalid maximum incoming size'};
goto ERROR;
}
if (!($proxysettings{'CHILDREN'} =~ /^\d+$/) || ($proxysettings{'CHILDREN'} < 1))
{
$errormessage = $Lang::tr{'advproxy invalid num of children'};
goto ERROR;
}
if ($proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on')
{
@@ -936,20 +932,20 @@ print <<END
</table>
<hr size='1'>
<table width='100%'>
<tr><td class='base' width='50%' ><b>$Lang::tr{'advproxy redirector children'}</b><input type='text' name='CHILDREN' value='$proxysettings{'CHILDREN'}' size='5' /></td>
END
;
if ( -e "/usr/bin/squidclamav" ) {
print "<td class='base' width='33%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>";
print "<td class='base' width='33%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>";
print "<td class='base' width='33%'><b>$Lang::tr{'advproxy squidclamav'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_CLAMAV' $checked{'ENABLE_CLAMAV'}{'on'} /></td>";
print "<td class='base' width='33%'><b>$Lang::tr{'advproxy squidclamav'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_CLAMAV' $checked{'ENABLE_CLAMAV'}{'on'} /></td></tr>";
}
else
{
print "<td class='base' width='50%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>";
print "<td class='base' width='50%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>";
print "<td class='base' width='33%'></td></tr>";
}
print <<END
</tr>
<tr><td class='base' width='50%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>
<td class='base' width='50%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td></tr>
</table>
<hr size='1'>
<table width='100%'>
@@ -3688,12 +3684,7 @@ END
if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
{
print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
{
print FILE "url_rewrite_children $filtersettings{'CHILDREN'}\n\n";
} else {
print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
}
print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
}
close FILE;
}

13
html/cgi-bin/updatexlrator.cgi
View File

@@ -75,7 +75,6 @@ my $chk_cron_mly = "${General::swroot}/updatexlrator/autocheck/cron.monthly";
$xlratorsettings{'ACTION'} = '';
$xlratorsettings{'ENABLE_LOG'} = 'off';
$xlratorsettings{'CHILDREN'} = '5';
$xlratorsettings{'PASSIVE_MODE'} = 'off';
$xlratorsettings{'MAX_DISK_USAGE'} = '95';
$xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} = 'off';
@@ -148,11 +147,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr purge'})
if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
{
if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
{
$errormessage = $Lang::tr{'updxlrtr invalid num of children'};
goto ERROR;
}
if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
{
$errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -164,11 +158,6 @@ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'})
if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'})
{
if (!($xlratorsettings{'CHILDREN'} =~ /^\d+$/) || ($xlratorsettings{'CHILDREN'} < 1))
{
$errormessage = $Lang::tr{'updxlrtr invalid num of children'};
goto ERROR;
}
if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100))
{
$errormessage = $Lang::tr{'updxlrtr invalid disk usage'};
@@ -255,8 +244,6 @@ print <<END
<tr>
<td class='base' width='25%'>$Lang::tr{'updxlrtr enable log'}:</td>
<td class='base' width='20%'><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'} /></td>
<td class='base' width='25%'>$Lang::tr{'updxlrtr children'}:</td>
<td class='base' width='30%'><input type='text' name='CHILDREN' value='$xlratorsettings{'CHILDREN'}' size='5' /></td>
</tr>
<tr>
<td class='base'>$Lang::tr{'updxlrtr passive mode'}:</td>

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

@@ -144,7 +144,6 @@ $filtersettings{'ENABLE_SAFESEARCH'} = 'off';
$filtersettings{'ENABLE_LOG'} = 'off';
$filtersettings{'ENABLE_USERNAME_LOG'} = 'off';
$filtersettings{'ENABLE_CATEGORY_LOG'} = 'off';
$filtersettings{'CHILDREN'} = '5';
$filtersettings{'ENABLE_AUTOUPDATE'} = 'off';
$filtersettings{'ACTION'} = '';
@@ -182,12 +181,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
}
if ($errormessage) { goto ERROR; }
if (!($filtersettings{'CHILDREN'} =~ /^\d+$/) || ($filtersettings{'CHILDREN'} < 1))
{
$errormessage = $Lang::tr{'urlfilter invalid num of children'};
goto ERROR;
}
if ((!($filtersettings{'REDIRECT_PAGE'} eq '')) && (!($filtersettings{'REDIRECT_PAGE'} =~ /^https?:\/\//)))
{
$filtersettings{'REDIRECT_PAGE'} = "http://".$filtersettings{'REDIRECT_PAGE'};
@@ -1492,8 +1485,6 @@ print <<END
<tr>
<td class='base'>$Lang::tr{'urlfilter block ip'}:</td>
<td><input type='checkbox' name='BLOCK_IP_ADDR' $checked{'BLOCK_IP_ADDR'}{'on'} /></td>
<td class='base'>$Lang::tr{'urlfilter children'}:</td>
<td><input type='text' name='CHILDREN' value='$filtersettings{'CHILDREN'}' size='5' /></td>
</tr>
<tr>
<td class='base'>$Lang::tr{'urlfilter block all'}:</td>