Revision: 5962
http://ipcop.svn.sourceforge.net/ipcop/?rev=5962&view=rev
Author: dotzball
Date: 2011-10-19 05:58:56 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
More URLFilter modifications:
- Fix tests for enabled Proxy
- Use new green address netsettings option
- Settings file renamed:
settings -> filtersettings, was in conflict with proxy settings file
- Formating
- New images/icons
- Some minor changes
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ipcop-gui
ipcop/trunk/html/cgi-bin/urlfilter.cgi
ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
Added Paths:
-----------
ipcop/trunk/html/html/images/led-green.gif
ipcop/trunk/html/html/images/led-red.gif
ipcop/trunk/html/vhost81/html/images/null.gif
Modified: ipcop/trunk/config/rootfiles/common/ipcop-gui
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-gui 2011-10-18 20:49:35 UTC
(rev 5961)
+++ ipcop/trunk/config/rootfiles/common/ipcop-gui 2011-10-19 05:58:56 UTC
(rev 5962)
@@ -99,6 +99,8 @@
home/httpd/html/images/inputadv.gif
home/httpd/html/images/inputdeny.gif
home/httpd/html/images/inputlog.gif
+home/httpd/html/images/led-green.gif
+home/httpd/html/images/led-red.gif
home/httpd/html/images/logging.gif
home/httpd/html/images/loggingoff.gif
home/httpd/html/images/null.gif
@@ -136,3 +138,4 @@
home/httpd/vhost81/html
home/httpd/vhost81/html/images
home/httpd/vhost81/html/images/blacklogo.png
+home/httpd/vhost81/html/images/null.gif
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2011-10-18 20:49:35 UTC (rev
5961)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2011-10-19 05:58:56 UTC (rev
5962)
@@ -371,7 +371,7 @@
}
if ($filtersettings{'ACTION'} eq $Lang::tr{'save and restart'}) {
- if ((!(-e "/var/ipcop/proxy/enable")) && (!(-e
"/var/ipcop/proxy/enable_blue"))) {
+ if ((!($proxysettings{'ENABLED_GREEN_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_BLUE_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_OVPN'} eq 'on'))) {
$errormessage = $Lang::tr{'urlfilter web proxy service required'};
goto ERROR;
}
@@ -444,7 +444,7 @@
$tcsettings{'SRC'} =~ s/\s+$//;
if ($tcsettings{'DST'} =~ /^any/) { $tcsettings{'DST'} = 'any'; }
- if ($tcsettings{'ENABLERULE'} eq 'on') { $tcsettings{'ACTIVE'} =
$tcsettings{'ENABLERULE'}; }
+ if ($tcsettings{'ENABLERULE'} eq 'on') { $tcsettings{'ACTIVE'} =
$tcsettings{'ENABLERULE'}; }
else { $tcsettings{'ACTIVE'} =
'off' }
$tcsettings{'ENABLERULE'} = 'on';
@@ -530,7 +530,7 @@
if (!($proxysettings{'ENABLE_FILTER'} eq 'on')) {
$errormessage = $Lang::tr{'urlfilter not enabled'};
}
- if ((!(-e "/var/ipcop/proxy/enable")) && (!(-e
"/var/ipcop/proxy/enable_blue"))) {
+ if ((!($proxysettings{'ENABLED_GREEN_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_BLUE_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_OVPN'} eq 'on'))) {
$errormessage = $Lang::tr{'urlfilter web proxy service required'};
}
@@ -548,7 +548,7 @@
else {
chomp($line);
@temp = split(/\,/, $line);
- if ($temp[15] eq 'on') { $temp[15] = 'off'; }
+ if ($temp[15] eq 'on') { $temp[15] = 'off'; }
else { $temp[15] = 'on' }
print FILE
"$temp[0],$temp[1],$temp[2],$temp[3],$temp[4],$temp[5],$temp[6],$temp[7],$temp[8],$temp[9],$temp[10],$temp[11],$temp[12],$temp[13],$temp[14],$temp[15],$temp[16]\n";
@@ -624,8 +624,12 @@
my $quota_users = $_;
if (!$errormessage) {
- if ($uqsettings{'ENABLEQUOTA'} eq 'on') { $uqsettings{'ACTIVE'} =
$uqsettings{'ENABLEQUOTA'}; }
- else { $uqsettings{'ACTIVE'} =
'off' }
+ if ($uqsettings{'ENABLEQUOTA'} eq 'on') {
+ $uqsettings{'ACTIVE'} = $uqsettings{'ENABLEQUOTA'};
+ }
+ else {
+ $uqsettings{'ACTIVE'} = 'off';
+ }
$uqsettings{'ENABLERULE'} = 'on';
if ($uqsettings{'EDITING'} eq 'no') {
@@ -706,7 +710,7 @@
else {
chomp($line);
@temp = split(/\,/, $line);
- if ($temp[4] eq 'on') { $temp[4] = 'off'; }
+ if ($temp[4] eq 'on') { $temp[4] = 'off'; }
else { $temp[4] = 'on' }
print FILE "$temp[0],$temp[1],$temp[2],$temp[3],$temp[4]\n";
}
@@ -720,7 +724,7 @@
if (!($proxysettings{'ENABLE_FILTER'} eq 'on')) {
$errormessage = $Lang::tr{'urlfilter not enabled'};
}
- if ((!(-e "/var/ipcop/proxy/enable")) && (!(-e
"/var/ipcop/proxy/enable_blue"))) {
+ if ((!($proxysettings{'ENABLED_GREEN_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_BLUE_1'} eq 'on')) &&
(!($proxysettings{'ENABLED_OVPN'} eq 'on'))) {
$errormessage = $Lang::tr{'urlfilter web proxy service required'};
}
@@ -1042,7 +1046,7 @@
}
}
-if (-e "/var/ipcop/proxy/settings") {
&General::readhash("/var/ipcop/proxy/settings", \%filtersettings); }
+if (-e "/var/ipcop/proxy/filtersettings") {
&General::readhash("/var/ipcop/proxy/filtersettings", \%filtersettings); }
&readcustomlists;
@@ -1548,9 +1552,8 @@
<td class='button2buttons'><input type='submit' name='ACTION'
value='$Lang::tr{'save'}' /></td>
<td class='button2buttons'><input type='submit' name='ACTION'
value='$Lang::tr{'save and restart'}' /></td>
<td class='onlinehelp'>
- <a href='${General::adminmanualurl}/services-webproxy.html'
target='_blank'>
+ <a href='${General::adminmanualurl}/services-urlfilter.html'
target='_blank'>
<img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a>
-
</td>
</tr>
</table>
@@ -1647,7 +1650,11 @@
</table>
<table width='100%'>
<tr>
- <td width='25%'><input type='submit' name='ACTION'
value='$Lang::tr{'urlfilter save schedule'}'> <input
type='submit' name='ACTION' value='$Lang::tr{'instant update'}'></td>
+ <td width='25%'>
+ <input type='submit' name='ACTION' value='$Lang::tr{'urlfilter save
schedule'}' />
+
+ <input type='submit' name='ACTION' value='$Lang::tr{'instant update'}'
/>
+ </td>
</tr>
</table>
@@ -1951,8 +1958,8 @@
<td> </td>
<td class='base' rowspan='2' valign='top'>
<select name='DST' size='6' multiple>
- <option value='any' $selected{'DST'}{'any'} =
"selected='selected'">$Lang::tr{'urlfilter category all'}</option>
- <option value='in-addr' $selected{'DST'}{'in-addr'} =
"selected='selected'">in-addr</option>
+ <option value='any'
$selected{'DST'}{'any'}>$Lang::tr{'urlfilter category all'}</option>
+ <option value='in-addr'
$selected{'DST'}{'in-addr'}>in-addr</option>
END
;
@@ -1962,9 +1969,9 @@
}
print <<END
- <option value='files' $selected{'DST'}{'files'} =
"selected='selected'">files</option>
- <option value='custom-blocked'
$selected{'DST'}{'custom-blocked'} =
"selected='selected'">custom-blocked</option>
- <option value='custom-expressions'
$selected{'DST'}{'custom-expressions'} =
"selected='selected'">custom-expressions</option>
+ <option value='files' $selected{'DST'}{'files'}>files</option>
+ <option value='custom-blocked'
$selected{'DST'}{'custom-blocked'}>custom-blocked</option>
+ <option value='custom-expressions'
$selected{'DST'}{'custom-expressions'}>custom-expressions</option>
</select>
</td>
<td> </td>
@@ -2027,7 +2034,8 @@
<input type='reset' name='ACTION' value='$Lang::tr{'reset'}' />
</td>
<td class='onlinehelp'>
- <a href='${General::adminmanualurl}/system-email-settings.html'
target='_blank'><img src='/images/web-support.png' alt='$Lang::tr{'online help
en'}' title='$Lang::tr{'online help en'}' /></a>
+ <a href='${General::adminmanualurl}/services-urlfilter.html'
target='_blank'>
+ <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a>
</td>
</tr>
</table>
@@ -2082,29 +2090,88 @@
else {
print "<tr bgcolor='$Header::table2colour'>\n";
}
- if ($temp[0] eq 'within') { $temp[0] = $Lang::tr{'urlfilter
constraint within'}; }
- else { $temp[0] = $Lang::tr{'urlfilter
constraint outside'}; }
- if ($temp[13] eq 'any') { $temp[13] = $Lang::tr{'urlfilter category
all'}; }
- if ($temp[15] eq 'on') { $gif = 'on.gif'; $toggle = 'off'; $gdesc =
$Lang::tr{'click to disable'}; }
- else { $gif = 'off.gif'; $toggle = 'on'; $gdesc =
$Lang::tr{'click to enable'}; }
- if ($temp[14] eq 'block') { $led = 'led-red.gif'; $ldesc =
$Lang::tr{'urlfilter block access'}; }
- else { $led = 'led-green.gif'; $ldesc =
$Lang::tr{'urlfilter allow access'}; }
+ if ($temp[0] eq 'within') {
+ $temp[0] = $Lang::tr{'urlfilter constraint within'};
+ }
+ else {
+ $temp[0] = $Lang::tr{'urlfilter constraint outside'};
+ }
+
+ if ($temp[13] eq 'any') {
+ $temp[13] = $Lang::tr{'urlfilter category all'};
+ }
+
+ if ($temp[15] eq 'on') {
+ $gif = 'on.gif';
+ $toggle = 'off';
+ $gdesc = $Lang::tr{'click to disable'};
+ }
+ else {
+ $gif = 'off.gif';
+ $toggle = 'on';
+ $gdesc = $Lang::tr{'click to enable'};
+ }
+
+ if ($temp[14] eq 'block') {
+ $led = 'led-red.gif';
+ $ldesc = $Lang::tr{'urlfilter block access'};
+ }
+ else {
+ $led = 'led-green.gif';
+ $ldesc = $Lang::tr{'urlfilter allow access'};
+ }
+
undef $time;
- if ($temp[1] eq 'on') { $time .= $Lang::tr{'monday very short'}; }
- else { $time .= '='; }
- if ($temp[2] eq 'on') { $time .= $Lang::tr{'tuesday very short'}; }
- else { $time .= '='; }
- if ($temp[3] eq 'on') { $time .= $Lang::tr{'wednesday very short'}; }
- else { $time .= '='; }
- if ($temp[4] eq 'on') { $time .= $Lang::tr{'thursday very short'}; }
- else { $time .= '='; }
- if ($temp[5] eq 'on') { $time .= $Lang::tr{'friday very short'}; }
- else { $time .= '='; }
- if ($temp[6] eq 'on') { $time .= $Lang::tr{'saturday very short'}; }
- else { $time .= '='; }
- if ($temp[7] eq 'on') { $time .= $Lang::tr{'sunday very short'}; }
- else { $time .= '='; }
+ if ($temp[1] eq 'on') {
+ $time .= $Lang::tr{'monday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[2] eq 'on') {
+ $time .= $Lang::tr{'tuesday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[3] eq 'on') {
+ $time .= $Lang::tr{'wednesday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[4] eq 'on') {
+ $time .= $Lang::tr{'thursday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[5] eq 'on') {
+ $time .= $Lang::tr{'friday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[6] eq 'on') {
+ $time .= $Lang::tr{'saturday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
+ if ($temp[7] eq 'on') {
+ $time .= $Lang::tr{'sunday very short'};
+ }
+ else {
+ $time .= '=';
+ }
+
$time = $time . ' ' . $temp[8] . ':' . $temp[9] . ' to ' .
$temp[10] . ':' . $temp[11];
print <<END
@@ -2112,33 +2179,33 @@
<td align='center' nowrap>$time</td>
<td align='center'>$temp[12]</td>
<td align='center'>$temp[13]</td>
- <td align='center'><image src='/images/urlfilter/$led'
alt='$ldesc'></td>
+ <td align='center'><image src='/images/$led' alt='$ldesc'
/></td>
<td align='center'>
<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'toggle enable disable'}'
src='/images/$gif' title='$gdesc' alt='$gdesc' />
- <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTIVE' value='$toggle' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'toggle
enable disable'}' />
+ <input type='image' name='$Lang::tr{'toggle enable disable'}'
src='/images/$gif' title='$gdesc' alt='$gdesc' />
+ <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTIVE' value='$toggle' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable
disable'}' />
</form>
</td>
<td align='center'>
<form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'edit'}'
src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
- <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
+ <input type='image' name='$Lang::tr{'edit'}'
src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
+ <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
</form>
</td>
<td align='center'>
<form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'copy rule'}'
src='/images/urlfilter/copy.gif' title='$Lang::tr{'copy rule'}'
alt='$Lang::tr{'copy rule'}' />
- <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'copy
rule'}' />
+ <input type='image' name='$Lang::tr{'copy rule'}'
src='/images/copy.gif' title='$Lang::tr{'copy rule'}' alt='$Lang::tr{'copy
rule'}' />
+ <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'copy rule'}'
/>
</form>
</td>
@@ -2182,9 +2249,9 @@
<table>
<tr>
<td class='boldbase'> <b>$Lang::tr{'legend'}:</b></td>
- <td> <img src='/images/urlfilter/led-green.gif'
alt='$Lang::tr{'urlfilter allow access'}' /></td>
+ <td> <img src='/images/led-green.gif'
alt='$Lang::tr{'urlfilter allow access'}' /></td>
<td class='base'>$Lang::tr{'allow'}</td>
- <td> <img src='/images/urlfilter/led-red.gif'
alt='$Lang::tr{'urlfilter block access'}' /></td>
+ <td> <img src='/images/led-red.gif'
alt='$Lang::tr{'urlfilter block access'}' /></td>
<td class='base'>$Lang::tr{'block'}</td>
<td> <img src='/images/on.gif' alt='$Lang::tr{'click to
disable'}' /></td>
<td class='base'>$Lang::tr{'click to disable'}</td>
@@ -2192,7 +2259,7 @@
<td class='base'>$Lang::tr{'click to enable'}</td>
<td> <img src='/images/edit.gif'
alt='$Lang::tr{'edit'}' /></td>
<td class='base'>$Lang::tr{'edit'}</td>
- <td> <img src='/images/urlfilter/copy.gif'
alt='$Lang::tr{'copy rule'}' /></td>
+ <td> <img src='/images/copy.gif'
alt='$Lang::tr{'copy rule'}' /></td>
<td class='base'>$Lang::tr{'copy rule'}</td>
<td> <img src='/images/delete.gif'
alt='$Lang::tr{'remove'}' /></td>
<td class='base'>$Lang::tr{'remove'}</td>
@@ -2297,7 +2364,8 @@
<input type='reset' name='ACTION' value='$Lang::tr{'reset'}' />
</td>
<td class='onlinehelp'>
- <a href='${General::adminmanualurl}/system-email-settings.html'
target='_blank'><img src='/images/web-support.png' alt='$Lang::tr{'online help
en'}' title='$Lang::tr{'online help en'}' /></a>
+ <a href='${General::adminmanualurl}/services-urlfilter.html'
target='_blank'>
+ <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a>
</td>
</tr>
</table>
@@ -2343,6 +2411,7 @@
$id++;
chomp($line);
@temp = split(/\,/, $line);
+
if ($uqsettings{'ACTION'} eq $Lang::tr{'edit'} && $uqsettings{'ID'} eq
$id) {
print "<tr bgcolor='$Header::colouryellow'>\n";
}
@@ -2352,12 +2421,27 @@
else {
print "<tr bgcolor='$Header::table2colour'>\n";
}
- if ($temp[4] eq 'on') { $gif = 'on.gif'; $toggle = 'off'; $gdesc =
$Lang::tr{'click to disable'}; }
- else { $gif = 'off.gif'; $toggle = 'on'; $gdesc =
$Lang::tr{'click to enable'}; }
+ if ($temp[4] eq 'on') {
+ $gif = 'on.gif';
+ $toggle = 'off';
+ $gdesc = $Lang::tr{'click to disable'};
+ }
+ else {
+ $gif = 'off.gif';
+ $toggle = 'on';
+ $gdesc = $Lang::tr{'click to enable'};
+ }
+
$temp[5] = $temp[1];
- if ($temp[1] eq '0') { $temp[5] = $Lang::tr{'disabled'} }
- else { $temp[5] = ($temp[5] / 60) . ' ' .
$Lang::tr{'minutes'} }
+
+ if ($temp[1] eq '0') {
+ $temp[5] = $Lang::tr{'disabled'}
+ }
+ else {
+ $temp[5] = ($temp[5] / 60) . ' ' . $Lang::tr{'minutes'}
+ }
+
$_ = $temp[3];
s/\|/, /g;
s/%5c/\\/g;
@@ -2371,29 +2455,29 @@
<td align='center'>
<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'toggle enable disable'}'
src='/images/$gif' title='$gdesc' alt='$gdesc' />
- <input type='hidden' name='MODE' value='USERQUOTA' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTIVE' value='$toggle' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'toggle
enable disable'}' />
+ <input type='image' name='$Lang::tr{'toggle enable disable'}'
src='/images/$gif' title='$gdesc' alt='$gdesc' />
+ <input type='hidden' name='MODE' value='USERQUOTA' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTIVE' value='$toggle' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable
disable'}' />
</form>
</td>
<td align='center'>
<form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'edit'}'
src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
- <input type='hidden' name='MODE' value='USERQUOTA' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
+ <input type='image' name='$Lang::tr{'edit'}'
src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
+ <input type='hidden' name='MODE' value='USERQUOTA' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
</form>
</td>
<td align='center'>
<form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
- <input type='image' name='$Lang::tr{'remove'}'
src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'
/>
- <input type='hidden' name='MODE' value='USERQUOTA' />
- <input type='hidden' name='ID' value='$id' />
- <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}'
/>
+ <input type='image' name='$Lang::tr{'remove'}'
src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'
/>
+ <input type='hidden' name='MODE' value='USERQUOTA' />
+ <input type='hidden' name='ID' value='$id' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
</form>
</td>
@@ -2571,8 +2655,9 @@
<td class='comment1button'> </td>
<td class='button1button'><input type='reset' name='ACTION'
value='$Lang::tr{'reset'}' /></td>
<td class='onlinehelp'>
- <a href='${General::adminmanualurl}/services-webproxy.html'
target='_blank'>
- <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a></td>
+ <a href='${General::adminmanualurl}/services-urlfilter.html'
target='_blank'>
+ <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}'
title='$Lang::tr{'online help en'}' /></a>
+ </td>
</tr>
</table>
<hr />
@@ -2633,7 +2718,7 @@
delete $filtersettings{'BACKGROUND'};
delete $filtersettings{'UPDATEFILE'};
- &General::writehash("/var/ipcop/proxy/settings", \%filtersettings);
+ &General::writehash("/var/ipcop/proxy/filtersettings", \%filtersettings);
}
# -------------------------------------------------------------------
@@ -2883,13 +2968,15 @@
if ($filtersettings{'SHOW_URL'} eq 'on') { $redirect .=
"&url=%u"; }
if ($filtersettings{'SHOW_IP'} eq 'on') { $redirect .=
"&ip=%a"; }
$redirect =~ s/^&/?/;
- $redirect =
"http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi" . $redirect;
+ $redirect =
"http:\/\/$netsettings{'GREEN_1_ADDRESS'}:$http_port\/redirect.cgi" . $redirect;
}
else {
- $redirect =
"http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi";
+ $redirect =
"http:\/\/$netsettings{'GREEN_1_ADDRESS'}:$http_port\/redirect.cgi";
}
}
- else { $redirect = $filtersettings{'REDIRECT_PAGE'}; }
+ else {
+ $redirect = $filtersettings{'REDIRECT_PAGE'};
+ }
if ($filtersettings{'ENABLE_DNSERROR'} eq 'on') { $redirect =
"302:http://0.0.0.0";; }
@@ -2955,14 +3042,11 @@
if ($filtersettings{'ENABLE_SAFESEARCH'} eq 'on') {
print FILE " # rewrite safesearch\n";
- print FILE
-"
s@(.*\\Wgoogle\\.\\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\\?)(.*)(\\bsafe=\\w+)(.*)\@\\1\\3safe=strict\\5\@i\n";
- print FILE
-"
s@(.*\\Wgoogle\\.\\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\\?)(.*)\@\\1safe=strict\\\&\\3\@i\n";
+ print FILE "
s@(.*\\Wgoogle\\.\\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\\?)(.*)(\\bsafe=\\w+)(.*)\@\\1\\3safe=strict\\5\@i\n";
+ print FILE "
s@(.*\\Wgoogle\\.\\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\\?)(.*)\@\\1safe=strict\\\&\\3\@i\n";
print FILE "
s@(.*\\Wsearch\\.yahoo\\.\\w+/search\\W)(.*)(\\bvm=\\w+)(.*)\@\\1\\2vm=r\\4\@i\n";
print FILE "
s@(.*\\Wsearch\\.yahoo\\.\\w+/search\\W.*)\@\\1\\\&vm=r\@i\n";
- print FILE
-"
s@(.*\\Walltheweb\\.com/customize\\?)(.*)(\\bcopt_offensive=\\w+)(.*)\@\\1\\2copt_offensive=on\\4\@i\n";
+ print FILE "
s@(.*\\Walltheweb\\.com/customize\\?)(.*)(\\bcopt_offensive=\\w+)(.*)\@\\1\\2copt_offensive=on\\4\@i\n";
}
print FILE "}\n\n";
@@ -3094,8 +3178,7 @@
print FILE " expressionlist $blacklist\/expressions\n";
}
if ((($category eq 'ads') || ($category eq 'adv')) &&
($filtersettings{'ENABLE_EMPTY_ADS'} eq 'on')) {
- print FILE
- " redirect
http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/images/urlfilter/1x1.gif\n";
+ print FILE " redirect
http:\/\/$netsettings{'GREEN_1_ADDRESS'}:$http_port\/images/null.gif\n";
}
if ($filtersettings{'ENABLE_LOG'} eq 'on') {
if ($filtersettings{'ENABLE_CATEGORY_LOG'} eq 'on') {
Added: ipcop/trunk/html/html/images/led-green.gif
===================================================================
(Binary files differ)
Property changes on: ipcop/trunk/html/html/images/led-green.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: ipcop/trunk/html/html/images/led-red.gif
===================================================================
(Binary files differ)
Property changes on: ipcop/trunk/html/html/images/led-red.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: ipcop/trunk/html/vhost81/html/images/null.gif (from rev 5959,
ipcop/trunk/html/html/images/null.gif)
===================================================================
(Binary files differ)
Modified: ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
===================================================================
--- ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-18 20:49:35 UTC
(rev 5961)
+++ ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1 2011-10-19 05:58:56 UTC
(rev 5962)
@@ -8,7 +8,10 @@
/home/httpd/cgi-bin/logsummary.cgi
/home/httpd/cgi-bin/status.cgi
/home/httpd/cgi-bin/urlfilter.cgi
+/home/httpd/html/images/led-green.gif
+/home/httpd/html/images/led-red.gif
/home/httpd/html/include/ipcop.css
+/home/httpd/vhost81/html/images/null.gif
/usr/lib/ipcop/general-functions.pl
/usr/lib/ipcop/lang.pl
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
