Revision: 6392
http://ipcop.svn.sourceforge.net/ipcop/?rev=6392&view=rev
Author: owes
Date: 2012-02-21 15:59:54 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Texts for sections time constraints and quotas
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-21 07:54:16 UTC (rev
6391)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-21 15:59:54 UTC (rev
6392)
@@ -22,7 +22,7 @@
#
# Add entry in menu
-# MENUENTRY services 020 "url filter" "url filter configuration"
+# MENUENTRY services 020 "url filter" "urlfilter configuration"
#
# Make sure translation exists $Lang::tr{'url filter'}
@@ -388,7 +388,7 @@
}
if (!($tcsettings{'TO_HOUR'} . $tcsettings{'TO_MINUTE'} gt
$tcsettings{'FROM_HOUR'} . $tcsettings{'FROM_MINUTE'})) {
- $errormessage .= "$Lang::tr{'urlfilter timespace error'}<br />";
+ $errormessage .= "$Lang::tr{'error time space'}<br />";
}
if (
@@ -1195,16 +1195,34 @@
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'
enctype='multipart/form-data'>\n";
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
+ my $sactive = &General::isrunning('squidguard', 'nosize');
print <<END
<table width='100%'>
<tr>
- <td colspan='4'><b>$Lang::tr{'url filter'}</b></td>
+ <td>$Lang::tr{'url filter'}:</td>
+ $sactive
+ <td> </td>
+ <td> </td>
</tr><tr>
+ <td colspan='4' class='base'><hr /></td>
+</tr><tr>
+ <td colspan='4' class='base'><b>$Lang::tr{'common settings'}</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 class='base'>$Lang::tr{'log enabled'}:</td>
+ <td><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'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>
+ <td class='base'>$Lang::tr{'log username'}:</td>
+ <td><input type='checkbox' name='ENABLE_USERNAME_LOG'
$checked{'ENABLE_USERNAME_LOG'}{'on'} /></td>
+ <td> </td>
+ <td> </td>
+</tr><tr>
<td colspan='4' class='base'><hr /></td>
</tr>
<tr>
@@ -1460,23 +1478,14 @@
</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>
- <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>
<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>
+ <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>
</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>
@@ -1678,11 +1687,11 @@
$buttontext = $Lang::tr{'add'};
if ($tcsettings{'ACTION'} eq $Lang::tr{'edit'}) {
- &Header::openbox('100%', 'left', $Lang::tr{'urlfilter edit time
constraint rule'} . ':');
+ &Header::openbox('100%', 'left', $Lang::tr{'edit time constraint
rule'} . ':');
$buttontext = $Lang::tr{'update'};
}
else {
- &Header::openbox('100%', 'left', $Lang::tr{'urlfilter add new time
constraint rule'} . ':');
+ &Header::openbox('100%', 'left', $Lang::tr{'add new time constraint
rule'} . ':');
}
$selected{'DEFINITION'}{'within'} = '';
@@ -1693,15 +1702,15 @@
<table width='100%'>
<tr>
- <td width='2%'>$Lang::tr{'urlfilter constraint definition'}</td>
+ <td width='2%'>$Lang::tr{'definition'}</td>
<td width='1%'> </td>
+ <td width='2%' align='center'>$Lang::tr{'sunday short'}</td>
<td width='2%' align='center'>$Lang::tr{'monday short'}</td>
<td width='2%' align='center'>$Lang::tr{'tuesday short'}</td>
<td width='2%' align='center'>$Lang::tr{'wednesday short'}</td>
<td width='2%' align='center'>$Lang::tr{'thursday short'}</td>
<td width='2%' align='center'>$Lang::tr{'friday short'}</td>
<td width='2%' align='center'>$Lang::tr{'saturday short'}</td>
- <td width='2%' align='center'>$Lang::tr{'sunday short'}</td>
<td width='1%'> </td>
<td width='7%' colspan=3>$Lang::tr{'from'}</td>
<td width='1%'> </td>
@@ -1711,18 +1720,18 @@
<tr>
<td class='base'>
<select name='DEFINITION'>
- <option value='within'
$selected{'DEFINITION'}{'within'}>$Lang::tr{'urlfilter constraint
within'}</option>
- <option value='outside'
$selected{'DEFINITION'}{'outside'}>$Lang::tr{'urlfilter constraint
outside'}</option>
+ <option value='within'
$selected{'DEFINITION'}{'within'}>$Lang::tr{'within'}</option>
+ <option value='outside'
$selected{'DEFINITION'}{'outside'}>$Lang::tr{'outside'}</option>
</select>
</td>
<td> </td>
+ <td class='base'><input type='checkbox' name='SUN'
$checked{'SUN'}{'on'} /></td>
<td class='base'><input type='checkbox' name='MON'
$checked{'MON'}{'on'} /></td>
<td class='base'><input type='checkbox' name='TUE'
$checked{'TUE'}{'on'} /></td>
<td class='base'><input type='checkbox' name='WED'
$checked{'WED'}{'on'} /></td>
<td class='base'><input type='checkbox' name='THU'
$checked{'THU'}{'on'} /></td>
<td class='base'><input type='checkbox' name='FRI'
$checked{'FRI'}{'on'} /></td>
<td class='base'><input type='checkbox' name='SAT'
$checked{'SAT'}{'on'} /></td>
- <td class='base'><input type='checkbox' name='SUN'
$checked{'SUN'}{'on'} /></td>
<td> </td>
<td class='base'>
<select name='FROM_HOUR'>
@@ -1803,7 +1812,7 @@
<table width='100%'>
<tr>
- <td width='5%'>$Lang::tr{'urlfilter source'}</td>
+ <td width='5%'>$Lang::tr{'source'}</td>
<td width='1%'> </td>
<td width='5%'>$Lang::tr{'destination'} <img
src='/blob.gif' alt='*'><img src='/blob.gif' alt='*'></td>
<td width='1%'> </td>
@@ -1845,7 +1854,7 @@
<td> </td>
<td class='base' rowspan='2' valign='top'>
<select name='DST' size='6' multiple>
- <option value='any' $selected{'DST'}{'any'}>$Lang::tr{'urlfilter
category all'}</option>
+ <option value='any'
$selected{'DST'}{'any'}>$Lang::tr{'any'}</option>
<option value='in-addr'
$selected{'DST'}{'in-addr'}>in-addr</option>
END
;
@@ -1913,7 +1922,7 @@
<td colspan='3'> </td>
</tr><tr>
<td class='comment2buttons'>
- <img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*'
/> $Lang::tr{'urlfilter select multi'}
+ <img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*'
/> $Lang::tr{'ctrl select multi'}
</td>
<td class='button2buttons'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
@@ -1951,8 +1960,8 @@
print <<END
<table width='100%'>
<tr>
- <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter constraint definition'}</b></td>
- <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter time space'}</b></td>
+ <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'definition'}</b></td>
+ <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'time space'}</b></td>
<td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'source'}</b></td>
<td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'destination'}</b></td>
<td width='1%' class='boldbase' colspan='5'
align='center'> </td>
@@ -1985,14 +1994,14 @@
}
if ($temp[0] eq 'within') {
- $temp[0] = $Lang::tr{'urlfilter constraint within'};
+ $temp[0] = $Lang::tr{'within'};
}
else {
- $temp[0] = $Lang::tr{'urlfilter constraint outside'};
+ $temp[0] = $Lang::tr{'outside'};
}
if ($temp[13] eq 'any') {
- $temp[13] = $Lang::tr{'urlfilter category all'};
+ $temp[13] = $Lang::tr{'any'};
}
if ($temp[15] eq 'on') {
@@ -2008,14 +2017,21 @@
if ($temp[14] eq 'block') {
$led = 'led-red.gif';
- $ldesc = $Lang::tr{'urlfilter block access'};
+ $ldesc = 'block access';
}
else {
$led = 'led-green.gif';
- $ldesc = $Lang::tr{'urlfilter allow access'};
+ $ldesc = 'allow access';
}
undef $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'};
}
@@ -2058,13 +2074,6 @@
$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
@@ -2114,23 +2123,25 @@
</tr>
END
;
- if ($tcsettings{'ACTION'} eq $Lang::tr{'edit'} && $tcsettings{'ID'} eq
$id) {
- print "<tr class='selectcolour'>\n";
- }
- elsif ($id % 2) {
- print "<tr class='table1colour'>\n";
- }
- else {
- print "<tr class='table2colour'>\n";
- }
- print <<END
- <td align='center' colspan='4'>$temp[16]
- </td>
- <td align='center' colspan='5'>
- </td>
- </tr>
+ if ($temp[16] ne "") {
+ if ($tcsettings{'ACTION'} eq $Lang::tr{'edit'} &&
$tcsettings{'ID'} eq $id) {
+ print "<tr class='selectcolour'>\n";
+ }
+ elsif ($id % 2) {
+ print "<tr class='table1colour'>\n";
+ }
+ else {
+ print "<tr class='table2colour'>\n";
+ }
+ print <<END
+ <td align='center' colspan='4'>$temp[16]
+ </td>
+ <td align='center' colspan='5'>
+ </td>
+ </tr>
END
;
+ }
}
print "</table>\n";
@@ -2142,9 +2153,9 @@
<table>
<tr>
<td class='boldbase'> <b>$Lang::tr{'legend'}:</b></td>
- <td> <img src='/images/led-green.gif'
alt='$Lang::tr{'urlfilter allow access'}' /></td>
+ <td> <img src='/images/led-green.gif' alt='allow
access' /></td>
<td class='base'>$Lang::tr{'allow'}</td>
- <td> <img src='/images/led-red.gif'
alt='$Lang::tr{'urlfilter block access'}' /></td>
+ <td> <img src='/images/led-red.gif' alt='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>
@@ -2177,11 +2188,11 @@
$buttontext = $Lang::tr{'add'};
if ($uqsettings{'ACTION'} eq $Lang::tr{'edit'}) {
- &Header::openbox('100%', 'left', $Lang::tr{'urlfilter edit user quota
rule'} . ':');
+ &Header::openbox('100%', 'left', $Lang::tr{'edit user quota rule'} .
':');
$buttontext = $Lang::tr{'update'};
}
else {
- &Header::openbox('100%', 'left', $Lang::tr{'urlfilter add new user
quota rule'} . ':');
+ &Header::openbox('100%', 'left', $Lang::tr{'add new user quota rule'}
. ':');
}
print <<END
@@ -2190,14 +2201,14 @@
<td width='25%'></td> <td width='25%'> </td><td width='25%'> </td><td
width='25%'></td>
</tr>
<tr>
- <td class='base'>$Lang::tr{'urlfilter user time quota'}:</td>
+ <td class='base'>$Lang::tr{'time quota'}:</td>
<td><input type='text' name='TIME_QUOTA' value='$uqsettings{'TIME_QUOTA'}'
size='5' /></td>
<td colspan='2' rowspan= '5' valign='top' class='base'>
<table cellpadding='0' cellspacing='0'>
<tr>
<!-- intentionally left empty -->
</tr><tr>
- <td>$Lang::tr{'urlfilter assigned quota users'}:</td>
+ <td>$Lang::tr{'assigned quota users'}:</td>
</tr><tr>
<!-- intentionally left empty -->
</tr><tr>
@@ -2223,7 +2234,7 @@
</table>
</td>
</tr><tr>
- <td class='base'>$Lang::tr{'urlfilter activity detection'}:</td>
+ <td class='base'>$Lang::tr{'activity detection'}:</td>
<td class='base'><select name='SPORADIC'>
<option value='0'
$selected{'SPORADIC'}{'0'}>$Lang::tr{'disabled'}</option>
<option value='300' $selected{'SPORADIC'}{'300'}>5
$Lang::tr{'minutes'}</option>
@@ -2240,7 +2251,7 @@
print <<END
<tr>
- <td class='base'>$Lang::tr{'urlfilter renewal period'}:</td>
+ <td class='base'>$Lang::tr{'refresh'}:</td>
<td class='base'><select name='RENEWAL'>
<option value='hourly'
$selected{'RENEWAL'}{'hourly'}>$Lang::tr{'hourly'}</option>
<option value='daily'
$selected{'RENEWAL'}{'daily'}>$Lang::tr{'daily'}</option>
@@ -2308,10 +2319,10 @@
print <<END
<table width='100%'>
<tr>
- <td width='25%' class='boldbase'
align='center'><b><nobr>$Lang::tr{'urlfilter time quota'}</nobr></b></td>
- <td width='25%' class='boldbase'
align='center'><b><nobr>$Lang::tr{'urlfilter activity
detection'}</nobr></b></td>
- <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'urlfilter renewal'}</b></td>
- <td class='boldbase' align='center'><b>$Lang::tr{'urlfilter
assigned users'}</b></td>
+ <td width='25%' class='boldbase'
align='center'><b><nobr>$Lang::tr{'time quota'}</nobr></b></td>
+ <td width='25%' class='boldbase'
align='center'><b><nobr>$Lang::tr{'activity detection'}</nobr></b></td>
+ <td width='25%' class='boldbase'
align='center'><b>$Lang::tr{'refresh'}</b></td>
+ <td class='boldbase' align='center'><b>$Lang::tr{'assigned
users'}</b></td>
<td width='1%' class='boldbase' colspan='4'
align='center'> </td>
</tr>
END
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
