Revision: 6452
http://ipcop.svn.sourceforge.net/ipcop/?rev=6452&view=rev
Author: owes
Date: 2012-03-03 19:10:14 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Another bunch of URL filter changes. TODO: Blacklist Editor.
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-03-03 09:42:02 UTC (rev
6451)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-03-03 19:10:14 UTC (rev
6452)
@@ -66,7 +66,6 @@
my $uqfile = "/var/ipcop/proxy/userquota";
my $dbdir = "/var/lib/squidguard/db";
my $editdir = "/var/ipcop/proxy/editor";
-my $hintcolour = '#FFFFCC';
my $sourceurlfile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.urls";
my $updconffile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.conf";
@@ -730,7 +729,7 @@
$uqsettings{'UQMODE'} = 'on';
}
-if ($besettings{'ACTION'} eq $Lang::tr{'urlfilter blacklist editor'}) {
$besettings{'BEMODE'} = 'on'; }
+if ($besettings{'ACTION'} eq $Lang::tr{'blacklist editor'}) {
$besettings{'BEMODE'} = 'on'; }
if ($besettings{'MODE'} eq 'BLACKLIST_EDITOR') {
@temp = split(/\n/, $besettings{'BE_DOMAINS'});
@@ -998,7 +997,7 @@
if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) &&
($filtersettings{'MODE'} eq 'blacklist update')) {
if (($filtersettings{'UPDATE_SOURCE'} eq 'custom') &&
($filtersettings{'CUSTOM_UPDATE_URL'} eq '')) {
- $errormessage .= "$Lang::tr{'urlfilter custom url required'}<br />";
+ $errormessage .= "$Lang::tr{'custom blacklist url required'}<br />";
}
else {
my %updateConf = ();
@@ -1013,10 +1012,10 @@
if ($filtersettings{'ACTION'} eq $Lang::tr{'instant update'}) {
if ($filtersettings{'UPDATE_SOURCE'} eq 'custom' &&
$filtersettings{'CUSTOM_UPDATE_URL'} eq '') {
- $errormessage .= "$Lang::tr{'urlfilter custom url required'}<br />";
+ $errormessage .= "$Lang::tr{'custom blacklist url required'}<br />";
}
else {
- $updatemessage = $Lang::tr{'urlfilter upload information'};
+ $updatemessage = $Lang::tr{'blacklist upload information'};
`/usr/local/bin/blacklistupdate.pl --force < /dev/null > /dev/null &`;
}
}
@@ -1512,28 +1511,14 @@
print "</form>\n";
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
- &Header::openbox('100%', 'left', "$Lang::tr{'urlfilter maintenance'}:");
+ &Header::openbox('100%', 'left', "$Lang::tr{'blacklist maintenance'}:");
print <<END
<table width='100%'>
<tr>
-<td class='base'><b>$Lang::tr{'urlfilter blacklist update'}</b></td>
-</tr>
-<tr>
-<td>$Lang::tr{'urlfilter upload information'}<p>$Lang::tr{'urlfilter upload
text'}:</td>
-</tr>
-<tr>
-<td><input type='file' name='UPDATEFILE' size='40' /> <input
type='submit' name='ACTION' value='$Lang::tr{'urlfilter upload blacklist'}'
/></td>
-</tr>
-</table>
-
-<hr size='1'>
-
-<table width='100%'>
-<tr>
- <td colspan='2' class='base'><b>$Lang::tr{'urlfilter automatic blacklist
update'}</b>
+ <td colspan='4' class='base'><b>$Lang::tr{'blacklist update'}</b>
END
- ;
+;
$blacklistage = &General::ageupdate('blacklist.last');
if ($blacklistage != -1) {
print
@@ -1558,18 +1543,20 @@
print <<END
</td>
-</tr>
-<tr>
- <td width='25%' class='base'>$Lang::tr{'urlfilter enable automatic
blacklist update'}:</td>
- <td width='75%' class='base'><input type='checkbox'
name='ENABLE_AUTOUPDATE' $checked{'ENABLE_AUTOUPDATE'}{'on'} /></td>
-</tr>
-<tr>
- <td class='base'>$Lang::tr{'check for updates after connect'}:</td>
- <td class='base'><input type='checkbox' name='CHECKUPDATES'
$checked{'CHECKUPDATES'}{'on'} /></td>
-</tr>
-<tr>
- <td class='base'>$Lang::tr{'urlfilter select source'}:</td>
- <td class='base'>
+<!--
+</tr><tr>
+ <td>$Lang::tr{'urlfilter enable automatic blacklist update'}:</td>
+ <td><input type='checkbox' name='ENABLE_AUTOUPDATE'
$checked{'ENABLE_AUTOUPDATE'}{'on'} /></td>
+ <td colspan='2'> </td>
+-->
+</tr><tr>
+ <td width='25%' class='base'>$Lang::tr{'check for updates after
connect'}:</td>
+ <td width='25%' class='base'><input type='checkbox' name='CHECKUPDATES'
$checked{'CHECKUPDATES'}{'on'} /></td>
+ <td width='25%' class='base'> </td>
+ <td width='25%' class='base'> </td>
+</tr><tr>
+ <td>$Lang::tr{'blacklist source'}:</td>
+ <td colspan='2'>
<select name='UPDATE_SOURCE'>
END
;
@@ -1591,14 +1578,14 @@
}
print <<END
- <option value='custom' $selectedCustom>$Lang::tr{'urlfilter custom
url'}</option>
+ <option value='custom' $selectedCustom>$Lang::tr{'custom blacklist
url'}</option>
</select>
</td>
+ <td> </td>
+</tr><tr>
+ <td>$Lang::tr{'custom blacklist url'}:</td>
+ <td colspan='3'><input type='text' name='CUSTOM_UPDATE_URL'
value='$updatesettings{'CUSTOM_UPDATE_URL'}' size='72' /></td>
</tr>
-<tr>
- <td>$Lang::tr{'urlfilter custom url'}:</td>
- <td><input type='text' name='CUSTOM_UPDATE_URL'
value='$updatesettings{'CUSTOM_UPDATE_URL'}' size='72' /></td>
-</tr>
</table>
<table width='100%'>
<tr>
@@ -1615,63 +1602,36 @@
<td class='onlinehelp'> </td>
</tr>
</table>
-
-<hr size='1'>
-
+<hr />
<table width='100%'>
<tr>
- <td class='base'><b>$Lang::tr{'urlfilter blacklist editor'}</b></td>
+ <td colspan='2'><b>$Lang::tr{'manually upload a blacklist'}</b></td>
+</tr><tr>
+ <td colspan='2'>$Lang::tr{'blacklist upload information'}</td>
+</tr><tr>
+ <td class='base'>$Lang::tr{'upload blacklist file'}: </td>
+ <td><input type='file' name='UPDATEFILE' size='40' /><input type='submit'
name='ACTION' value='$Lang::tr{'upload'}' /></td>
</tr>
-<tr>
- <td>$Lang::tr{'urlfilter blacklist editor info'}</td>
-</tr>
-<tr>
- <td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter
blacklist editor'}' /></td>
-</tr>
</table>
-<hr size='1'>
+<hr />
END
-;
+ ;
- $checked{'ENABLE_FULLBACKUP'}{'off'} = '';
- $checked{'ENABLE_FULLBACKUP'}{'on'} = '';
- $checked{'ENABLE_FULLBACKUP'}{$filtersettings{'ENABLE_FULLBACKUP'}} =
"checked='checked'";
-
print <<END
-<table width='100%'>
-<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'urlfilter backup
settings'}</b></td>
-</tr>
-<tr>
- <td width='25%' class='base'>$Lang::tr{'urlfilter enable full
backup'}:</td>
- <td width='12%' class='base'><input type='checkbox'
name='ENABLE_FULLBACKUP' $checked{'ENABLE_FULLBACKUP'}{'on'} /></td>
- <td> </td>
- <td> </td>
-</tr>
-<tr>
- <td colspan='4' class='base'><input type='submit' name='ACTION'
value='$Lang::tr{'urlfilter backup'}' /></td>
-</tr>
-</table>
-<hr size='1'>
-
<table width='100%'>
<tr>
- <td class='base'><b>$Lang::tr{'urlfilter restore settings'}</b></td>
+ <td class='base'><b>$Lang::tr{'blacklist editor'}</b></td>
+</tr><tr>
+ <td><input type='submit' name='ACTION' value='$Lang::tr{'blacklist
editor'}' /></td>
</tr>
-<tr>
- <td>$Lang::tr{'urlfilter restore text'}:</td>
-</tr>
-<tr>
- <td><input type='file' name='UPDATEFILE' size='40' /> <input
type='submit' name='ACTION' value='$Lang::tr{'urlfilter restore'}' /></td>
-</tr>
</table>
-</form>
END
;
&Header::closebox();
+ print "</form>\n";
}
elsif ($tcsettings{'TCMODE'}) {
@@ -2448,7 +2408,7 @@
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
- &Header::openbox('100%', 'left', $Lang::tr{'urlfilter urlfilter blacklist
editor'} . ':');
+ &Header::openbox('100%', 'left', "$Lang::tr{'blacklist editor'}:");
print <<END
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
