Fixed build and core 11

[people/teissler/ipfire-2.x.git] / html / cgi-bin / proxy.cgi

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 436261cc60b3324d5968746159681956564cf808..bfb7585d55d53dd4b552b5202803ab5342dcef58 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3685,7 +3685,7 @@ END
 
                print FILE "\nnever_direct allow all\n\n";
        }
-       if (($proxysettings{'ENABLE_FILTER'} eq 'on') && ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on'))
+       if (($proxysettings{'ENABLE_FILTER'} eq 'on') || ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on') || ($proxysettings{'ENABLE_CLAMAV'} eq 'on'))
        {
                print FILE "url_rewrite_program /usr/sbin/redirect_wrapper\n";
                if ($filtersettings{'CHILDREN'} > $xlratorsettings{'CHILDREN'})
@@ -3694,27 +3694,6 @@ END
                } else {
                        print FILE "url_rewrite_children $xlratorsettings{'CHILDREN'}\n\n";
                }
-       } else
-       {
-
-               if ($proxysettings{'ENABLE_FILTER'} eq 'on')
-               {
-                       print FILE <<END
-url_rewrite_program /usr/sbin/redirect_wrapper
-url_rewrite_children $filtersettings{'CHILDREN'}
-
-END
-                       ;
-               }
-               if ($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')
-               {
-                       print FILE <<END
-url_rewrite_program /usr/sbin/redirect_wrapper
-url_rewrite_children $xlratorsettings{'CHILDREN'}
-
-END
-                       ;
-               }
        }
        close FILE;
 }