Revision: 6496
http://ipcop.svn.sourceforge.net/ipcop/?rev=6496&view=rev
Author: dotzball
Date: 2012-03-19 05:39:20 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
Fix missing lang key changes. Blacklist upload is working again.
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-18 18:24:53 UTC (rev
6495)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-03-19 05:39:20 UTC (rev
6496)
@@ -39,6 +39,9 @@
require '/usr/lib/ipcop/lang.pl';
require '/usr/lib/ipcop/header.pl';
+# enable(==1)/disable(==0) HTML Form debugging
+my $debugFormparams = 0;
+
my $http_port = '81';
my %netsettings = ();
my %mainsettings = ();
@@ -168,7 +171,7 @@
if ( (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) &&
($filtersettings{'MODE'} eq ''))
|| ($filtersettings{'ACTION'} eq $Lang::tr{'save and restart'})
- || ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'})
+ || ($filtersettings{'ACTION'} eq $Lang::tr{'upload'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter backup'})
|| ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter restore'}))
{
@@ -217,7 +220,7 @@
$filtersettings{'REDIRECT_PAGE'} = "http://" .
$filtersettings{'REDIRECT_PAGE'};
}
- if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'}) {
+ if ($filtersettings{'ACTION'} eq $Lang::tr{'upload'}) {
&General::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' =>
'UPDATEFILE'});
if (!($filtersettings{'UPDATEFILE'} =~ /.tar.gz$/)) {
@@ -236,7 +239,7 @@
system("/bin/tar --no-same-owner -xzf
/var/ipcop/proxy/blacklists.tar.gz -C /var/ipcop/proxy/update");
if ($exitcode > 0) {
- $errormessage .= "$Lang::tr{'urlfilter tar error'};<br />"
+ $errormessage .= "$Lang::tr{'urlfilter tar error'}<br />"
}
else {
@@ -1143,6 +1146,22 @@
&Header::openbigbox('100%', 'left', '', $errormessage);
+###############
+# DEBUG DEBUG
+if ($debugFormparams == 1) {
+ &Header::openbox('100%', 'left', 'DEBUG');
+ my $debugCount = 0;
+ foreach my $line (sort keys %filtersettings) {
+ print "$line = $filtersettings{$line}<br />\n";
+ $debugCount++;
+ }
+ print " Count: $debugCount\n";
+ &Header::closebox();
+}
+
+# DEBUG DEBUG
+###############
+
if ($errormessage) {
&Header::openbox('100%', 'left', "$Lang::tr{'error messages'}:", 'error');
print "<font class='base'>$errormessage </font>\n";
@@ -1175,7 +1194,7 @@
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
-
+
exit 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn