[Ipcop-svn] SF.net SVN: ipcop:[6053] ipcop/trunk/html/cgi-bin/proxy.cgi

[owes]

Revision: 6053
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6053&view=rev
Author:   owes
Date:     2011-11-11 08:49:20 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Remove references to urlfilter from proxy.cgi

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/proxy.cgi

Modified: ipcop/trunk/html/cgi-bin/proxy.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/proxy.cgi  2011-11-11 08:47:42 UTC (rev 6052)
+++ ipcop/trunk/html/cgi-bin/proxy.cgi  2011-11-11 08:49:20 UTC (rev 6053)
@@ -49,7 +49,6 @@
 my %updaccelsettings=();
 my %stdproxysettings=();
 my %mainsettings=();
-my $urlfilter_addon=0;
 my $updaccel_addon=0;
 
 my %checked=();
@@ -248,20 +247,8 @@
 
 $https_port = $mainsettings{'GUIPORT'} if (defined($mainsettings{'GUIPORT'}));
 
-if (-e "/usr/bin/squidGuard") { $urlfilter_addon = 1; }
 if (-e "/var/ipcop/addons/updatexlrator/version") { $updaccel_addon = 1; }
 
-if ($urlfilter_addon) {
-    $filtersettings{'CHILDREN'} = '5';
-    if (-e "/var/ipcop/proxy/filtersettings") {
-        &General::readhash("/var/ipcop/proxy/filtersettings", 
\%filtersettings);
-    }
-    $urlfilterversion = `/usr/bin/squidGuard -v 2>&1`;
-    $urlfilterversion =~ s/^SquidGuard://i;
-    $urlfilterversion =~ s/^\s+//g;
-    $urlfilterversion =~ s/([^\s]+).*/$1/;
-}
-
 if ($updaccel_addon) {
     $updaccelsettings{'CHILDREN'} = '10';
     if (-e "/var/ipcop/addons/updatexlrator/settings") {
@@ -364,10 +351,6 @@
 $proxysettings{'IDENT_ENABLE_ACL'} = 'off';
 $proxysettings{'IDENT_USER_ACL'} = 'positive';
 
-if ($urlfilter_addon) {
-    $proxysettings{'ENABLE_FILTER'} = 'off';
-}
-
 if ($updaccel_addon) {
     $proxysettings{'ENABLE_UPDXLRATOR'} = 'off';
 }
@@ -942,12 +925,6 @@
 $checked{'IDENT_USER_ACL'}{'negative'} = '';
 $checked{'IDENT_USER_ACL'}{$proxysettings{'IDENT_USER_ACL'}} = 
"checked='checked'";
 
-if ($urlfilter_addon) {
-    $checked{'ENABLE_FILTER'}{'off'} = '';
-    $checked{'ENABLE_FILTER'}{'on'} = '';
-    $checked{'ENABLE_FILTER'}{$proxysettings{'ENABLE_FILTER'}} = 
"checked='checked'";
-}
-
 if ($updaccel_addon) {
     $checked{'ENABLE_UPDXLRATOR'}{'off'} = '';
     $checked{'ENABLE_UPDXLRATOR'}{'on'} = '';
@@ -1686,23 +1663,6 @@
 END
 ;
 
-if ($urlfilter_addon) {
-    print <<END
-<table width='100%'>
-<tr>
-    <td class='base' colspan='4'><b>$Lang::tr{'url filter'}</b>&nbsp; [ 
SquidGuard: $urlfilterversion ]</td>
-</tr>
-<tr>
-    <td class='base' width='25%'>$Lang::tr{'enabled'}:</td>
-    <td class='base' width='20%'><input type='checkbox' name='ENABLE_FILTER' 
$checked{'ENABLE_FILTER'}{'on'} /></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-</tr>
-</table>
-<hr size='1'/>
-END
-; }
-
 if ($updaccel_addon) {
     print <<END
 <table width='100%'>
@@ -4110,40 +4070,10 @@
         print FILE "\nalways_direct allow IPCop_ips\n";
         print FILE "never_direct  allow all\n\n";
     }
-    if (($urlfilter_addon) && ($updaccel_addon) && 
($proxysettings{'ENABLE_FILTER'} eq 'on') && 
($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on'))
-    {
-        print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
-        if ($filtersettings{'CHILDREN'} > $updaccelsettings{'CHILDREN'})
-        {
-            print FILE "url_rewrite_children $filtersettings{'CHILDREN'}\n\n";
-        } else {
-            print FILE "url_rewrite_children 
$updaccelsettings{'CHILDREN'}\n\n";
-        }
-    } else
-    {
-        if ($urlfilter_addon) {
-            if ($proxysettings{'ENABLE_FILTER'} eq 'on')
-            {
-                print FILE <<END
-url_rewrite_program /usr/bin/squidGuard
-url_rewrite_children $filtersettings{'CHILDREN'}
 
-END
-                ;
-            }
-        }
-        if ($updaccel_addon) {
-            if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')
-            {
-                print FILE <<END
-url_rewrite_program /usr/sbin/updxlrator
-url_rewrite_children $updaccelsettings{'CHILDREN'}
+    # TODO: other mechanism to add/remove redirector and to configure 
url_rewrite_children
 
-END
-                ;
-            }
-        }
-    }
+
     close FILE;
 }
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn