Outgoing Firewall CGI geschrieben, Proxy CGI verkleinert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@615 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index c48f28574ca61c0d52699e9ca18b5f0b84de954e..2b529752efabb7042b8ff423585e44332d8d59b9 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -78,11 +78,18 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'reset'})
        $outfwsettings{'POLICY'}='MODE0';
        unlink $configfile;
        system("/usr/bin/touch $configfile");
+       my $MODE = $outfwsettings{'POLICY'};
+       %outfwsettings = ();
+       $outfwsettings{'POLICY'} = "$MODE";
        &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'})
 {
+       my $MODE = $outfwsettings{'POLICY'};
+       %outfwsettings = ();
+       $outfwsettings{'POLICY'} = "$MODE";
        &General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq 'enable')
 {
@@ -100,6 +107,7 @@ if ($outfwsettings{'ACTION'} eq 'enable')
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq 'disable')
 {
@@ -117,6 +125,7 @@ if ($outfwsettings{'ACTION'} eq 'disable')
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
 {
@@ -134,7 +143,8 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
                        ($configline[4] eq $outfwsettings{'NAME'}) && 
                        ($configline[5] eq $outfwsettings{'SIP'}) && 
                        ($configline[6] eq $outfwsettings{'SMAC'}) && 
-                       ($configline[7] eq $outfwsettings{'DIP'}) && 
+                       ($configline[7] eq $outfwsettings{'DIP'}) &&
+                       ($configline[9] eq $outfwsettings{'LOG'}) &&       
                        ($configline[8] eq $outfwsettings{'DPORT'}))
                {
                        print FILE $configentry;
@@ -143,10 +153,12 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
        close FILE;
        $selected{'SNET'}{"$outfwsettings{'SNET'}"} = 'selected';
        $selected{'PROT'}{"$outfwsettings{'PROT'}"} = 'selected';
+       $selected{'LOG'}{"$outfwsettings{'LOG'}"} = 'selected';
        &addrule();
        &Header::closebigbox();
        &Header::closepage();
-       exit    
+       exit
+  system("/usr/local/bin/outgoingfwctrl");     
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
 {
@@ -165,22 +177,25 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
                        ($configline[5] eq $outfwsettings{'SIP'}) && 
                        ($configline[6] eq $outfwsettings{'SMAC'}) && 
                        ($configline[7] eq $outfwsettings{'DIP'}) && 
+                       ($configline[9] eq $outfwsettings{'LOG'}) &&
                        ($configline[8] eq $outfwsettings{'DPORT'}))
                {
                        print FILE $configentry;
                }
        }
        close FILE;
+       system("/usr/local/bin/outgoingfwctrl");
 }
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'add'})
 {
        if ( $outfwsettings{'VALID'} eq 'yes' ) {
                open( FILE, ">> $configfile" ) or die "Unable to write $configfile";
                print FILE <<END
-$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};
+$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};
 END
 ;
                close FILE;
+               system("/usr/local/bin/outgoingfwctrl");
        } else {
                $outfwsettings{'ACTION'} = 'Add rule';
        }
@@ -224,7 +239,8 @@ END
                    <td width='14%' align='center'><b>Ziel</b>
                    <td width='14%' align='center'><b>Anmerkung</b>
                    <td width='14%' align='center'><b>Politik</b>
-                   <td width='30%' align='center'><b>Aktionen</b>
+                   <td width='16%' align='center'><b>Logging</b>
+                   <td width='14%' align='center'><b>Aktionen</b>
 END
 ;
                foreach $configentry (sort @configs)
@@ -239,10 +255,11 @@ END
                                $outfwsettings{'SMAC'} = $configline[6];
                                $outfwsettings{'DIP'} = $configline[7];
                                $outfwsettings{'DPORT'} = $configline[8];
+                               $outfwsettings{'LOG'} = $configline[9];
                                if ($outfwsettings{'DIP'} eq ''){ $outfwsettings{'DISPLAY_DIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DIP'} = $outfwsettings{'DIP'}; }
                                if ($outfwsettings{'DPORT'} eq ''){ $outfwsettings{'DISPLAY_DPORT'} = 'ALL'; } else { $outfwsettings{'DISPLAY_DPORT'} = $outfwsettings{'DPORT'}; }
-                               if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY'>"; }
-                               if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW'>"; }
+                               if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
+                               if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
                                if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
                                        print <<END
                                        <tr bgcolor='$color{'color20'}'>
@@ -251,33 +268,36 @@ END
                                            <td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}
                                            <td align='center'>$outfwsettings{'NAME'}
                                            <td align='center'>$outfwsettings{'DISPLAY_STATE'}
-                                           <td align='right'>
+                                           <td align='center'>$outfwsettings{'LOG'}
+                                           <td align='center'>
                                             <table border='0' cellpadding='0' cellspacing='0'><tr>
                                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
-                                                       <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
-                                                       <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
-                                                       <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
-                                                       <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
-                                                       <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
-                                                       <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
-                                                       <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
-                                                       <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
-                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'edit'}>
-                                                       <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'}>
+                                                       <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+                                                       <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+                                                       <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+                                                       <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+                                                       <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+                                                       <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+                                                       <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+                                                       <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+                                                       <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+                                                       <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'edit'} />
+                                                       <input type='image' src='/images/edit.gif' width="20" height="20" alt=$Lang::tr{'edit'} />
                                                </form>
                                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                                       <input type='hidden' name='PROT' value=$outfwsettings{'PROT'}>
-                                                       <input type='hidden' name='STATE' value=$outfwsettings{'STATE'}>
-                                                       <input type='hidden' name='SNET' value=$outfwsettings{'SNET'}>
-                                                       <input type='hidden' name='DPORT' value=$outfwsettings{'DPORT'}>
-                                                       <input type='hidden' name='DIP' value=$outfwsettings{'DIP'}>
-                                                       <input type='hidden' name='SIP' value=$outfwsettings{'SIP'}>
-                                                       <input type='hidden' name='NAME' value=$outfwsettings{'NAME'}>
-                                                       <input type='hidden' name='SMAC' value=$outfwsettings{'SMAC'}>
-                                                       <input type='hidden' name='ENABLED' value=$outfwsettings{'ENABLED'}>
-                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'delete'}>
-                                                       <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'}>
+                                                       <input type='hidden' name='PROT' value='$outfwsettings{'PROT'}' />
+                                                       <input type='hidden' name='STATE' value='$outfwsettings{'STATE'}' />
+                                                       <input type='hidden' name='SNET' value='$outfwsettings{'SNET'}' />
+                                                       <input type='hidden' name='DPORT' value='$outfwsettings{'DPORT'}' />
+                                                       <input type='hidden' name='DIP' value='$outfwsettings{'DIP'}' />
+                                                       <input type='hidden' name='SIP' value='$outfwsettings{'SIP'}' />
+                                                       <input type='hidden' name='NAME' value='$outfwsettings{'NAME'}' />
+                                                       <input type='hidden' name='SMAC' value='$outfwsettings{'SMAC'}' />
+                                                       <input type='hidden' name='ENABLED' value='$outfwsettings{'ENABLED'}' />
+                                                       <input type='hidden' name='LOG' value='$outfwsettings{'LOG'}' />
+                                                       <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} />
+                                                       <input type='image' src='/images/delete.gif' width="20" height="20" alt=$Lang::tr{'delete'} />
                                                </form></table>
 END
 ;
@@ -308,15 +328,15 @@ END
        &Header::closebox();
 }
 
-if ($outfwsettings{'POLICY'} eq 'MODE2'){
+if ($outfwsettings{'POLICY'} ne 'MODE0'){
        open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
        @p2ps = <FILE>;
        close FILE;
        &Header::openbox('100%', 'center', 'P2P-Block');
        print <<END
        <table width='40%'>
-               <tr bgcolor='$color{'color20'}'><td width='66%'><b>Protokoll</b>
-                   <td width='33%'><b>Status</b>
+               <tr bgcolor='$color{'color22'}'><td width='66%' align=center><b>Protokoll</b>
+                   <td width='33%' align=center><b>Status</b>
 END
 ;
        my $id = 1;
@@ -327,22 +347,22 @@ END
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 END
 ;
-                       print "\t\t\t<tr bgcolor='$color{'color22'}'>\n"; 
+                       print "\t\t\t<tr bgcolor='$color{'color20'}'>\n"; 
                print <<END
                        <td width='66%' align='center'>$p2pline[0]:     
-                       <td width='33%' align='center'><input type='hidden' name='P2PROT' value=$p2pline[1]>
+                       <td width='33%' align='center'><input type='hidden' name='P2PROT' value='$p2pline[1]' />
 END
 ;
                if ($p2pline[2] eq 'on') {
                        print <<END
-                               <input type='hidden' name='ACTION' value='disable'>
-                               <input type='image' name='submit' src='/images/stock_ok.png' alt=''>
+                               <input type='hidden' name='ACTION' value='disable' />
+                               <input type='image' name='submit' src='/images/stock_ok.png' alt='' />
 END
 ;
                } else {
                        print <<END
-                               <input type='hidden' name='ACTION' value='enable'>
-                               <input type='image' name='submit' src='/images/stock_stop.png' alt=''>
+                               <input type='hidden' name='ACTION' value='enable' />
+                               <input type='image' name='submit' src='/images/stock_stop.png' alt='' />
 END
 ;
                }
@@ -352,8 +372,8 @@ END
 ;
        }
        print <<END
-       <tr><td colspan='2' align='center'>Klicken Sie auf die Symbole um das entsprechende P2P-Netz zu (de-)aktivieren.
        </table>
+  <br />Klicken Sie auf die Symbole um das entsprechende iptables P2P-Blockmodul zu (de-)aktivieren.
 END
 ;
        &Header::closebox();
@@ -363,10 +383,10 @@ END
 print <<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='100%'>
-               <tr><td width='10%' align='left'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.
-               <tr><td width='10%' align='left'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.
-               <tr><td width='10%' align='left'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.<br />Hier ist eine Besonderheit der P2P-Filter.
-               <tr><td colspan='3'><hr />
+               <tr><td width='10%' align='left'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.</td></tr>
+               <tr><td width='10%' align='left'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.</td></tr>
+               <tr><td width='10%' align='left'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.</td></tr>
+               <tr><td colspan='3'><hr /></td></tr>
                <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
                    <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
                    <td width='45%' align='left'>
@@ -398,10 +418,10 @@ sub addrule
        print <<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='80%'>
-               <tr><td width='20%' align='right'>Anmerkung: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}'>
+               <tr><td width='20%' align='right'>Anmerkung: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}' />
                    <td width='20%' align='right'>Aktiviert:
-                   <td width='30%' align='left'><input type='checkbox' name='ENABLED' $selected{'ENABLED'}>
+                   <td width='30%' align='left'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} />
                <tr><td width='20%' align='right'>Protokoll:
                    <td width='30%' align='left'><select name='PROT'><option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option><option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option><option value='udp' $selected{'PROT'}{'udp'}>UDP</option></select>
                    <td width='20%' align='right'>Sicherheitspolitik:
@@ -409,9 +429,9 @@ sub addrule
 END
 ;
        if ($outfwsettings{'POLICY'} eq 'MODE1'){
-               print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW'>\n";
+               print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW' />\n";
        } elsif ($outfwsettings{'POLICY'} eq 'MODE2'){
-               print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY'>\n";
+               print "\t\t\tDENY<input type='hidden' name='STATE' value='DENY' />\n";
        }
        print <<END
                <tr><td width='20%' align='right'>Quellnetz:
@@ -429,18 +449,19 @@ END
        }
        print <<END
                        </select>
-                   <td width='20%' align='right'>Quell-IP-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}'>
-               <tr><td width='50%' colspan='2'>&nbsp;
-                   <td width='20%' align='right'>Quell-MAC-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}'>
-               <tr><td width='20%' align='right'>Ziel-IP-Adresse: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}'>
-                   <td width='20%' align='right'>Ziel-Port: <img src='/blob.gif'>
-                   <td width='30%' align='left'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}'>
+                   <td width='20%' align='right'>Quell-IP-Adresse: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='SIP' maxlength='15' value='$outfwsettings{'SIP'}' />
+               <tr><td width='20%' align='right'>Logging:
+                   <td width='30%' align='left'><select name='LOG'><option value='$Lang::tr{'active'}' $selected{'LOG'}{$Lang::tr{'active'}}>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' $selected{'LOG'}{$Lang::tr{'inactive'}}>$Lang::tr{'inactive'}</option></select></td>
+                   <td width='20%' align='right'>Quell-MAC-Adresse: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='SMAC' maxlength='23' value='$outfwsettings{'SMAC'}' />
+               <tr><td width='20%' align='right'>Ziel-IP-Adresse: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='DIP' maxlength='15' value='$outfwsettings{'DIP'}' />
+                   <td width='20%' align='right'>Ziel-Port: <img src='/blob.gif' />
+                   <td width='30%' align='left'><input type='text' name='DPORT' maxlength='11' value='$outfwsettings{'DPORT'}' />
                <tr><td colspan='4'>
-               <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif'> $Lang::tr{'this field may be blank'}
-                   <td width='60%' align='left' colspan='2'><input type='submit' name='ACTION' value=$Lang::tr{'add'}>
+               <tr><td width='40%' align='right' colspan='2'><img src='/blob.gif' />$Lang::tr{'this field may be blank'}
+                   <td width='60%' align='left' colspan='2'><input type='submit' name='ACTION' value=$Lang::tr{'add'} />
        </table></form>
 END
 ;
@@ -454,7 +475,7 @@ if ($outfwsettings{'POLICY'} eq 'MODE1' || $outfwsettings{'POLICY'} eq 'MODE2')
        my @defservices = <FILE>;
        close FILE;
 
-print "<table width='100%'><tr bgcolor='$color{'color20'}'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td></td></tr>";
+print "<table width='100%'><tr bgcolor='$color{'color20'}'><td><b>$Lang::tr{'service'}</b></td><td><b>$Lang::tr{'description'}</b></td><td><b>$Lang::tr{'port'}</b></td><td><b>$Lang::tr{'protocol'}</b></td><td><b>$Lang::tr{'source net'}</b></td><td><b>$Lang::tr{'logging'}</b></td><td></td></tr>";
 foreach my $serviceline(@defservices)
        {
        my @service = split(/,/,$serviceline);
@@ -474,19 +495,17 @@ END
                print "<option value='orange' $selected{'SNET'}{'orange'}>$Lang::tr{'dmz'}</option>";
        }
        print <<END
-                                       </select></td><td>
+                                       </select></td>
+          <td><select name='LOG'><option value='$Lang::tr{'active'}'>$Lang::tr{'active'}</option><option value='$Lang::tr{'inactive'}' 'selected'>$Lang::tr{'inactive'}</option></select></td><td>
                                        <input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
                                        <input type='image' alt='$Lang::tr{'add'}' src='/images/add.gif' />
                                        <input type='hidden' name='ENABLED' value='on' />
-                                       <input type='hidden' name='STATE' value='ALLOW' />
-                                       </form></td></tr>
 END
 ;
+       if ($outfwsettings{'POLICY'} eq 'MODE1'){       print "<input type='hidden' name='STATE' value='ALLOW' /></form></td></tr>";}
+       elsif ($outfwsettings{'POLICY'} eq 'MODE2'){print "<input type='hidden' name='STATE' value='DENY' /></form></td></tr>";}
        }
-print "</table>";
-
+       print "</table>";
        &Header::closebox();
+  }
 }
-
-}
-

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index ee44b0e344291dd8213e7aa8d5c5236c26d20422..58cf5c83faf11195a455a2bd9965b228a4cf5db1 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -913,32 +913,30 @@ print <<END
 </table>
 <hr size='1'>
 <table width='100%'>
+<tr>
+       <td class='base' width='50%'><b>$Lang::tr{'advproxy url filter'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_FILTER' $checked{'ENABLE_FILTER'}{'on'} /></td>
+       <td class='base' width='50%'><b>$Lang::tr{'advproxy update accelerator'}</b> $Lang::tr{'advproxy enabled'}<input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>
+</tr>
+</table>
+<hr size='1'>
+<table width='100%'>
 <tr>
        <td colspan='4' class='base'><b>$Lang::tr{'advproxy upstream proxy'}</b></td>
 </tr>
 <tr>
-       <td width='25%' class='base'>$Lang::tr{'advproxy via forwarding'}:</td>
-       <td width='20%'><input type='checkbox' name='FORWARD_VIA' $checked{'FORWARD_VIA'}{'on'} /></td>
-       <td width='25%' class='base'>$Lang::tr{'advproxy upstream proxy host:port'}&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td width='30%'><input type='text' name='UPSTREAM_PROXY' value='$proxysettings{'UPSTREAM_PROXY'}' /></td>
+       <td class='base'>$Lang::tr{'advproxy via forwarding'}:</td><td><input type='checkbox' name='FORWARD_VIA' $checked{'FORWARD_VIA'}{'on'} /></td>
+       <td class='base'>$Lang::tr{'advproxy upstream proxy host:port'}<img src='/blob.gif' alt='*' /></td><td><input type='text' name='UPSTREAM_PROXY' value='$proxysettings{'UPSTREAM_PROXY'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'advproxy client IP forwarding'}:</td>
-       <td><input type='checkbox' name='FORWARD_IPADDRESS' $checked{'FORWARD_IPADDRESS'}{'on'} /></td>
-       <td class='base'>$Lang::tr{'advproxy upstream username'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td><input type='text' name='UPSTREAM_USER' value='$proxysettings{'UPSTREAM_USER'}' /></td>
+       <td class='base'>$Lang::tr{'advproxy client IP forwarding'}:</td><td><input type='checkbox' name='FORWARD_IPADDRESS' $checked{'FORWARD_IPADDRESS'}{'on'} /></td>
+       <td class='base'>$Lang::tr{'advproxy upstream username'}<img src='/blob.gif' alt='*' /></td><td><input type='text' name='UPSTREAM_USER' value='$proxysettings{'UPSTREAM_USER'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'advproxy username forwarding'}:</td>
-       <td><input type='checkbox' name='FORWARD_USERNAME' $checked{'FORWARD_USERNAME'}{'on'} /></td>
-       <td class='base'>$Lang::tr{'advproxy upstream password'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td><input type='password' name='UPSTREAM_PASSWORD' value='$proxysettings{'UPSTREAM_PASSWORD'}' /></td>
+       <td class='base'>$Lang::tr{'advproxy username forwarding'}:</td><td><input type='checkbox' name='FORWARD_USERNAME' $checked{'FORWARD_USERNAME'}{'on'} />
+  <td class='base'>$Lang::tr{'advproxy upstream password'}:<img src='/blob.gif' alt='*' /></td><td><input type='password' name='UPSTREAM_PASSWORD' value='$proxysettings{'UPSTREAM_PASSWORD'}' /></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'advproxy no connection auth'}:</td>
-       <td><input type='checkbox' name='NO_CONNECTION_AUTH' $checked{'NO_CONNECTION_AUTH'}{'on'} /></td>
-       <td>&nbsp;</td>
-       <td>&nbsp;</td>
+       <td class='base' colspan='4'>$Lang::tr{'advproxy no connection auth'}:<input type='checkbox' name='NO_CONNECTION_AUTH' $checked{'NO_CONNECTION_AUTH'}{'on'} /></td>
 </tr>
 </table>
 <hr size='1'>
@@ -947,16 +945,9 @@ print <<END
        <td colspan='4' class='base'><b>$Lang::tr{'advproxy log settings'}</b></td>
 </tr>
 <tr>
-       <td width='25%' class='base'>$Lang::tr{'advproxy log enabled'}:</td>
-       <td width='20%'><input type='checkbox' name='LOGGING' $checked{'LOGGING'}{'on'} /></td>
-       <td width='25%'class='base'>$Lang::tr{'advproxy log query'}:</td>
-       <td width='30%'><input type='checkbox' name='LOGQUERY' $checked{'LOGQUERY'}{'on'} /></td>
-</tr>
-<tr>
-       <td>&nbsp;</td>
-       <td>&nbsp;</td>
-       <td class='base'>$Lang::tr{'advproxy log useragent'}:</td>
-       <td><input type='checkbox' name='LOGUSERAGENT' $checked{'LOGUSERAGENT'}{'on'} /></td>
+       <td class='base'>$Lang::tr{'advproxy log enabled'}:<input type='checkbox' name='LOGGING' $checked{'LOGGING'}{'on'} /></td>
+       <td class='base'>$Lang::tr{'advproxy log query'}:<input type='checkbox' name='LOGQUERY' $checked{'LOGQUERY'}{'on'} /></td>
+       <td class='base'>$Lang::tr{'advproxy log useragent'}:<input type='checkbox' name='LOGUSERAGENT' $checked{'LOGUSERAGENT'}{'on'} /></td>
 </tr>
 </table>
 <hr size='1'>
@@ -965,7 +956,7 @@ print <<END
        <td colspan='4'><b>$Lang::tr{'advproxy cache management'}</b></td>
 </tr>
 <tr>
-       <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
+       <td width='35%'></td><td width='15%'></td><td width='35%'></td><td width='15%'></td>
 </tr>
 <tr>
        <td class='base'>$Lang::tr{'advproxy ram cache size'}:</td>
@@ -1003,7 +994,7 @@ print <<END
                                <!-- intentionally left empty -->
                        </tr>
                        <tr>
-                       <td><textarea name='DST_NOCACHE' cols='32' rows='6' wrap='off'>
+                       <td align=center><textarea name='DST_NOCACHE' cols='32' rows='6' wrap='off'>
 END
 ;
 
@@ -1047,7 +1038,7 @@ print <<END
        <td colspan='4'><b>$Lang::tr{'advproxy destination ports'}</b></td>
 </tr>
 <tr>
-       <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
+       <td width='25%' align=center></td> <td width='20%' align=center></td><td width='25%' align=center></td><td width='30%' align=center></td>
 </tr>
 <tr>
        <td colspan='2' class='base'>$Lang::tr{'advproxy standard ports'}:</td>
@@ -1082,7 +1073,7 @@ print <<END
        <td colspan='4' class='base'>$Lang::tr{'advproxy allowed subnets'}:</td>
 </tr>
 <tr>
-       <td colspan='2' rowspan='4'><textarea name='SRC_SUBNETS' cols='32' rows='6' wrap='off'>
+       <td colspan='2' rowspan='4'><textarea name='SRC_SUBNETS' cols='32' rows='3' wrap='off'>
 END
 ;
 
@@ -1136,7 +1127,7 @@ print <<END
        <td colspan='2' class='base'>$Lang::tr{'advproxy unrestricted mac clients'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
-       <td colspan='2'><textarea name='SRC_UNRESTRICTED_IP' cols='32' rows='6' wrap='off'>
+       <td colspan='2'><textarea name='SRC_UNRESTRICTED_IP' cols='32' rows='3' wrap='off'>
 END
 ;
 
@@ -1144,7 +1135,7 @@ END
 
 print <<END
 </textarea></td>
-       <td colspan='2'><textarea name='SRC_UNRESTRICTED_MAC' cols='32' rows='6' wrap='off'>
+       <td colspan='2'><textarea name='SRC_UNRESTRICTED_MAC' cols='32' rows='3' wrap='off'>
 END
 ;
 
@@ -1163,7 +1154,7 @@ print <<END
        <td colspan='2' class='base'>$Lang::tr{'advproxy banned mac clients'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
-       <td colspan='2'><textarea name='SRC_BANNED_IP' cols='32' rows='6' wrap='off'>
+       <td colspan='2'><textarea name='SRC_BANNED_IP' cols='32' rows='3' wrap='off'>
 END
 ;
 
@@ -1171,7 +1162,7 @@ END
 
 print <<END
 </textarea></td>
-       <td colspan='2'><textarea name='SRC_BANNED_MAC' cols='32' rows='6' wrap='off'>
+       <td colspan='2'><textarea name='SRC_BANNED_MAC' cols='32' rows='3' wrap='off'>
 END
 ;
 
@@ -1194,21 +1185,29 @@ if (-e $cre_enabled) { print <<END
 <table width='100%'>
 
 <tr>
-       <td colspan='4'><b>$Lang::tr{'advproxy classroom extensions'}</b></td>
+       <td colspan='4'><b>$Lang::tr{'advproxy classroom extensions'}</b> $Lang::tr{'advproxy enabled'}:<input type='checkbox' name='CLASSROOM_EXT' $checked{'CLASSROOM_EXT'}{'on'} /></td>
 </tr>
 <tr>
        <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
 </tr>
 <tr>
-       <td class='base'>$Lang::tr{'advproxy enabled'}:</td>
-       <td><input type='checkbox' name='CLASSROOM_EXT' $checked{'CLASSROOM_EXT'}{'on'} /></td>
+
+END
+;
+if ($proxysettings{'CLASSROOM_EXT'} eq 'on'){
+print <<END
        <td class='base'>$Lang::tr{'advproxy supervisor password'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
        <td><input type='password' name='SUPERVISOR_PASSWORD' value='$proxysettings{'SUPERVISOR_PASSWORD'}' size='12' /></td>
 </tr>
 <tr>
        <td colspan='2' class='base'>$Lang::tr{'advproxy cre group definitions'}:</td>
        <td colspan='2' class='base'>$Lang::tr{'advproxy cre supervisors'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-</tr>
+END
+;
+}
+print "</tr>";
+if ($proxysettings{'CLASSROOM_EXT'} eq 'on'){
+print <<END
 <tr>
        <td colspan='2'><textarea name='CRE_GROUPS' cols='32' rows='6' wrap='off'>
 END
@@ -1226,12 +1225,11 @@ END
 print <<END
 </textarea></td>
 </tr>
-
-</table>
-
-<hr size='1'>
 END
 ;
+}
+print "</table><hr size='1'>";
+
 } else {
        print <<END
        <input type='hidden' name='SUPERVISOR_PASSWORD' value='$proxysettings{'SUPERVISOR_PASSWORD'}' />
@@ -1437,12 +1435,12 @@ print <<END
 <hr size='1'>
 <table width='100%'>
 <tr>
-       <td colspan='4'><b>$Lang::tr{'advproxy MIME filter'}</b></td>
-</tr>
-<tr>
-       <td width='25%' class='base'>$Lang::tr{'advproxy enabled'}:</td>
-       <td width='20%'><input type='checkbox' name='ENABLE_MIME_FILTER' $checked{'ENABLE_MIME_FILTER'}{'on'} /></td>
+       <td colspan='4'><b>$Lang::tr{'advproxy MIME filter'}</b> $Lang::tr{'advproxy enabled'}:<input type='checkbox' name='ENABLE_MIME_FILTER' $checked{'ENABLE_MIME_FILTER'}{'on'} /></td>
 </tr>
+END
+;
+if ( $proxysettings{'ENABLE_MIME_FILTER'} eq 'on' ){
+print <<END
 <tr>
        <td  colspan='2' class='base'>$Lang::tr{'advproxy MIME block types'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
        <td>&nbsp;</td>
@@ -1460,18 +1458,21 @@ print <<END
        <td>&nbsp;</td>
        <td>&nbsp;</td>
 </tr>
+END
+;
+}
+print <<END
 </table>
+
 <hr size='1'>
 <table width='100%'>
 <tr>
-       <td colspan='4'><b>$Lang::tr{'advproxy web browser'}</b></td>
-</tr>
-<tr>
-       <td width='25%' class='base'>$Lang::tr{'advproxy UA enable filter'}:</td>
-       <td width='20%'><input type='checkbox' name='ENABLE_BROWSER_CHECK' $checked{'ENABLE_BROWSER_CHECK'}{'on'} /></td>
-       <td>&nbsp;</td>
-       <td>&nbsp;</td>
+       <td colspan='4'><b>$Lang::tr{'advproxy web browser'}</b> $Lang::tr{'advproxy UA enable filter'}:<input type='checkbox' name='ENABLE_BROWSER_CHECK' $checked{'ENABLE_BROWSER_CHECK'}{'on'} /></td>
 </tr>
+END
+;
+if ( $proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on' ){
+print <<END
 <tr>
        <td colspan='4'><i>
 END
@@ -1496,7 +1497,7 @@ for ($n=0; $n<=@useragentlist; $n = $n + $i) {
                if ($i eq 3) { print "<\/tr>\n"; }
        }
 }
-
+}
 print <<END
 </table>
 <hr size='1'>
@@ -1506,14 +1507,10 @@ print <<END
 </tr>
 <tr>
        <td class='base'>$Lang::tr{'advproxy fake useragent'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-</tr>
-<tr>
-       <td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='56' /></td>
-</tr>
-<tr>
        <td class='base'>$Lang::tr{'advproxy fake referer'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
 </tr>
 <tr>
+       <td><input type='text' name='FAKE_USERAGENT' value='$proxysettings{'FAKE_USERAGENT'}' size='56' /></td>
        <td><input type='text' name='FAKE_REFERER' value='$proxysettings{'FAKE_REFERER'}' size='56' /></td>
 </tr>
 </table>
@@ -1522,32 +1519,6 @@ END
 ;
 
 print <<END
-<table width='100%'>
-<tr>
-       <td class='base' colspan='4'><b>$Lang::tr{'advproxy url filter'}</b></td>
-</tr>
-<tr>
-       <td class='base' width='25%'>$Lang::tr{'advproxy 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'>
-
-<table width='100%'>
-<tr>
-       <td class='base' colspan='4'><b>$Lang::tr{'advproxy update accelerator'}</b></td>
-</tr>
-<tr>
-       <td class='base' width='25%'>$Lang::tr{'advproxy enabled'}:</td>
-       <td class='base' width='20%'><input type='checkbox' name='ENABLE_UPDXLRATOR' $checked{'ENABLE_UPDXLRATOR'}{'on'} /></td>
-       <td>&nbsp;</td>
-       <td>&nbsp;</td>
-</tr>
-</table>
-<hr size='1'>
-
 <table width='100%'>
 <tr>
        <td colspan='5'><b>$Lang::tr{'advproxy AUTH method'}</b></td>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3173e7fd6911287a21899736faf4290abce98d2e..91f31e23ca8d9ce0143063b19aefded3674eb97f 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -926,6 +926,7 @@
 'log viewing options' => 'Log Ansichts-Optionen',
 'log-options' => 'Logfile options',
 'loged in at' => 'Angemeldet seit',
+'logging' => 'Logging',
 'logging server' => 'Protokollierungs-Server',
 'loginlogout' => 'Login/Logout',
 'lookup failed' => 'Reverse Lookup gescheitert',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ade961edb0c91878588575460fc4b1be31014b04..6dbe21c05f08de50ef35cdc191773892d913902f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -937,6 +937,7 @@
 'log viewing options' => 'Log viewing options',
 'log-options' => 'Logfile options',
 'loged in at' => 'Logged In At',
+'logging' => 'Logging',
 'logging server' => 'Logging server',
 'loginlogout' => 'Login/Logout',
 'lookup failed' => 'Reverse lookup failed',