Revision: 6298
http://ipcop.svn.sourceforge.net/ipcop/?rev=6298&view=rev
Author: owes
Date: 2012-02-01 11:13:34 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Textual and formatting update for Blacklist update. 'Instant Update' available
only when settings have been stored.
Start/stop logging to syslog.
Consider dropping the backup/restore facility. Settings are in normal backup,
blacklist backup is huge ...
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-01-31 21:52:52 UTC (rev
6297)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-01 11:13:34 UTC (rev
6298)
@@ -155,13 +155,14 @@
$filtersettings{'ACTION'} = '';
$filtersettings{'VALID'} = '';
+$filtersettings{'MODE'} = '';
&General::getcgihash(\%filtersettings);
&General::getcgihash(\%tcsettings);
&General::getcgihash(\%uqsettings);
&General::getcgihash(\%besettings);
-if ( ($filtersettings{'ACTION'} eq $Lang::tr{'save'})
+if ( (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) &&
($filtersettings{'MODE'} eq ''))
|| ($filtersettings{'ACTION'} eq $Lang::tr{'save and restart'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'upload file'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter remove file'})
@@ -949,6 +950,7 @@
open(FILE, ">$editdir/install.conf");
flock FILE, 2;
print FILE "logdir /var/log/squidGuard\n";
+ print FILE "syslog enable\n";
print FILE "dbhome $dbdir/$besettings{'BE_NAME'}\n\n";
print FILE "dest $besettings{'BE_NAME'} {\n";
if ($besettings{'BE_DOMAINS'}) { print FILE " domainlist
domains\n"; }
@@ -980,7 +982,7 @@
}
}
-if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter save schedule'}) {
+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'};
}
@@ -1550,20 +1552,22 @@
<table width='100%'>
<tr>
- <td colspan='2' class='base'><b>$Lang::tr{'urlfilter automatic
blacklist update'}</b>
+ <td colspan='2' class='base'><b>$Lang::tr{'urlfilter automatic blacklist
update'}</b>
END
- ;
+ ;
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{'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'} =
'';
@@ -1574,22 +1578,20 @@
$checked{'CHECKUPDATES'}{$updatesettings{'CHECKUPDATES'}} =
"checked='checked'";
print <<END
- </td>
+ </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>
+ <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>
+ <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' colspan='2'>
- <select name='UPDATE_SOURCE'>
+ <td class='base'>$Lang::tr{'urlfilter select source'}:</td>
+ <td class='base'>
+ <select name='UPDATE_SOURCE'>
END
;
@@ -1598,29 +1600,35 @@
$source_name = substr($_, 0, rindex($_, ","));
$source_url = substr($_, index($_, ",") + 1);
my $selected = '';
- if($updatesettings{'UPDATE_SOURCE'} eq $source_url) {
+ if ($updatesettings{'UPDATE_SOURCE'} eq $source_url) {
$selected = "selected='selected'";
}
print "\t<option value='$source_url'
$selected>$source_name</option>\n";
}
print <<END
- <option value='custom'
$selected{'UPDATE_SOURCE'}{'custom'}>$Lang::tr{'urlfilter custom url'}</option>
- </select>
- </td>
+ <option value='custom'
$selected{'UPDATE_SOURCE'}{'custom'}>$Lang::tr{'urlfilter custom url'}</option>
+ </select>
+ </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>
+ <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>
- <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 class='comment2buttons'> </td>
+ <td class='button2buttons'>
+END
+ ;
+ if ($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>
</tr>
</table>
@@ -3000,6 +3008,7 @@
flock(FILE, 2);
print FILE "logdir /var/log/squidGuard\n";
+ print FILE "syslog enable\n";
print FILE "dbhome $dbdir\n\n";
undef @repositoryfiles;
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
