Revision: 6388
http://ipcop.svn.sourceforge.net/ipcop/?rev=6388&view=rev
Author: owes
Date: 2012-02-21 06:30:08 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Change indentation and some html cleanup. Cleanup of the 'maintenance' box to
be done.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/urlfilter.cgi
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-20 21:18:01 UTC (rev
6387)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-21 06:30:08 UTC (rev
6388)
@@ -21,7 +21,7 @@
# $Id$
#
-# Add entry in menu (not yet ;-))
+# Add entry in menu
# MENUENTRY services 020 "url filter" "url filter configuration"
#
# Make sure translation exists $Lang::tr{'url filter'}
@@ -1186,162 +1186,152 @@
if ((!$tcsettings{'TCMODE'}) && (!$uqsettings{'UQMODE'}) &&
(!$besettings{'BEMODE'})) {
- #==========================================================
- #
- # Section: Main Configuration
- #
- #==========================================================
+ #==========================================================
+ #
+ # Section: Main Configuration
+ #
+ #==========================================================
- print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
+ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
- &Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
- print <<END
+ &Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
+ print <<END
<table width='100%'>
<tr>
- <td colspan='4'><b>$Lang::tr{'url filter'}</b></td>
+ <td colspan='4'><b>$Lang::tr{'url filter'}</b></td>
+</tr><tr>
+ <td width='25%'>$Lang::tr{'enabled'}:</td>
+ <td width='25%'><input type='checkbox' name='ENABLED'
$checked{'ENABLED'}{'on'} /></td>
+ <td width='25%'> </td>
+ <td width='25%'> </td>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
</tr>
<tr>
- <td width='25%'>$Lang::tr{'enabled'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLED'
$checked{'ENABLED'}{'on'} /></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
+ <td colspan='4'><b>$Lang::tr{'block categories'}</b></td>
</tr>
</table>
-<hr size='1' />
<table width='100%'>
-<tr>
- <td colspan='4'><b>$Lang::tr{'block categories'}</b></td>
-</tr>
END
- ;
+ ;
- if (@categories == 0) {
- print <<END
+ if (@categories == 0) {
+ print <<END
<tr>
- <td width='25%'><i>$Lang::tr{'no categories'}</i></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
- <td width='25%'> </td>
+ <td><i>$Lang::tr{'no categories'}</i></td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
</tr>
-
END
- ;
- }
- else {
- for ($n = 0; $n <= @categories; $n = $n + $i) {
- for ($i = 0; $i <= 3; $i++) {
- if ($i eq 0) {
- print "<tr>\n";
+ ;
+ }
+ else {
+ for ($n = 0; $n <= @categories; $n = $n + $i) {
+ for ($i = 0; $i <= 3; $i++) {
+ if ($i eq 0) {
+ print "<tr>\n";
+ }
+ if (($n + $i) < @categories) {
+ my $name = $categories[$n+$i];
+ my $category = $filtergroups[$n+$i];
+ my $checked = '';
+ if(defined($filtersettings{$category}) &&
$filtersettings{$category} eq 'on') {
+ $checked = "checked='checked'";
}
- if (($n + $i) < @categories) {
- my $name = $categories[$n+$i];
- my $category = $filtergroups[$n+$i];
- my $checked = '';
- if(defined($filtersettings{$category}) &&
$filtersettings{$category} eq 'on') {
- $checked = "checked='checked'";
- }
- print "<td width='15%'>$name:<\/td>\n";
- print "<td width='10%'><input type='checkbox'
name='$category' $checked /></td>\n";
- }
- if ($i eq 3) {
- print "<\/tr>\n";
- }
+ print "<td width='15%'>$name:<\/td>\n";
+ print "<td width='10%'><input type='checkbox'
name='$category' $checked /></td>\n";
}
+ if ($i eq 3) {
+ print "<\/tr>\n";
+ }
}
}
- print <<END
+ }
+ print <<END
</table>
-<hr size='1' />
<table width='100%'>
<tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td width='25%'><b>$Lang::tr{'custom blacklist'}</b></td>
<td width='25%'> </td>
<td width='25%'> </td>
<td width='25%'> </td>
-</tr>
-<tr>
- <td width='25%' class='base'>$Lang::tr{'enabled'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLE_CUSTOM_BLACKLIST'
$checked{'ENABLE_CUSTOM_BLACKLIST'}{'on'} /></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
-</tr>
-<tr>
+</tr><tr>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
+ <td><input type='checkbox' name='ENABLE_CUSTOM_BLACKLIST'
$checked{'ENABLE_CUSTOM_BLACKLIST'}{'on'} /></td>
+ <td> </td>
+ <td> </td>
+</tr><tr>
<td colspan='2'>$Lang::tr{'blocked domains'} <img src='/blob.gif'
alt='*' /></td>
<td colspan='2'>$Lang::tr{'blocked urls'} <img src='/blob.gif'
alt='*' /></td>
-</tr>
-<tr>
+</tr><tr>
<td colspan='2'><textarea name='CUSTOM_BLACK_DOMAINS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- if(defined($filtersettings{'CUSTOM_BLACK_DOMAINS'})) {
- print $filtersettings{'CUSTOM_BLACK_DOMAINS'};
- }
+ if(defined($filtersettings{'CUSTOM_BLACK_DOMAINS'})) {
+ print $filtersettings{'CUSTOM_BLACK_DOMAINS'};
+ }
- print <<END
-</textarea></td>
+ print <<END
+ </textarea></td>
<td colspan='2'><textarea name='CUSTOM_BLACK_URLS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- if(defined($filtersettings{'CUSTOM_BLACK_URLS'})) {
- print $filtersettings{'CUSTOM_BLACK_URLS'};
- }
+ if (defined($filtersettings{'CUSTOM_BLACK_URLS'})) {
+ print $filtersettings{'CUSTOM_BLACK_URLS'};
+ }
- print <<END
+ print <<END
</textarea></td>
-</tr>
-</table>
-<hr size='1' />
-<table width='100%'>
-<tr>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td><b>$Lang::tr{'custom whitelist'}</b></td>
<td> </td>
<td> </td>
<td> </td>
-</tr>
-<tr>
- <td class='base' width='25%'>$Lang::tr{'enabled'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLE_CUSTOM_WHITELIST'
$checked{'ENABLE_CUSTOM_WHITELIST'}{'on'} /></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
-</tr>
-<tr>
+</tr><tr>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
+ <td><input type='checkbox' name='ENABLE_CUSTOM_WHITELIST'
$checked{'ENABLE_CUSTOM_WHITELIST'}{'on'} /></td>
+ <td> </td>
+ <td> </td>
+</tr><tr>
<td colspan='2'>$Lang::tr{'allowed domains'} <img src='/blob.gif'
alt='*' /></td>
<td colspan='2'>$Lang::tr{'allowed urls'} <img src='/blob.gif'
alt='*' /></td>
-</tr>
-<tr>
+</tr><tr>
<td colspan='2'><textarea name='CUSTOM_WHITE_DOMAINS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- if(defined($filtersettings{'CUSTOM_WHITE_DOMAINS'})) {
- print $filtersettings{'CUSTOM_WHITE_DOMAINS'};
- }
+ if(defined($filtersettings{'CUSTOM_WHITE_DOMAINS'})) {
+ print $filtersettings{'CUSTOM_WHITE_DOMAINS'};
+ }
- print <<END
-</textarea></td>
+ print <<END
+ </textarea></td>
<td colspan='2'><textarea name='CUSTOM_WHITE_URLS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- if(defined($filtersettings{'CUSTOM_WHITE_URLS'})) {
- print $filtersettings{'CUSTOM_WHITE_URLS'};
- }
+ if (defined($filtersettings{'CUSTOM_WHITE_URLS'})) {
+ print $filtersettings{'CUSTOM_WHITE_URLS'};
+ }
- print <<END
-</textarea></td>
-</tr>
-</table>
-<hr size='1' />
-<table width='100%'>
-<tr>
+ print <<END
+ </textarea></td>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td colspan='4'><b>$Lang::tr{'custom expression list'}</b></td>
</tr><tr>
- <td class='base' width='25%'>$Lang::tr{'enabled'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLE_CUSTOM_EXPRESSIONS'
$checked{'ENABLE_CUSTOM_EXPRESSIONS'}{'on'} /></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
+ <td class='base'>$Lang::tr{'enabled'}:</td>
+ <td><input type='checkbox' name='ENABLE_CUSTOM_EXPRESSIONS'
$checked{'ENABLE_CUSTOM_EXPRESSIONS'}{'on'} /></td>
+ <td> </td>
+ <td> </td>
</tr>
<tr>
@@ -1350,174 +1340,151 @@
<tr>
<td colspan='4'><textarea name='CUSTOM_EXPRESSIONS' cols='70' rows='3'
wrap='off'>
END
- ;
+ ;
- if(defined($filtersettings{'CUSTOM_EXPRESSIONS'})) {
- print $filtersettings{'CUSTOM_EXPRESSIONS'};
- }
+ if (defined($filtersettings{'CUSTOM_EXPRESSIONS'})) {
+ print $filtersettings{'CUSTOM_EXPRESSIONS'};
+ }
- print <<END
-</textarea></td>
-</tr>
-</table>
-<hr size='1' />
-<table width='100%'>
-<tr>
+ print <<END
+ </textarea></td>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td colspan='4'><b>$Lang::tr{'file extension blocking'}</b></td>
</tr><tr>
- <td width='25%' class='base'>$Lang::tr{'binary files'}:</td>
- <td width='25%'><input type='checkbox' name='BLOCK_EXECUTABLES'
$checked{'BLOCK_EXECUTABLES'}{'on'} /></td>
- <td width='25%' class='base'>$Lang::tr{'multimedia'}:</td>
- <td width='25%'><input type='checkbox' name='BLOCK_AUDIO-VIDEO'
$checked{'BLOCK_AUDIO-VIDEO'}{'on'} /></td>
+ <td class='base'>$Lang::tr{'binary files'}:</td>
+ <td><input type='checkbox' name='BLOCK_EXECUTABLES'
$checked{'BLOCK_EXECUTABLES'}{'on'} /></td>
+ <td class='base'>$Lang::tr{'multimedia'}:</td>
+ <td><input type='checkbox' name='BLOCK_AUDIO-VIDEO'
$checked{'BLOCK_AUDIO-VIDEO'}{'on'} /></td>
</tr><tr>
<td>$Lang::tr{'compressed archive files'}:</td>
<td><input type='checkbox' name='BLOCK_ARCHIVES'
$checked{'BLOCK_ARCHIVES'}{'on'} /></td>
<td> </td>
<td> </td>
-</tr>
-</table>
-<hr size='1'>
-<table width='100%'>
-<tr>
- <td width='50'><b>$Lang::tr{'network based access'}</b></td>
- <td width='50%'> </td>
-</tr>
-<tr>
- <td>$Lang::tr{'unrestricted ip clients'} <img src='/blob.gif' alt='*'
/></td>
- <td >$Lang::tr{'banned ip clients'} <img src='/blob.gif' alt='*'
/></td>
-</tr>
-<tr>
- <td><textarea name='UNFILTERED_CLIENTS' cols='32' rows='6' wrap='off'>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
+ <td colspan='2'><b>$Lang::tr{'network based access'}</b></td>
+ <td colspan='2'> </td>
+</tr><tr>
+ <td colspan='2'>$Lang::tr{'unrestricted ip clients'} <img
src='/blob.gif' alt='*' /></td>
+ <td colspan='2'>$Lang::tr{'banned ip clients'} <img src='/blob.gif'
alt='*' /></td>
+</tr><tr>
+ <td colspan='2'><textarea name='UNFILTERED_CLIENTS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- # transform from pre1.8 client definitions
- $filtersettings{'UNFILTERED_CLIENTS'} =~ s/^\s+//g;
- $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+$//g;
- $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+-\s+/-/g;
- $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+/ /g;
+ # transform from pre1.8 client definitions
+ $filtersettings{'UNFILTERED_CLIENTS'} =~ s/^\s+//g;
+ $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+$//g;
+ $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+-\s+/-/g;
+ $filtersettings{'UNFILTERED_CLIENTS'} =~ s/\s+/ /g;
- @clients = split(/ /, $filtersettings{'UNFILTERED_CLIENTS'});
- undef $filtersettings{'UNFILTERED_CLIENTS'};
- foreach my $client (@clients) {
- $filtersettings{'UNFILTERED_CLIENTS'} .= "$client\n";
- }
+ @clients = split(/ /, $filtersettings{'UNFILTERED_CLIENTS'});
+ undef $filtersettings{'UNFILTERED_CLIENTS'};
+ foreach my $client (@clients) {
+ $filtersettings{'UNFILTERED_CLIENTS'} .= "$client\n";
+ }
- if(defined($filtersettings{'UNFILTERED_CLIENTS'})) {
- print $filtersettings{'UNFILTERED_CLIENTS'};
- }
+ if (defined($filtersettings{'UNFILTERED_CLIENTS'})) {
+ print $filtersettings{'UNFILTERED_CLIENTS'};
+ }
- print <<END
-</textarea></td>
- <td><textarea name='BANNED_CLIENTS' cols='32' rows='6' wrap='off'>
+ print <<END
+ </textarea></td>
+ <td colspan='2'><textarea name='BANNED_CLIENTS' cols='32' rows='6'
wrap='off'>
END
- ;
+ ;
- # transform from pre1.8 client definitions
- $filtersettings{'BANNED_CLIENTS'} =~ s/^\s+//g;
- $filtersettings{'BANNED_CLIENTS'} =~ s/\s+$//g;
- $filtersettings{'BANNED_CLIENTS'} =~ s/\s+-\s+/-/g;
- $filtersettings{'BANNED_CLIENTS'} =~ s/\s+/ /g;
+ # transform from pre1.8 client definitions
+ $filtersettings{'BANNED_CLIENTS'} =~ s/^\s+//g;
+ $filtersettings{'BANNED_CLIENTS'} =~ s/\s+$//g;
+ $filtersettings{'BANNED_CLIENTS'} =~ s/\s+-\s+/-/g;
+ $filtersettings{'BANNED_CLIENTS'} =~ s/\s+/ /g;
- @clients = split(/ /, $filtersettings{'BANNED_CLIENTS'});
- undef $filtersettings{'BANNED_CLIENTS'};
- foreach my $client (@clients) {
- $filtersettings{'BANNED_CLIENTS'} .= "$client\n";
- }
+ @clients = split(/ /, $filtersettings{'BANNED_CLIENTS'});
+ undef $filtersettings{'BANNED_CLIENTS'};
+ foreach my $client (@clients) {
+ $filtersettings{'BANNED_CLIENTS'} .= "$client\n";
+ }
- if(defined($filtersettings{'BANNED_CLIENTS'})) {
- print $filtersettings{'BANNED_CLIENTS'};
- }
+ if (defined($filtersettings{'BANNED_CLIENTS'})) {
+ print $filtersettings{'BANNED_CLIENTS'};
+ }
- print <<END
+ print <<END
</textarea></td>
-</tr>
-</table>
-<hr size='1'>
-<table width='100%'>
-<tr>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td colspan='4'><b>$Lang::tr{'timebased access control'}</b></td>
-</tr>
-<tr>
- <td width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'set
time constraints'}'></td>
- <td width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'set
user quota'}'></td>
- <td width='25%'> </td>
- <td width='25%'> </td>
-</tr>
-</table>
-<hr size='1'>
-<table width='100%'>
-<tr>
+</tr><tr>
+ <td><input type='submit' name='ACTION' value='$Lang::tr{'set time
constraints'}'></td>
+ <td><input type='submit' name='ACTION' value='$Lang::tr{'set user
quota'}'></td>
+ <td> </td>
+ <td> </td>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td colspan='4'><b>$Lang::tr{'block page settings'}</b></td>
-</tr>
-<tr>
- <td width='25%' class='base'>$Lang::tr{'show category on block page'}:</td>
- <td width='25%'><input type='checkbox' name='SHOW_CATEGORY'
$checked{'SHOW_CATEGORY'}{'on'} /></td>
- <td width='25%' class='base'>$Lang::tr{'redirect to this url'}: <img
src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='REDIRECT_PAGE'
value='$filtersettings{'REDIRECT_PAGE'}' size='40' /></td>
-</tr>
-<tr>
+</tr><tr>
+ <td class='base'>$Lang::tr{'show category on block page'}:</td>
+ <td><input type='checkbox' name='SHOW_CATEGORY'
$checked{'SHOW_CATEGORY'}{'on'} /></td>
+ <td class='base'>$Lang::tr{'redirect to this url'}: <img
src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='REDIRECT_PAGE'
value='$filtersettings{'REDIRECT_PAGE'}' size='40' /></td>
+</tr><tr>
<td class='base'>$Lang::tr{'show url on block page'}:</td>
<td><input type='checkbox' name='SHOW_URL' $checked{'SHOW_URL'}{'on'}
/></td>
<td class='base'>$Lang::tr{'message line 1'}: <img src='/blob.gif'
alt='*' /></td>
<td><input type='text' name='MSG_TEXT_1'
value='$filtersettings{'MSG_TEXT_1'}' size='40' /></td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'show ip on block page'}:</td>
<td><input type='checkbox' name='SHOW_IP' $checked{'SHOW_IP'}{'on'} /></td>
<td class='base'>$Lang::tr{'message line 2'}: <img src='/blob.gif'
alt='*' /></td>
<td><input type='text' name='MSG_TEXT_2'
value='$filtersettings{'MSG_TEXT_2'}' size='40' /></td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'use dns error to block'}:</td>
<td><input type='checkbox' name='ENABLE_DNSERROR'
$checked{'ENABLE_DNSERROR'}{'on'} /></td>
<td class='base'>$Lang::tr{'message line 3'}: <img src='/blob.gif'
alt='*' /></td>
<td><input type='text' name='MSG_TEXT_3'
value='$filtersettings{'MSG_TEXT_3'}' size='40' /></td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'enable background image'}:</td>
<td><input type='checkbox' name='ENABLE_BG_IMAGE'
$checked{'ENABLE_BG_IMAGE'}{'on'} /></td>
<td> </td>
<td> </td>
-</tr>
-</table>
-<hr size='1'>
-<table width='100%'>
-<tr>
+</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
<td colspan='4'><b>$Lang::tr{'adv options'}</b></td>
-</tr>
-<tr>
- <td width='25%' class='base'>$Lang::tr{'enable expression lists'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLE_EXPR_LISTS'
$checked{'ENABLE_EXPR_LISTS'}{'on'} /></td>
- <td width='25%' class='base'>$Lang::tr{'log enabled'}:</td>
- <td width='25%'><input type='checkbox' name='ENABLE_LOG'
$checked{'ENABLE_LOG'}{'on'} /></td>
-</tr>
-<tr>
+</tr><tr>
+ <td class='base'>$Lang::tr{'enable expression lists'}:</td>
+ <td><input type='checkbox' name='ENABLE_EXPR_LISTS'
$checked{'ENABLE_EXPR_LISTS'}{'on'} /></td>
+ <td class='base'>$Lang::tr{'log enabled'}:</td>
+ <td><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'}
/></td>
+</tr><tr>
<td class='base'>$Lang::tr{'enable safesearch'}:</td>
<td><input type='checkbox' name='ENABLE_SAFESEARCH'
$checked{'ENABLE_SAFESEARCH'}{'on'} /></td>
<td class='base'>$Lang::tr{'log username'}:</td>
<td><input type='checkbox' name='ENABLE_USERNAME_LOG'
$checked{'ENABLE_USERNAME_LOG'}{'on'} /></td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'block ads with empty window'}:</td>
<td><input type='checkbox' name='ENABLE_EMPTY_ADS'
$checked{'ENABLE_EMPTY_ADS'}{'on'} /></td>
<td class='base'>$Lang::tr{'split log by categories'}:</td>
<td><input type='checkbox' name='ENABLE_CATEGORY_LOG'
$checked{'ENABLE_CATEGORY_LOG'}{'on'} /></td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'block sites accessed by ip address'}:</td>
<td><input type='checkbox' name='BLOCK_IP_ADDR'
$checked{'BLOCK_IP_ADDR'}{'on'} /></td>
<td class='base'> </td>
<td> </td>
-</tr>
-<tr>
+</tr><tr>
<td class='base'>$Lang::tr{'block all urls not explicitly allowed'}:</td>
<td><input type='checkbox' name='BLOCK_ALL' $checked{'BLOCK_ALL'}{'on'}
/></td>
<td class='base'>$Lang::tr{'allow custom whitelist for banned
clients'}:</td>
<td><input type='checkbox' name='ENABLE_GLOBAL_WHITELIST'
$checked{'ENABLE_GLOBAL_WHITELIST'}{'on'} /></td>
</tr>
</table>
-<hr size='1'>
+<hr />
<table width='100%'>
<tr>
<td class='comment2buttons'><img src='/blob.gif' align='top' alt='*'
/>
@@ -1532,17 +1499,15 @@
</tr>
</table>
END
- ;
+ ;
- &Header::closebox();
+ &Header::closebox();
+ print "</form>\n";
- print "</form>\n";
+ print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
+ &Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}:");
- print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
-
- &Header::openbox('100%', 'left', "$Lang::tr{'urlfilter
maintenance'}:");
-
- print <<END
+ print <<END
<table width='100%'>
<tr>
<td class='base'><b>$Lang::tr{'urlfilter blacklist update'}</b></td>
@@ -1561,30 +1526,30 @@
<tr>
<td colspan='2' class='base'><b>$Lang::tr{'urlfilter automatic blacklist
update'}</b>
END
- ;
- if (-e "$updflagfile") {
- $blacklistage = int(-M "$updflagfile");
- print
+ ;
+ if (-e "$updflagfile") {
+ $blacklistage = int(-M "$updflagfile");
+ print
" <b>[</b> <small><i>$Lang::tr{'urlfilter blacklist age 1'}
<b>$blacklistage</b> $Lang::tr{'urlfilter blacklist age 2'}</i></small>
<b>]</b>";
- }
+ }
- $updatesettings{'ENABLE_AUTOUPDATE'} = 'off';
- $updatesettings{'CHECKUPDATES'} = 'off';
- $updatesettings{'CUSTOM_UPDATE_URL'} = '';
+ $updatesettings{'ENABLE_AUTOUPDATE'} = 'off';
+ $updatesettings{'CHECKUPDATES'} = 'off';
+ $updatesettings{'CUSTOM_UPDATE_URL'} = '';
- if (-e "$updconffile") {
- &General::readhash("$updconffile", \%updatesettings);
- }
+ if (-e "$updconffile") {
+ &General::readhash("$updconffile", \%updatesettings);
+ }
- $checked{'ENABLE_AUTOUPDATE'}{'off'} =
'';
- $checked{'ENABLE_AUTOUPDATE'}{'on'} =
'';
- $checked{'ENABLE_AUTOUPDATE'}{$updatesettings{'ENABLE_AUTOUPDATE'}} =
"checked='checked'";
+ $checked{'ENABLE_AUTOUPDATE'}{'off'} = '';
+ $checked{'ENABLE_AUTOUPDATE'}{'on'} = '';
+ $checked{'ENABLE_AUTOUPDATE'}{$updatesettings{'ENABLE_AUTOUPDATE'}} =
"checked='checked'";
- $checked{'CHECKUPDATES'}{'off'} = '';
- $checked{'CHECKUPDATES'}{'on'} = '';
- $checked{'CHECKUPDATES'}{$updatesettings{'CHECKUPDATES'}} =
"checked='checked'";
+ $checked{'CHECKUPDATES'}{'off'} = '';
+ $checked{'CHECKUPDATES'}{'on'} = '';
+ $checked{'CHECKUPDATES'}{$updatesettings{'CHECKUPDATES'}} =
"checked='checked'";
- print <<END
+ print <<END
</td>
</tr>
<tr>
@@ -1600,25 +1565,25 @@
<td class='base'>
<select name='UPDATE_SOURCE'>
END
- ;
+ ;
- foreach (@source_urllist) {
- chomp;
- $source_name = substr($_, 0, rindex($_, ","));
- $source_url = substr($_, index($_, ",") + 1);
- my $selected = '';
- if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} eq $source_url) {
- $selected = "selected='selected'";
- }
- print "\t<option value='$source_url'
$selected>$source_name</option>\n";
+ foreach (@source_urllist) {
+ chomp;
+ $source_name = substr($_, 0, rindex($_, ","));
+ $source_url = substr($_, index($_, ",") + 1);
+ my $selected = '';
+ if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} eq $source_url) {
+ $selected = "selected='selected'";
}
+ print "\t<option value='$source_url'
$selected>$source_name</option>\n";
+ }
- my $selectedCustom = '';
- if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} eq 'custom') {
- $selectedCustom = "selected='selected'";
- }
+ my $selectedCustom = '';
+ if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} eq 'custom') {
+ $selectedCustom = "selected='selected'";
+ }
- print <<END
+ print <<END
<option value='custom' $selectedCustom>$Lang::tr{'urlfilter custom
url'}</option>
</select>
</td>
@@ -1633,11 +1598,11 @@
<td class='comment2buttons'> </td>
<td class='button2buttons'>
END
- ;
- if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} ne "") {
- print "<input type='submit' name='ACTION'
value='$Lang::tr{'instant update'}' />";
- }
- print <<END
+ ;
+ if (defined($updatesettings{'UPDATE_SOURCE'}) &&
$updatesettings{'UPDATE_SOURCE'} ne "") {
+ print "<input type='submit' name='ACTION' value='$Lang::tr{'instant
update'}' />";
+ }
+ print <<END
</td>
<td class='button2buttons'><input type='submit' name='ACTION'
value='$Lang::tr{'save'}' /><input type='hidden' name='MODE' value='blacklist
update' /></td>
<td class='onlinehelp'> </td>
@@ -1662,11 +1627,11 @@
END
;
- $checked{'ENABLE_FULLBACKUP'}{'off'} =
'';
- $checked{'ENABLE_FULLBACKUP'}{'on'} =
'';
- $checked{'ENABLE_FULLBACKUP'}{$filtersettings{'ENABLE_FULLBACKUP'}} =
"checked='checked'";
+ $checked{'ENABLE_FULLBACKUP'}{'off'} = '';
+ $checked{'ENABLE_FULLBACKUP'}{'on'} = '';
+ $checked{'ENABLE_FULLBACKUP'}{$filtersettings{'ENABLE_FULLBACKUP'}} =
"checked='checked'";
- print <<END
+ print <<END
<table width='100%'>
<tr>
<td colspan='4' class='base'><b>$Lang::tr{'urlfilter backup
settings'}</b></td>
@@ -1697,9 +1662,9 @@
</table>
</form>
END
- ;
+ ;
- &Header::closebox();
+ &Header::closebox();
}
elsif ($tcsettings{'TCMODE'}) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
