X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Foutgoingfw.cgi;h=edc6e9d935ea88ffe8e834e023f473442d9f1817;hp=013f6005ee6a4ba9233950ae8259d896ec924238;hb=2c69c31fd5e36da933fca89dd5ed15cd51f3eda5;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 013f6005ee..edc6e9d935 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2005-2010  IPTifre Team                                       #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -41,6 +41,7 @@ my @p2ps = ();
 my @p2pline = ();
 
 my $configfile = "/var/ipfire/outgoing/rules";
+my $configpath = "/var/ipfire/outgoing/groups/";
 my $p2pfile = "/var/ipfire/outgoing/p2protocols";
 my $servicefile = "/var/ipfire/outgoing/defaultservices";
 
@@ -71,15 +72,81 @@ $outfwsettings{'DISPLAY_DPORT'} = '';
 $outfwsettings{'DISPLAY_SMAC'} = '';
 $outfwsettings{'DISPLAY_SIP'} = '';
 $outfwsettings{'POLICY'} = 'MODE0';
+$outfwsettings{'MODE1LOG'} = 'off';
+
+$outfwsettings{'TIME_FROM'} = '00:00';
+$outfwsettings{'TIME_TO'} = '00:00';
 
 &General::readhash("${General::swroot}/outgoing/settings", \%outfwsettings);
 &Header::getcgihash(\%outfwsettings);
 
+###############
+# DEBUG DEBUG
+#&Header::openbox('100%', 'left', 'DEBUG');
+#my $debugCount = 0;
+#foreach my $line (sort keys %outfwsettings) {
+#print "$line = $outfwsettings{$line}<br />\n";
+# $debugCount++;
+#}
+#print "&nbsp;Count: $debugCount\n";
+#&Header::closebox();
+# DEBUG DEBUG
+###############
+
+$selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'";
+$selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'";
+
+$checked{'MODE1LOG'}{'off'} = '';
+$checked{'MODE1LOG'}{'on'} = '';
+$checked{'MODE1LOG'}{$outfwsettings{'MODE1LOG'}} = "checked='checked'";
+$checked{'TIME_MON'}{'off'} = '';
+$checked{'TIME_MON'}{'on'} = '';
+$checked{'TIME_MON'}{$outfwsettings{'TIME_MON'}} = "checked='checked'";
+$checked{'TIME_TUE'}{'off'} = '';
+$checked{'TIME_TUE'}{'on'} = '';
+$checked{'TIME_TUE'}{$outfwsettings{'TIME_TUE'}} = "checked='checked'";
+$checked{'TIME_WED'}{'off'} = '';
+$checked{'TIME_WED'}{'on'} = '';
+$checked{'TIME_WED'}{$outfwsettings{'TIME_WED'}} = "checked='checked'";
+$checked{'TIME_THU'}{'off'} = '';
+$checked{'TIME_THU'}{'on'} = '';
+$checked{'TIME_THU'}{$outfwsettings{'TIME_THU'}} = "checked='checked'";
+$checked{'TIME_FRI'}{'off'} = '';
+$checked{'TIME_FRI'}{'on'} = '';
+$checked{'TIME_FRI'}{$outfwsettings{'TIME_FRI'}} = "checked='checked'";
+$checked{'TIME_SAT'}{'off'} = '';
+$checked{'TIME_SAT'}{'on'} = '';
+$checked{'TIME_SAT'}{$outfwsettings{'TIME_SAT'}} = "checked='checked'";
+$checked{'TIME_SUN'}{'off'} = '';
+$checked{'TIME_SUN'}{'on'} = '';
+$checked{'TIME_SUN'}{$outfwsettings{'TIME_SUN'}} = "checked='checked'";
+
 if ($outfwsettings{'POLICY'} eq 'MODE0'){ $selected{'POLICY'}{'MODE0'} = 'selected'; } else { $selected{'POLICY'}{'MODE0'} = ''; }
 if ($outfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; }
 if ($outfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; }
 
-&Header::openpage('Ausgehende Firewall', 1, '');
+# This is a little hack if poeple don´t mark any date then all will be selected, because they might have forgotten to select
+# a valid day. A Rule without any matching day will never work, because the timeranges are new feature people might not notice
+# that they have to select a day for the rule.
+
+if ( $outfwsettings{'TIME_MON'} eq "" &&
+     $outfwsettings{'TIME_TUE'} eq "" &&
+	 $outfwsettings{'TIME_WED'} eq "" &&
+	 $outfwsettings{'TIME_THU'} eq "" &&
+	 $outfwsettings{'TIME_FRI'} eq "" &&
+	 $outfwsettings{'TIME_SAT'} eq "" &&
+	 $outfwsettings{'TIME_SUN'} eq "" )
+	 {
+		$outfwsettings{'TIME_MON'} = "on";
+		$outfwsettings{'TIME_TUE'} = "on";
+		$outfwsettings{'TIME_WED'} = "on";
+		$outfwsettings{'TIME_THU'} = "on";
+		$outfwsettings{'TIME_FRI'} = "on";
+		$outfwsettings{'TIME_SAT'} = "on";
+		$outfwsettings{'TIME_SUN'} = "on";
+	 }
+
+&Header::openpage($Lang::tr{'outgoing firewall'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 ############################################################################################################################
@@ -98,8 +165,10 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'reset'})
 if ($outfwsettings{'ACTION'} eq $Lang::tr{'save'})
 {
 	my $MODE = $outfwsettings{'POLICY'};
+	my $MODE1LOG = $outfwsettings{'MODE1LOG'};
 	%outfwsettings = ();
 	$outfwsettings{'POLICY'} = "$MODE";
+	$outfwsettings{'MODE1LOG'} = "$MODE1LOG";
 	&General::writehash("${General::swroot}/outgoing/settings", \%outfwsettings);
 	system("/usr/local/bin/outgoingfwctrl");
 }
@@ -148,6 +217,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
 	foreach $configentry (sort @configs)
 	{
 		@configline = split( /\;/, $configentry );
+		
+		$configline[10] =  "on" if not exists $configline[11];
+		$configline[11] =  "on" if not exists $configline[11];
+		$configline[12] =  "on" if not exists $configline[12];
+		$configline[13] =  "on" if not exists $configline[13];
+		$configline[14] =  "on" if not exists $configline[14];
+		$configline[15] =  "on" if not exists $configline[15];
+		$configline[16] =  "on" if not exists $configline[16];
+		$configline[17] =  "00:00" if not exists $configline[17];
+		$configline[18] =  "00:00" if not exists $configline[18];
+
   		unless	(($configline[0] eq $outfwsettings{'STATE'}) && 
 			($configline[1] eq $outfwsettings{'ENABLED'}) && 
 			($configline[2] eq $outfwsettings{'SNET'}) && 
@@ -157,7 +237,16 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'edit'})
 			($configline[6] eq $outfwsettings{'SMAC'}) && 
 			($configline[7] eq $outfwsettings{'DIP'}) &&
 			($configline[9] eq $outfwsettings{'LOG'}) &&       
-			($configline[8] eq $outfwsettings{'DPORT'}))
+			($configline[8] eq $outfwsettings{'DPORT'}) &&
+			($configline[10] eq $outfwsettings{'TIME_MON'}) &&       
+			($configline[11] eq $outfwsettings{'TIME_TUE'}) &&       
+			($configline[12] eq $outfwsettings{'TIME_WED'}) &&       
+			($configline[13] eq $outfwsettings{'TIME_THU'}) &&       
+			($configline[14] eq $outfwsettings{'TIME_FRI'}) &&       
+			($configline[15] eq $outfwsettings{'TIME_SAT'}) &&       
+			($configline[16] eq $outfwsettings{'TIME_SUN'}) &&       
+			($configline[17] eq $outfwsettings{'TIME_FROM'}) &&       
+			($configline[18] eq $outfwsettings{'TIME_TO'}))
   		{
 			print FILE $configentry;
 		}
@@ -181,6 +270,17 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
 	foreach $configentry (sort @configs)
 	{
 		@configline = split( /\;/, $configentry );
+		
+		$configline[10] =  "on" if not exists $configline[11];
+		$configline[11] =  "on" if not exists $configline[11];
+		$configline[12] =  "on" if not exists $configline[12];
+		$configline[13] =  "on" if not exists $configline[13];
+		$configline[14] =  "on" if not exists $configline[14];
+		$configline[15] =  "on" if not exists $configline[15];
+		$configline[16] =  "on" if not exists $configline[16];
+		$configline[17] =  "00:00" if not exists $configline[17];
+		$configline[18] =  "00:00" if not exists $configline[18];
+				
   		unless	(($configline[0] eq $outfwsettings{'STATE'}) && 
 			($configline[1] eq $outfwsettings{'ENABLED'}) && 
 			($configline[2] eq $outfwsettings{'SNET'}) && 
@@ -190,7 +290,16 @@ if ($outfwsettings{'ACTION'} eq $Lang::tr{'delete'})
 			($configline[6] eq $outfwsettings{'SMAC'}) && 
 			($configline[7] eq $outfwsettings{'DIP'}) && 
 			($configline[9] eq $outfwsettings{'LOG'}) &&
-			($configline[8] eq $outfwsettings{'DPORT'}))
+			($configline[8] eq $outfwsettings{'DPORT'}) &&
+			($configline[10] eq $outfwsettings{'TIME_MON'}) &&       
+			($configline[11] eq $outfwsettings{'TIME_TUE'}) &&       
+			($configline[12] eq $outfwsettings{'TIME_WED'}) &&       
+			($configline[13] eq $outfwsettings{'TIME_THU'}) &&       
+			($configline[14] eq $outfwsettings{'TIME_FRI'}) &&       
+			($configline[15] eq $outfwsettings{'TIME_SAT'}) &&       
+			($configline[16] eq $outfwsettings{'TIME_SUN'}) &&       
+			($configline[17] eq $outfwsettings{'TIME_FROM'}) &&       
+			($configline[18] eq $outfwsettings{'TIME_TO'}))
   		{
 			print FILE $configentry;
 		}
@@ -203,7 +312,7 @@ 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{'LOG'};
+$outfwsettings{'STATE'};$outfwsettings{'ENABLED'};$outfwsettings{'SNET'};$outfwsettings{'PROT'};$outfwsettings{'NAME'};$outfwsettings{'SIP'};$outfwsettings{'SMAC'};$outfwsettings{'DIP'};$outfwsettings{'DPORT'};$outfwsettings{'LOG'};$outfwsettings{'TIME_MON'};$outfwsettings{'TIME_TUE'};$outfwsettings{'TIME_WED'};$outfwsettings{'TIME_THU'};$outfwsettings{'TIME_FRI'};$outfwsettings{'TIME_SAT'};$outfwsettings{'TIME_SUN'};$outfwsettings{'TIME_FROM'};$outfwsettings{'TIME_TO'};
 END
 ;
 		close FILE;
@@ -246,13 +355,13 @@ END
 		<hr />
 		<table border='0' width='100%' cellspacing='0'>
 		<tr bgcolor='$color{'color22'}'>
-		    <td width='14%' align='center'><b>Protokoll</b>
-		    <td width='14%' align='center'><b>Netzwerk</b>
-		    <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='16%' align='center'><b>Logging</b>
-		    <td width='14%' align='center'><b>Aktionen</b>
+		    <td width='14%' align='center'><b>$Lang::tr{'protocol'}</b></td>
+		    <td width='14%' align='center'><b>$Lang::tr{'network'}</b></td>
+		    <td width='14%' align='center'><b>$Lang::tr{'destination'}</b></td>
+		    <td width='14%' align='center'><b>$Lang::tr{'description'}</b></td>
+		    <td width='14%' align='center'><b>$Lang::tr{'policy'}</b></td>
+		    <td width='16%' align='center'><b>$Lang::tr{'logging'}</b></td>
+		    <td width='14%' align='center'><b>$Lang::tr{'action'}</b></td>
 END
 ;
 		foreach $configentry (sort @configs)
@@ -268,6 +377,27 @@ END
 				$outfwsettings{'DIP'} = $configline[7];
 				$outfwsettings{'DPORT'} = $configline[8];
 				$outfwsettings{'LOG'} = $configline[9];
+				
+				$configline[10] =  "on" if not exists $configline[11];
+				$configline[11] =  "on" if not exists $configline[11];
+				$configline[12] =  "on" if not exists $configline[12];
+				$configline[13] =  "on" if not exists $configline[13];
+				$configline[14] =  "on" if not exists $configline[14];
+				$configline[15] =  "on" if not exists $configline[15];
+				$configline[16] =  "on" if not exists $configline[16];
+				$configline[17] =  "00:00" if not exists $configline[17];
+				$configline[18] =  "00:00" if not exists $configline[18];
+				
+				$outfwsettings{'TIME_MON'} =  $configline[10];
+				$outfwsettings{'TIME_TUE'} =  $configline[11];
+				$outfwsettings{'TIME_WED'} =  $configline[12];
+				$outfwsettings{'TIME_THU'} =  $configline[13];
+				$outfwsettings{'TIME_FRI'} =  $configline[14];
+				$outfwsettings{'TIME_SAT'} =  $configline[15];
+				$outfwsettings{'TIME_SUN'} =  $configline[16];
+				$outfwsettings{'TIME_FROM'} =  $configline[17];
+				$outfwsettings{'TIME_TO'} =  $configline[18];
+
 				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' />"; }
@@ -294,6 +424,15 @@ END
 							<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='TIME_MON' value='$outfwsettings{'TIME_MON'}' />
+							<input type='hidden' name='TIME_TUE' value='$outfwsettings{'TIME_TUE'}' />
+							<input type='hidden' name='TIME_WED' value='$outfwsettings{'TIME_WED'}' />
+							<input type='hidden' name='TIME_THU' value='$outfwsettings{'TIME_THU'}' />
+							<input type='hidden' name='TIME_FRI' value='$outfwsettings{'TIME_FRI'}' />
+							<input type='hidden' name='TIME_SAT' value='$outfwsettings{'TIME_SAT'}' />
+							<input type='hidden' name='TIME_SUN' value='$outfwsettings{'TIME_SUN'}' />
+							<input type='hidden' name='TIME_FROM' value='$outfwsettings{'TIME_FROM'}' />
+							<input type='hidden' name='TIME_TO' value='$outfwsettings{'TIME_TO'}' />
 							<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>
@@ -308,6 +447,15 @@ END
 							<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='TIME_MON' value='$outfwsettings{'TIME_MON'}' />
+							<input type='hidden' name='TIME_TUE' value='$outfwsettings{'TIME_TUE'}' />
+							<input type='hidden' name='TIME_WED' value='$outfwsettings{'TIME_WED'}' />
+							<input type='hidden' name='TIME_THU' value='$outfwsettings{'TIME_THU'}' />
+							<input type='hidden' name='TIME_FRI' value='$outfwsettings{'TIME_FRI'}' />
+							<input type='hidden' name='TIME_SAT' value='$outfwsettings{'TIME_SAT'}' />
+							<input type='hidden' name='TIME_SUN' value='$outfwsettings{'TIME_SUN'}' />
+							<input type='hidden' name='TIME_FROM' value='$outfwsettings{'TIME_FROM'}' />
+							<input type='hidden' name='TIME_TO' value='$outfwsettings{'TIME_TO'}' />
 							<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>
@@ -317,20 +465,63 @@ END
 						unless ($outfwsettings{'SIP'}) { $outfwsettings{'DISPLAY_SIP'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SIP'} = $outfwsettings{'SIP'}; }
 						unless ($outfwsettings{'SMAC'}) { $outfwsettings{'DISPLAY_SMAC'} = 'ALL'; } else { $outfwsettings{'DISPLAY_SMAC'} = $outfwsettings{'SMAC'}; }
 						print <<END
-						<tr><td width='14%' align='right'>Quell-IP-Adresse: 
+						<tr><td width='14%' align='right'>$Lang::tr{'source ip or net'}:
 						    <td width='14%' align='left'>$outfwsettings{'DISPLAY_SIP'}
-						    <td width='14%' align='right'>Quell-MAC-Adresse:
-						    <td width='14%' align='left'>$outfwsettings{'DISPLAY_SMAC'}
 						    <td width='44%' colspan='2' align='center'>
 END
 ;
 					}
-					print <<END
+						print <<END
+						<tr><td width='14%' align='right'>$Lang::tr{'time'} -  </td>
+						    <td width='14%' align='left'>
+END
+;
+							if ($outfwsettings{'TIME_MON'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy monday'}</font>,"; 
+							if ($outfwsettings{'TIME_TUE'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy tuesday'}</font>,"; 
+							if ($outfwsettings{'TIME_WED'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy wednesday'}</font>,"; 
+							if ($outfwsettings{'TIME_THU'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy thursday'}</font>,"; 
+							if ($outfwsettings{'TIME_FRI'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy friday'}</font>,"; 
+							if ($outfwsettings{'TIME_SAT'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy saturday'}</font>,"; 
+							if ($outfwsettings{'TIME_SUN'} eq 'on') { print "<font color='$Header::colourgreen'>";}
+							else { print "<font color='$Header::colourred'>";}
+								print "$Lang::tr{'advproxy sunday'}</font>";		
+							print <<END
+							</td>
+						    <td width='22%' align='center'>$Lang::tr{'advproxy from'} $outfwsettings{'TIME_FROM'}</td>
+							<td width='22%' align='center'>$Lang::tr{'advproxy to'} $outfwsettings{'TIME_TO'}</td>
 					</form>
 END
 ;
 				}
 			}
+if ($outfwsettings{'POLICY'} eq 'MODE1'){
+print <<END
+					<tr bgcolor='$color{'color20'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+					    <td align='center'>all
+					    <td align='center'>all
+					    <td align='center'>ALL
+					    <td align='center'>drop
+					    <td align='center'><img src='/images/stock_stop.png' alt='DENY' />
+					    <td align='center'>on <input type='radio' name='MODE1LOG' value='on' $checked{'MODE1LOG'}{'on'} /><input type='radio' name='MODE1LOG' value='off' $checked{'MODE1LOG'}{'off'} /> off
+					    <td align='center'><input type='hidden' name='ACTION' value=$Lang::tr{'save'} /><input type='image' src='/images/media-floppy.png' width="18" height="18" alt=$Lang::tr{'save'} /></form></tr>
+					     <table border='0' cellpadding='0' cellspacing='0'><tr>
+						<td>
+						<td></table>
+END
+;
+}
 		print <<END
 		</table>
 END
@@ -347,8 +538,8 @@ if ($outfwsettings{'POLICY'} ne 'MODE0'){
 	&Header::openbox('100%', 'center', 'P2P-Block');
 	print <<END
 	<table width='40%'>
-		<tr bgcolor='$color{'color22'}'><td width='66%' align=center><b>Protokoll</b>
-		    <td width='33%' align=center><b>Status</b>
+		<tr bgcolor='$color{'color22'}'><td width='66%' align=center><b>$Lang::tr{'protocol'}</b>
+		    <td width='33%' align=center><b>$Lang::tr{'status'}</b>
 END
 ;
 	my $id = 1;
@@ -368,13 +559,13 @@ 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='image' name='submit' src='/images/stock_ok.png' alt='$Lang::tr{'outgoingfw p2p allow'}' title='$Lang::tr{'outgoingfw p2p allow'}'/>
 END
 ;
 		} else {
 			print <<END
 				<input type='hidden' name='ACTION' value='enable' />
-				<input type='image' name='submit' src='/images/stock_stop.png' alt='' />
+				<input type='image' name='submit' src='/images/stock_stop.png' alt='$Lang::tr{'outgoingfw p2p deny'}' title='$Lang::tr{'outgoingfw p2p deny'}' />
 END
 ;
 		}
@@ -385,7 +576,7 @@ END
 	}
 	print <<END
 	</table>
-  <br />Klicken Sie auf die Symbole um das entsprechende iptables P2P-Blockmodul zu (de-)aktivieren.
+  <br />$Lang::tr{'outgoingfw p2p description 1'} <img src='/images/stock_ok.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 2'} <img src='/images/stock_stop.png' align='absmiddle' alt='$Lang::tr{'outgoingfw p2p deny'}'> $Lang::tr{'outgoingfw p2p description 3'}
 END
 ;
 	&Header::closebox();
@@ -395,18 +586,18 @@ 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.</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 width='10%' align='left'><b>$Lang::tr{'mode'} 0:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode0'}</td></tr>
+		<tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 1:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode1'}</td></tr>
+		<tr><td width='10%' align='left'><b>$Lang::tr{'mode'} 2:</b><td width='90%' align='left' colspan='2'>$Lang::tr{'outgoingfw mode2'}</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>
+		<tr><td width='10%' align='left'>	<select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>$Lang::tr{'mode'} 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'mode'} 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'mode'} 2</option></select>
 		    <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
 		    <td width='45%' align='left'>
 END
 ;
 	if ($outfwsettings{'POLICY'} ne 'MODE0') {
 		print <<END
-		    Alle Regeln loeschen: <input type='submit' name='ACTION' value=$Lang::tr{'reset'} />
+		    $Lang::tr{'outgoingfw reset'}: <input type='submit' name='ACTION' value=$Lang::tr{'reset'} />
 END
 ;
 	}
@@ -417,63 +608,157 @@ END
 ;
 &Header::closebox();
 
-&Header::closebigbox();
-&Header::closepage();
-
 ############################################################################################################################
 ############################################################################################################################
 
 sub addrule
 {
-	&Header::openbox('100%', 'center', 'Rules hinzufuegen');
+	&Header::openbox('100%', 'center', $Lang::tr{'Add Rule'});
 	if ($outfwsettings{'EDIT'} eq 'no') { $selected{'ENABLED'} = 'checked'; }
-	print <<END
+	$selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'";
+	$selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'";
+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'}' />
-		    <td width='20%' align='right'>Aktiviert:
-		    <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:
-		    <td width='30%' align='left'>
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'description'}: <img src='/blob.gif' /></td>
+			<td width='30%' align='left'><input type='text' name='NAME' maxlength='30' value='$outfwsettings{'NAME'}' /></td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'active'}:</td>
+			<td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} /></td>
+		</tr>
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'protocol'}:</td>
+			<td width='30%' align='left'>
+				<select name='PROT'>
+					<option value='all' $selected{'PROT'}{'all'}>All</option>
+					<option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option>
+					<option value='udp' $selected{'PROT'}{'udp'}>UDP</option>
+					<option value='gre' $selected{'PROT'}{'gre'}>GRE</option>
+					<option value='esp' $selected{'PROT'}{'esp'}>ESP</option>
+				</select>
+			</td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}:</td>
+			<td width='30%' align='left' colspan='2'>
 END
 ;
 	if ($outfwsettings{'POLICY'} eq 'MODE1'){
-		print "\t\t\tALLOW<input type='hidden' name='STATE' value='ALLOW' />\n";
+		print "\t\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\t\tDENY<input type='hidden' name='STATE' value='DENY' />\n";
 	}
 	print <<END
-		<tr><td width='20%' align='right'>Quellnetz:
-		    <td width='30%' align='left'><select name='SNET'>
-			<option value='all' $selected{'SNET'}{'ALL'}>alle</option>
-			<option value='ip' $selected{'SNET'}{'ip'}>Quell-IP/MAC benutzen</option>
-			<option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
+			</td>
+		</tr>
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'source'}:</td>
+			<td width='30%' align='left'>
+				<select name='SNET'>
+					<optgroup label='---'>
+						<option value='all' $selected{'SNET'}{'ALL'}>$Lang::tr{'all'}</option>
+					<optgroup label='$Lang::tr{'ip address'}'>
+						<option value='ip' $selected{'SNET'}{'ip'}>$Lang::tr{'source ip or net'}</option>
+						<option value='red' $selected{'SNET'}{'red'}>$Lang::tr{'red'} IP</option>
+					</optgroup>
+					<optgroup label='$Lang::tr{'alt vpn'}'>
+						<option value='ovpn' $selected{'SNET'}{'ovpn'}>OpenVPN $Lang::tr{'interface'}</option>
+					</optgroup>
+					<optgroup label='$Lang::tr{'network'}'>
+						<option value='green' $selected{'SNET'}{'green'}>$Lang::tr{'green'}</option>
 END
 ;
 	if (&Header::blue_used()){
-		print "\t\t\t<option value='blue' $selected{'SNET'}{'blue'}>$Lang::tr{'wireless'}</option>\n";
+		print "\t\t\t\t\t<option value='blue' $selected{'SNET'}{'blue'}>$Lang::tr{'wireless'}</option>\n";
 	}
 	if (&Header::orange_used()){
-		print "\t\t\t<option value='orange' $selected{'SNET'}{'orange'}>$Lang::tr{'dmz'}</option>\n";
+		print "\t\t\t\t\t<option value='orange' $selected{'SNET'}{'orange'}>$Lang::tr{'dmz'}</option>\n";
 	}
 	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='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'} />
+					</optgroup>
+					<optgroup label='$Lang::tr{'advproxy NCSA group'}'>
+END
+;
+	my @ipgroups = qx(ls $configpath/ipgroups/);
+	foreach (sort @ipgroups){
+		print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{'$_'}>$_</option>\n";
+	}
+	print <<END
+					</optgroup>
+				</select>
+			</td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'source ip or net'}<img src='/blob.gif' /></td>
+			<td width='30%' align='left' colspan='2'><input type='text' name='SIP' value='$outfwsettings{'SIP'}' /></td>
+		</tr>
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'logging'}:</td>
+			<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' colspan='2' />
+			<td width='30%' align='left' colspan='2' />
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'destination ip or net'}: <img src='/blob.gif' /></td>
+			<td width='30%' align='left'><input type='text' name='DIP'  value='$outfwsettings{'DIP'}' /></td>
+			<td width='20%' align='right' colspan='2'>$Lang::tr{'destination port'}(s) <img src='/blob.gif' /></td>
+			<td width='30%' align='left' colspan='2'><input type='text' name='DPORT' value='$outfwsettings{'DPORT'}' /></td>
+		</tr>
+		<tr>
+			<td width='20%' align='right'>$Lang::tr{'time'}:</td>
+			<td width='30%' align='left'>$Lang::tr{'advproxy monday'} $Lang::tr{'advproxy tuesday'} $Lang::tr{'advproxy wednesday'} $Lang::tr{'advproxy thursday'} $Lang::tr{'advproxy friday'} $Lang::tr{'advproxy saturday'} $Lang::tr{'advproxy sunday'}</td>
+			<td width='20%' align='right' colspan='2' />
+			<td width='15%' align='left'>$Lang::tr{'advproxy from'}</td>
+			<td width='15%' align='left'>$Lang::tr{'advproxy to'}</td>
+		</tr>
+		<tr>
+			<td width='20%' align='right'></td>
+			<td width='30%' align='left'>
+				<input type='checkbox' name='TIME_MON' $checked{'TIME_MON'}{'on'} />
+				<input type='checkbox' name='TIME_TUE' $checked{'TIME_TUE'}{'on'} />
+				<input type='checkbox' name='TIME_WED' $checked{'TIME_WED'}{'on'} />
+				<input type='checkbox' name='TIME_THU' $checked{'TIME_THU'}{'on'} />
+				<input type='checkbox' name='TIME_FRI' $checked{'TIME_FRI'}{'on'} />
+				<input type='checkbox' name='TIME_SAT' $checked{'TIME_SAT'}{'on'} />
+				<input type='checkbox' name='TIME_SUN' $checked{'TIME_SUN'}{'on'} />
+			</td>
+			<td width='20%' align='right' colspan='2' />
+			<td width='15%' align='left'>
+				<select name='TIME_FROM'>
+END
+;
+for (my $i=0;$i<=23;$i++) {
+	$i = sprintf("%02s",$i);
+	for (my $j=0;$j<=45;$j+=15) {
+		$j = sprintf("%02s",$j);
+		my $time = $i.":".$j;
+		print "\t\t\t\t\t<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n";
+	}
+}
+print <<END	
+				</select>
+			</td>
+			<td width='15%' align='left'><select name='TIME_TO'>
+END
+;
+for (my $i=0;$i<=23;$i++) {
+	$i = sprintf("%02s",$i);
+	for (my $j=0;$j<=45;$j+=15) {
+		$j = sprintf("%02s",$j);
+		my $time = $i.":".$j;
+		print "\t\t\t\t\t<option $selected{'TIME_TO'}{$time}>$i:$j</option>\n";
+	}
+}
+print <<END	
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td colspan='6' />
+		<tr>
+		<tr>
+			<td width='40%' align='right' colspan='2'><img src='/blob.gif' />$Lang::tr{'this field may be blank'}</td>
+			<td width='60%' align='left' colspan='4'><input type='submit' name='ACTION' value=$Lang::tr{'add'} /></td>
 	</table></form>
 END
 ;
@@ -487,7 +772,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><b>$Lang::tr{'logging'}</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><b>$Lang::tr{'action'}</b></td></tr>";
 foreach my $serviceline(@defservices)
 	{
 	my @service = split(/,/,$serviceline);
@@ -521,3 +806,6 @@ END
 	&Header::closebox();
   }
 }
+
+&Header::closebigbox();
+&Header::closepage();
\ No newline at end of file