X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fforwardfw.cgi;h=4a49f2ed9e0b12d3a1eb38e19e32ce3fbf677e45;hp=e074047b3c0f3c2fc8e489aa7a8f66684eabbb45;hb=7326051edb1ebec404e0b81bd85292285d7a5b6b;hpb=931e1fed53d8b5b74dbf2c2bedafc0399cccc7fe

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index e074047b3..4a49f2ed9 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -31,6 +31,7 @@
 ###############################################################################
 
 use strict;
+use Sort::Naturally;
 no warnings 'uninitialized';
 # enable only the following on debugging purpose
 #use warnings;
@@ -46,8 +47,6 @@ unless (-e "${General::swroot}/forward/settings")   { system("touch ${General::s
 unless (-e "${General::swroot}/forward/config")  	{ system("touch ${General::swroot}/forward/config"); }
 unless (-e "${General::swroot}/forward/input")  	{ system("touch ${General::swroot}/forward/input"); }
 unless (-e "${General::swroot}/forward/outgoing")  	{ system("touch ${General::swroot}/forward/outgoing"); }
-unless (-e "${General::swroot}/forward/dmz")  	{ system("touch ${General::swroot}/forward/dmz"); }
-unless (-e "${General::swroot}/forward/nat")  	{ system("touch ${General::swroot}/forward/nat"); }
 
 my %fwdfwsettings=();
 my %selected=() ;
@@ -64,8 +63,6 @@ my %ccdhost=();
 my %configfwdfw=();
 my %configinputfw=();
 my %configoutgoingfw=();
-my %configdmzfw=();
-my %confignatfw=();
 my %ipsecconf=();
 my %color=();
 my %mainsettings=();
@@ -77,7 +74,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.5';
+my $VERSION='0.9.9.10';
 my $color;
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
@@ -91,8 +88,6 @@ my $configipsecrw	= "${General::swroot}/vpn/settings";
 my $configfwdfw		= "${General::swroot}/forward/config";
 my $configinput		= "${General::swroot}/forward/input";
 my $configoutgoing	= "${General::swroot}/forward/outgoing";
-my $configdmz		= "${General::swroot}/forward/dmz";
-my $confignat		= "${General::swroot}/forward/nat";
 my $configovpn		= "${General::swroot}/ovpn/settings";
 my $fwoptions 		= "${General::swroot}/optionsfw/settings";
 my $ifacesettings	= "${General::swroot}/ethernet/settings";
@@ -116,22 +111,11 @@ my @protocols;
 &Header::openbigbox('100%', 'center',$errormessage);
 ####  ACTION  #####
 
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'save'})
-{
-	my $MODE = $fwdfwsettings{'POLICY'};
-	my $MODE1 = $fwdfwsettings{'POLICY1'};
-	%fwdfwsettings = ();
-	$fwdfwsettings{'POLICY'} = "$MODE";
-	$fwdfwsettings{'POLICY1'} = "$MODE1";
-	&General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-	&reread_rules;
-}
 if ($fwdfwsettings{'ACTION'} eq 'saverule')
 {
 	&General::readhasharray("$configfwdfw", \%configfwdfw);
 	&General::readhasharray("$configinput", \%configinputfw);
 	&General::readhasharray("$configoutgoing", \%configoutgoingfw);
-	&General::readhasharray("$confignat", \%confignatfw);
 	$errormessage=&checksource;
 	if(!$errormessage){&checktarget;}
 	if(!$errormessage){&checkrule;}
@@ -148,132 +132,19 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		$errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>";
 	}
 	#check if we try to break rules
-	if(	$fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire' && $fwdfwsettings{'grp2'} eq 'ipfire'){
-		$errormessage.=$Lang::tr{'fwdfw err same'};
+	if(	$fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
+		$errormessage=$Lang::tr{'fwdfw err same'};
 	}
-	#NAT-Part
-	if ($fwdfwsettings{'USE_NAT'} eq 'ON'){
-		$fwdfwsettings{'config'}=$confignat;
-		if ($fwdfwsettings{'nat'} eq 'dnat'){
-			$fwdfwsettings{'chain'} = 'NAT_DESTINATION';
-		}else{
-			$fwdfwsettings{'chain'} = 'NAT_SOURCE';
-		}
-		my $maxkey=&General::findhasharraykey(\%confignatfw);
-		#check if we have an identical rule already
-		if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
-			foreach my $key (sort keys %confignatfw){
-				if ("$confignatfw{$key}[0],$confignatfw{$key}[1],$confignatfw{$key}[2],$confignatfw{$key}[3],$confignatfw{$key}[4],$confignatfw{$key}[5],$confignatfw{$key}[6],$confignatfw{$key}[11],$confignatfw{$key}[12],$confignatfw{$key}[14],$confignatfw{$key}[15],$confignatfw{$key}[28],$confignatfw{$key}[29],$confignatfw{$key}[30],$confignatfw{$key}[31]"
-				eq "$fwdfwsettings{'RULE_ACTION'},NAT_DESTINATION,$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"){
-					$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
-					if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' ){
-						$errormessage='';
-					}elsif($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
-						$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
-					}
-					if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
-						$fwdfwsettings{'nosave'} = 'on';
-					}
-				}
-			}
-		}
-		
-		#check Rulepos on new Rule
-		if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
-			$fwdfwsettings{'oldrulenumber'}=$maxkey;
-			foreach my $key (sort keys %confignatfw){
-				#print"$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'snatport'},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}<br>";
-				#print"$confignatfw{$key}[0],$confignatfw{$key}[2],$confignatfw{$key}[3],$confignatfw{$key}[4],$confignatfw{$key}[5],$confignatfw{$key}[6],$confignatfw{$key}[7],$confignatfw{$key}[8],$confignatfw{$key}[9],$confignatfw{$key}[10],$confignatfw{$key}[11],$confignatfw{$key}[12],$confignatfw{$key}[13],$confignatfw{$key}[14],$confignatfw{$key}[15],$confignatfw{$key}[17],$confignatfw{$key}[19],$confignatfw{$key}[20],$confignatfw{$key}[21],$confignatfw{$key}[22],$confignatfw{$key}[23],$confignatfw{$key}[24],$confignatfw{$key}[25],$confignatfw{$key}[26],$confignatfw{$key}[27],$confignatfw{$key}[28],$confignatfw{$key}[29],$confignatfw{$key}[30],$confignatfw{$key}[31],$confignatfw{$key}[32]<br>";
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'snatport'},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"
-					eq "$confignatfw{$key}[0],$confignatfw{$key}[2],$confignatfw{$key}[3],$confignatfw{$key}[4],$confignatfw{$key}[5],$confignatfw{$key}[6],$confignatfw{$key}[7],$confignatfw{$key}[8],$confignatfw{$key}[9],$confignatfw{$key}[10],$confignatfw{$key}[11],$confignatfw{$key}[12],$confignatfw{$key}[13],$confignatfw{$key}[14],$confignatfw{$key}[15],$confignatfw{$key}[17],$confignatfw{$key}[19],$confignatfw{$key}[20],$confignatfw{$key}[21],$confignatfw{$key}[22],$confignatfw{$key}[23],$confignatfw{$key}[24],$confignatfw{$key}[25],$confignatfw{$key}[26],$confignatfw{$key}[27],$confignatfw{$key}[28],$confignatfw{$key}[29],$confignatfw{$key}[30],$confignatfw{$key}[31],$confignatfw{$key}[32]"){
-						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
-				}
-			}
-		}
-		#check if we just close a rule
-		if( $fwdfwsettings{'oldgrp1a'} eq  $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq  $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} &&  $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq  $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}) {
-			if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
-				$errormessage='';
-				$fwdfwsettings{'nosave2'} = 'on';
-			}
-		}
-		&checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
-		if ($fwdfwsettings{'nobase'} ne 'on'){
-			&checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
-		}
-		if($fwdfwsettings{'oldusesrv'} eq '' &&  $fwdfwsettings{'USESRV'} eq 'ON'){
-			&checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
-		}elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
-			&checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
-		}elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
-			&checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
-		}
-		if($fwdfwsettings{'nosave2'} ne 'on'){
-			&saverule(\%confignatfw,$confignat);
-		}	
-	#DMZ-Part
-	}elsif ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on'){
-		$fwdfwsettings{'config'}=$configdmz;
-		$fwdfwsettings{'chain'} = 'FORWARDFW';
-		my $maxkey=&General::findhasharraykey(\%configdmzfw);
-		#check if we have an identical rule already
-		if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
-			foreach my $key (sort keys %configdmzfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configdmzfw{$key}[0],$configdmzfw{$key}[2],$configdmzfw{$key}[3],$configdmzfw{$key}[4],$configdmzfw{$key}[5],$configdmzfw{$key}[6],$configdmzfw{$key}[7],$configdmzfw{$key}[8],$configdmzfw{$key}[9],$configdmzfw{$key}[10],$configdmzfw{$key}[11],$configdmzfw{$key}[12],$configdmzfw{$key}[13],$configdmzfw{$key}[14],$configdmzfw{$key}[15],$configdmzfw{$key}[17],$configdmzfw{$key}[18],$configdmzfw{$key}[19],$configdmzfw{$key}[20],$configdmzfw{$key}[21],$configdmzfw{$key}[22],$configdmzfw{$key}[23],$configdmzfw{$key}[24],$configdmzfw{$key}[25],$configdmzfw{$key}[26],$configdmzfw{$key}[27]"){
-						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
-						if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' ){
-							$errormessage='';
-						}elsif($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
-							$errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
-						}
-						if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
-							$fwdfwsettings{'nosave'} = 'on';
-						}
-				}
-			}
-		}
-		#check Rulepos on new Rule
-		if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
-			$fwdfwsettings{'oldrulenumber'}=$maxkey;
-			foreach my $key (sort keys %configdmzfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configdmzfw{$key}[0],$configdmzfw{$key}[2],$configdmzfw{$key}[3],$configdmzfw{$key}[4],$configdmzfw{$key}[5],$configdmzfw{$key}[6],$configdmzfw{$key}[7],$configdmzfw{$key}[8],$configdmzfw{$key}[9],$configdmzfw{$key}[10],$configdmzfw{$key}[11],$configdmzfw{$key}[12],$configdmzfw{$key}[13],$configdmzfw{$key}[14],$configdmzfw{$key}[15],$configdmzfw{$key}[17],$configdmzfw{$key}[18],$configdmzfw{$key}[19],$configdmzfw{$key}[20],$configdmzfw{$key}[21],$configdmzfw{$key}[22],$configdmzfw{$key}[23],$configdmzfw{$key}[24],$configdmzfw{$key}[25],$configdmzfw{$key}[26],$configdmzfw{$key}[27]"){
-						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
-				}
-			}
-		}
-		#check if we just close a rule
-		if( $fwdfwsettings{'oldgrp1a'} eq  $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq  $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} &&  $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq  $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}) {
-			if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
-				$errormessage='';
-				$fwdfwsettings{'nosave2'} = 'on';
-			}
-		}
-		&checkcounter($fwdfwsettings{'oldgrp1a'},$fwdfwsettings{'oldgrp1b'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}});
-		if ($fwdfwsettings{'nobase'} ne 'on'){
-			&checkcounter($fwdfwsettings{'oldgrp2a'},$fwdfwsettings{'oldgrp2b'},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}});
-		}
-		if($fwdfwsettings{'oldusesrv'} eq '' &&  $fwdfwsettings{'USESRV'} eq 'ON'){
-			&checkcounter(0,0,$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
-		}elsif ($fwdfwsettings{'USESRV'} eq '' && $fwdfwsettings{'oldusesrv'} eq 'ON') {
-			&checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},0,0);
-		}elsif ($fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldgrp3b'} ne $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'updatefwrule'} eq 'on'){
-			&checkcounter($fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}});
-		}
-		if($fwdfwsettings{'nosave2'} ne 'on'){
-			&saverule(\%configdmzfw,$configdmz);
-		}
 	#INPUT part
-	}elsif($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
+	if($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
 		$fwdfwsettings{'config'}=$configinput;
 		$fwdfwsettings{'chain'} = 'INPUTFW';
 		my $maxkey=&General::findhasharraykey(\%configinputfw);
 		#check if we have an identical rule already
 		if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
 			foreach my $key (sort keys %configinputfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}" 
-					eq "$configinputfw{$key}[0],$configinputfw{$key}[2],$configinputfw{$key}[3],$configinputfw{$key}[4],$configinputfw{$key}[5],$configinputfw{$key}[6],$configinputfw{$key}[7],$configinputfw{$key}[8],$configinputfw{$key}[9],$configinputfw{$key}[10],$configinputfw{$key}[11],$configinputfw{$key}[12],$configinputfw{$key}[13],$configinputfw{$key}[14],$configinputfw{$key}[15],$configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],$configinputfw{$key}[20],$configinputfw{$key}[21],$configinputfw{$key}[22],$configinputfw{$key}[23],$configinputfw{$key}[24],$configinputfw{$key}[25],$configinputfw{$key}[26],$configinputfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'}, $fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'}, $fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'}, $fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},  $fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},   $fwdfwsettings{'TIME'},  $fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"
+					eq "$configinputfw{$key}[0],      $configinputfw{$key}[2], $configinputfw{$key}[3],$configinputfw{$key}[4],               $configinputfw{$key}[5],$configinputfw{$key}[6],               $configinputfw{$key}[7],       $configinputfw{$key}[8],$configinputfw{$key}[9],     $configinputfw{$key}[10],  $configinputfw{$key}[11],$configinputfw{$key}[12],  $configinputfw{$key}[13],  $configinputfw{$key}[14],$configinputfw{$key}[15],              $configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],  $configinputfw{$key}[20],  $configinputfw{$key}[21],  $configinputfw{$key}[22],  $configinputfw{$key}[23],  $configinputfw{$key}[24],  $configinputfw{$key}[25],  $configinputfw{$key}[26],   $configinputfw{$key}[27], $configinputfw{$key}[28], $configinputfw{$key}[29],             $configinputfw{$key}[30],  $configinputfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 						if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
 							$errormessage='';
@@ -290,8 +161,8 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
 			$fwdfwsettings{'oldrulenumber'}=$maxkey;
 			foreach my $key (sort keys %configinputfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}" 
-					eq "$configinputfw{$key}[0],$configinputfw{$key}[2],$configinputfw{$key}[3],$configinputfw{$key}[4],$configinputfw{$key}[5],$configinputfw{$key}[6],$configinputfw{$key}[7],$configinputfw{$key}[8],$configinputfw{$key}[9],$configinputfw{$key}[10],$configinputfw{$key}[11],$configinputfw{$key}[12],$configinputfw{$key}[13],$configinputfw{$key}[14],$configinputfw{$key}[15],$configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],$configinputfw{$key}[20],$configinputfw{$key}[21],$configinputfw{$key}[22],$configinputfw{$key}[23],$configinputfw{$key}[24],$configinputfw{$key}[25],$configinputfw{$key}[26],$configinputfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'}, $fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'}, $fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'}, $fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},  $fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},   $fwdfwsettings{'TIME'},  $fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"
+					eq "$configinputfw{$key}[0],      $configinputfw{$key}[2], $configinputfw{$key}[3],$configinputfw{$key}[4],               $configinputfw{$key}[5],$configinputfw{$key}[6],               $configinputfw{$key}[7],       $configinputfw{$key}[8],$configinputfw{$key}[9],     $configinputfw{$key}[10],  $configinputfw{$key}[11],$configinputfw{$key}[12],  $configinputfw{$key}[13],  $configinputfw{$key}[14],$configinputfw{$key}[15],              $configinputfw{$key}[17],$configinputfw{$key}[18],$configinputfw{$key}[19],  $configinputfw{$key}[20],  $configinputfw{$key}[21],  $configinputfw{$key}[22],  $configinputfw{$key}[23],  $configinputfw{$key}[24],  $configinputfw{$key}[25],  $configinputfw{$key}[26],   $configinputfw{$key}[27], $configinputfw{$key}[28], $configinputfw{$key}[29],             $configinputfw{$key}[30],  $configinputfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 				}
 			}
@@ -317,36 +188,15 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		if($fwdfwsettings{'nosave2'} ne 'on'){
 			&saverule(\%configinputfw,$configinput);
 		}
-		#print "Source: $fwdfwsettings{'grp1'} -> $fwdfwsettings{$fwdfwsettings{'grp1'}}<br>";
-		#print "Sourceport: $fwdfwsettings{'USE_SRC_PORT'}, $fwdfwsettings{'PROT'}, $fwdfwsettings{'ICMP_TYPES'}, $fwdfwsettings{'SRC_PORT'}<br>";
-		#print "Target: $fwdfwsettings{'grp2'} -> $fwdfwsettings{$fwdfwsettings{'grp2'}}<br>";
-		#print "Dienst:  $fwdfwsettings{'USESRV'}, $fwdfwsettings{'grp3'} -> $fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-		#print "BEMERKUNG: $fwdfwsettings{'ruleremark'}<br>";
-		#print " Regel AKTIV: $fwdfwsettings{'ACTIVE'}<br>";
-		#print " Regel LOG: $fwdfwsettings{'LOG'}<br>";
-		#print " ZEITRAHMEN: $fwdfwsettings{'TIME'}<br>";
-		#print " MO: $fwdfwsettings{'TIME_MON'}<br>";
-		#print " DI: $fwdfwsettings{'TIME_TUE'}<br>";
-		#print " MI: $fwdfwsettings{'TIME_WED'}<br>";
-		#print " DO: $fwdfwsettings{'TIME_THU'}<br>";
-		#print " FR: $fwdfwsettings{'TIME_FRI'}<br>";
-		#print " SA: $fwdfwsettings{'TIME_SAT'}<br>";
-		#print " SO: $fwdfwsettings{'TIME_SUN'}<br>";
-		#print " VON: $fwdfwsettings{'TIME_FROM'} bis $fwdfwsettings{'TIME_TO'}<br>";
-		#print "<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp1a'} $fwdfwsettings{'oldgrp1b'}	NEU:	$fwdfwsettings{'grp1'} $fwdfwsettings{$fwdfwsettings{'grp1'}}<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp2a'} $fwdfwsettings{'oldgrp2b'}	NEU:	$fwdfwsettings{'grp2'} $fwdfwsettings{$fwdfwsettings{'grp2'}}<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp3a'} $fwdfwsettings{'oldgrp3b'}	NEU:	$fwdfwsettings{'grp3'} $fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-		#print"DIENSTE Checkalt:$fwdfwsettings{'oldusesrv'}  DIENSTE Checkneu:$fwdfwsettings{'USESRV'}    DIENST ALT:$fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'}   DIENST NEU:$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-	}elsif($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire' ){
-		# OUTGOING PART
+	}elsif($fwdfwsettings{'grp1'} eq 'ipfire_src' ){
+	# OUTGOING PART
 		$fwdfwsettings{'config'}=$configoutgoing;
 		$fwdfwsettings{'chain'} = 'OUTGOINGFW';
 		my $maxkey=&General::findhasharraykey(\%configoutgoingfw);
 		if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
 			foreach my $key (sort keys %configoutgoingfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},  $fwdfwsettings{'grp1'},    $fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},    $fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},    $fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'}, $fwdfwsettings{'USESRV'},   $fwdfwsettings{'TGT_PROT'}, $fwdfwsettings{'ICMP_TGT'}, $fwdfwsettings{'grp3'},     $fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},      $fwdfwsettings{'TIME'},     $fwdfwsettings{'TIME_MON'}, $fwdfwsettings{'TIME_TUE'}, $fwdfwsettings{'TIME_WED'}, $fwdfwsettings{'TIME_THU'}, $fwdfwsettings{'TIME_FRI'}, $fwdfwsettings{'TIME_SAT'}, $fwdfwsettings{'TIME_SUN'}, $fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},  $fwdfwsettings{'USE_NAT'},  $fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'}, $fwdfwsettings{'nat'}"
+					eq "$configoutgoingfw{$key}[0],   $configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],            $configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],            $configoutgoingfw{$key}[7],    $configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],  $configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],           $configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],          $configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 						if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on'){
 							$errormessage='';
@@ -364,8 +214,8 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 			print"CHECK OUTGOING DOPPELTE REGEL<br>";
 			$fwdfwsettings{'oldrulenumber'}=$maxkey;
 			foreach my $key (sort keys %configoutgoingfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configoutgoingfw{$key}[0],$configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],$configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],$configoutgoingfw{$key}[7],$configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],$configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],$configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},  $fwdfwsettings{'grp1'},    $fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},    $fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},    $fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'}, $fwdfwsettings{'USESRV'},   $fwdfwsettings{'TGT_PROT'}, $fwdfwsettings{'ICMP_TGT'}, $fwdfwsettings{'grp3'},     $fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'LOG'},      $fwdfwsettings{'TIME'},     $fwdfwsettings{'TIME_MON'}, $fwdfwsettings{'TIME_TUE'}, $fwdfwsettings{'TIME_WED'}, $fwdfwsettings{'TIME_THU'}, $fwdfwsettings{'TIME_FRI'}, $fwdfwsettings{'TIME_SAT'}, $fwdfwsettings{'TIME_SUN'}, $fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},  $fwdfwsettings{'USE_NAT'},  $fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'}, $fwdfwsettings{'nat'}"
+					eq "$configoutgoingfw{$key}[0],   $configoutgoingfw{$key}[2],$configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],            $configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],            $configoutgoingfw{$key}[7],    $configoutgoingfw{$key}[8],$configoutgoingfw{$key}[9],  $configoutgoingfw{$key}[10],$configoutgoingfw{$key}[11],$configoutgoingfw{$key}[12],$configoutgoingfw{$key}[13],$configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],           $configoutgoingfw{$key}[17],$configoutgoingfw{$key}[18],$configoutgoingfw{$key}[19],$configoutgoingfw{$key}[20],$configoutgoingfw{$key}[21],$configoutgoingfw{$key}[22],$configoutgoingfw{$key}[23],$configoutgoingfw{$key}[24],$configoutgoingfw{$key}[25],$configoutgoingfw{$key}[26],$configoutgoingfw{$key}[27],$configoutgoingfw{$key}[28],$configoutgoingfw{$key}[29],          $configoutgoingfw{$key}[30],$configoutgoingfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 				}
 			}
@@ -401,8 +251,8 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		if($fwdfwsettings{'oldrulenumber'} eq $fwdfwsettings{'rulepos'}){
 			#check if we have an identical rule already
 			foreach my $key (sort keys %configfwdfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[17],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"
+					eq "$configfwdfw{$key}[0],        $configfwdfw{$key}[2],   $configfwdfw{$key}[3], $configfwdfw{$key}[4],                 $configfwdfw{$key}[5], $configfwdfw{$key}[6],                 $configfwdfw{$key}[7],         $configfwdfw{$key}[8], $configfwdfw{$key}[9],       $configfwdfw{$key}[10],    $configfwdfw{$key}[11],  $configfwdfw{$key}[12],    $configfwdfw{$key}[13],    $configfwdfw{$key}[14],$configfwdfw{$key}[15],                $configfwdfw{$key}[18],$configfwdfw{$key}[19],    $configfwdfw{$key}[20],    $configfwdfw{$key}[21],    $configfwdfw{$key}[22],    $configfwdfw{$key}[23],    $configfwdfw{$key}[24],    $configfwdfw{$key}[25],    $configfwdfw{$key}[26],     $configfwdfw{$key}[27],   $configfwdfw{$key}[28],   $configfwdfw{$key}[29],               $configfwdfw{$key}[30],    $configfwdfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 						if ($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' ){
 							$errormessage='';
@@ -419,14 +269,14 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
 			$fwdfwsettings{'oldrulenumber'}=$maxkey;
 			foreach my $key (sort keys %configfwdfw){
-				if ("$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'}"
-					eq "$configfwdfw{$key}[0],$configfwdfw{$key}[2],$configfwdfw{$key}[3],$configfwdfw{$key}[4],$configfwdfw{$key}[5],$configfwdfw{$key}[6],$configfwdfw{$key}[7],$configfwdfw{$key}[8],$configfwdfw{$key}[9],$configfwdfw{$key}[10],$configfwdfw{$key}[11],$configfwdfw{$key}[12],$configfwdfw{$key}[13],$configfwdfw{$key}[14],$configfwdfw{$key}[15],$configfwdfw{$key}[17],$configfwdfw{$key}[19],$configfwdfw{$key}[20],$configfwdfw{$key}[21],$configfwdfw{$key}[22],$configfwdfw{$key}[23],$configfwdfw{$key}[24],$configfwdfw{$key}[25],$configfwdfw{$key}[26],$configfwdfw{$key}[27]"){
+				if (   "$fwdfwsettings{'RULE_ACTION'},$fwdfwsettings{'ACTIVE'},$fwdfwsettings{'grp1'},$fwdfwsettings{$fwdfwsettings{'grp1'}},$fwdfwsettings{'grp2'},$fwdfwsettings{$fwdfwsettings{'grp2'}},$fwdfwsettings{'USE_SRC_PORT'},$fwdfwsettings{'PROT'},$fwdfwsettings{'ICMP_TYPES'},$fwdfwsettings{'SRC_PORT'},$fwdfwsettings{'USESRV'},$fwdfwsettings{'TGT_PROT'},$fwdfwsettings{'ICMP_TGT'},$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}},$fwdfwsettings{'TIME'},$fwdfwsettings{'TIME_MON'},$fwdfwsettings{'TIME_TUE'},$fwdfwsettings{'TIME_WED'},$fwdfwsettings{'TIME_THU'},$fwdfwsettings{'TIME_FRI'},$fwdfwsettings{'TIME_SAT'},$fwdfwsettings{'TIME_SUN'},$fwdfwsettings{'TIME_FROM'},$fwdfwsettings{'TIME_TO'},$fwdfwsettings{'USE_NAT'},$fwdfwsettings{$fwdfwsettings{'nat'}},$fwdfwsettings{'dnatport'},$fwdfwsettings{'nat'}"
+					eq "$configfwdfw{$key}[0],        $configfwdfw{$key}[2],   $configfwdfw{$key}[3], $configfwdfw{$key}[4],                 $configfwdfw{$key}[5], $configfwdfw{$key}[6],                 $configfwdfw{$key}[7],         $configfwdfw{$key}[8], $configfwdfw{$key}[9],       $configfwdfw{$key}[10],    $configfwdfw{$key}[11],  $configfwdfw{$key}[12],    $configfwdfw{$key}[13],    $configfwdfw{$key}[14],$configfwdfw{$key}[15],                $configfwdfw{$key}[18],$configfwdfw{$key}[19],    $configfwdfw{$key}[20],    $configfwdfw{$key}[21],    $configfwdfw{$key}[22],    $configfwdfw{$key}[23],    $configfwdfw{$key}[24],    $configfwdfw{$key}[25],    $configfwdfw{$key}[26],     $configfwdfw{$key}[27],   $configfwdfw{$key}[28],   $configfwdfw{$key}[29],               $configfwdfw{$key}[30],    $configfwdfw{$key}[31]"){
 						$errormessage.=$Lang::tr{'fwdfw err ruleexists'};
 				}		
 			}
 		}
 		#check if we just close a rule
-		if( $fwdfwsettings{'oldgrp1a'} eq  $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq  $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} &&  $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq  $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'} ) {
+		if( $fwdfwsettings{'oldgrp1a'} eq  $fwdfwsettings{'grp1'} && $fwdfwsettings{'oldgrp1b'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'oldgrp2a'} eq  $fwdfwsettings{'grp2'} && $fwdfwsettings{'oldgrp2b'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} &&  $fwdfwsettings{'oldgrp3a'} eq $fwdfwsettings{'grp3'} && $fwdfwsettings{'oldgrp3b'} eq  $fwdfwsettings{$fwdfwsettings{'grp3'}} && $fwdfwsettings{'oldusesrv'} eq $fwdfwsettings{'USESRV'} && $fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'oldruletype'} eq $fwdfwsettings{'chain'}) {
 			if($fwdfwsettings{'nosave'} eq 'on' && $fwdfwsettings{'updatefwrule'} eq 'on'){
 				$fwdfwsettings{'nosave2'} = 'on';
 				$errormessage='';
@@ -448,27 +298,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		if ($fwdfwsettings{'nosave2'} ne 'on'){
 			&saverule(\%configfwdfw,$configfwdfw);
 		}	
-		#print "Source: $fwdfwsettings{'grp1'} -> $fwdfwsettings{$fwdfwsettings{'grp1'}}<br>";
-		#print "Sourceport: $fwdfwsettings{'USE_SRC_PORT'}, $fwdfwsettings{'PROT'}, $fwdfwsettings{'ICMP_TYPES'}, $fwdfwsettings{'SRC_PORT'}<br>";
-		#print "Target: $fwdfwsettings{'grp2'} -> $fwdfwsettings{$fwdfwsettings{'grp2'}}<br>";
-		#print "Dienst:  $fwdfwsettings{'USESRV'}, $fwdfwsettings{'grp3'} -> $fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-		#print "BEMERKUNG: $fwdfwsettings{'ruleremark'}<br>";
-		#print " Regel AKTIV: $fwdfwsettings{'ACTIVE'}<br>";
-		#print " Regel LOG: $fwdfwsettings{'LOG'}<br>";
-		#print " ZEITRAHMEN: $fwdfwsettings{'TIME'}<br>";
-		#print " MO: $fwdfwsettings{'TIME_MON'}<br>";
-		#print " DI: $fwdfwsettings{'TIME_TUE'}<br>";
-		#print " MI: $fwdfwsettings{'TIME_WED'}<br>";
-		#print " DO: $fwdfwsettings{'TIME_THU'}<br>";
-		#print " FR: $fwdfwsettings{'TIME_FRI'}<br>";
-		#print " SA: $fwdfwsettings{'TIME_SAT'}<br>";
-		#print " SO: $fwdfwsettings{'TIME_SUN'}<br>";
-		#print " VON: $fwdfwsettings{'TIME_FROM'} bis $fwdfwsettings{'TIME_TO'}<br>";
-		#print "<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp1a'} $fwdfwsettings{'oldgrp1b'}	NEU:	$fwdfwsettings{'grp1'} $fwdfwsettings{$fwdfwsettings{'grp1'}}<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp2a'} $fwdfwsettings{'oldgrp2b'}	NEU:	$fwdfwsettings{'grp2'} $fwdfwsettings{$fwdfwsettings{'grp2'}}<br>";
-		#print"ALT: $fwdfwsettings{'oldgrp3a'} $fwdfwsettings{'oldgrp3b'}	NEU:	$fwdfwsettings{'grp3'} $fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-		#print"DIENSTE Checkalt:$fwdfwsettings{'oldusesrv'}  DIENSTE Checkneu:$fwdfwsettings{'USESRV'}    DIENST ALT:$fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'}   DIENST NEU:$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
 	}
 	if ($errormessage){
 		&newrule;
@@ -479,51 +308,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		&base;
 	}
 }
-if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'reset'})
-{
-	if($fwdfwsettings{'poltype'} eq 'forward'){
-		&General::readhasharray("$configfwdfw", \%configfwdfw);
-		foreach my $key (sort keys %configfwdfw){
-			&checkcounter($configfwdfw{$key}[3],$configfwdfw{$key}[4],,);
-			&checkcounter($configfwdfw{$key}[5],$configfwdfw{$key}[6],,);
-			&checkcounter($configfwdfw{$key}[14],$configfwdfw{$key}[15],,);
-		}
-		#&General::readhasharray("$configinput", \%configinputfw);
-		#foreach my $key (sort keys %configinputfw){
-		#	&checkcounter($configinputfw{$key}[3],$configinputfw{$key}[4],,);
-		#	&checkcounter($configinputfw{$key}[5],$configinputfw{$key}[6],,);
-		#	&checkcounter($configinputfw{$key}[14],$configinputfw{$key}[15],,);
-		#}
-
-		system("rm ${General::swroot}/forward/config");
-		#system("rm ${General::swroot}/forward/input");
-		&General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-		unless (-e "${General::swroot}/forward/config")  	{ system("touch ${General::swroot}/forward/config"); }
-		#unless (-e "${General::swroot}/forward/input")  	{ system("touch ${General::swroot}/forward/input"); }
-		my $MODE1=$fwdfwsettings{'POLICY1'};
-		%fwdfwsettings = ();
-		$fwdfwsettings{'POLICY'}='MODE2';
-		$fwdfwsettings{'POLICY1'}=$MODE1;
-		&General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-		&reread_rules;
-	}else{
-		&General::readhasharray("$configoutgoing", \%configoutgoingfw);
-	foreach my $key (sort keys %configoutgoingfw){
-		&checkcounter($configoutgoingfw{$key}[3],$configoutgoingfw{$key}[4],,);
-		&checkcounter($configoutgoingfw{$key}[5],$configoutgoingfw{$key}[6],,);
-		&checkcounter($configoutgoingfw{$key}[14],$configoutgoingfw{$key}[15],,);
-	}
-	system("rm ${General::swroot}/forward/outgoing");
-	&General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-	unless (-e "${General::swroot}/forward/outgoing")  	{ system("touch ${General::swroot}/forward/outgoing"); }
-	my $MODE=$fwdfwsettings{'POLICY'};
-	%fwdfwsettings = ();
-	$fwdfwsettings{'POLICY'}=$MODE;
-	$fwdfwsettings{'POLICY1'}='MODE2';
-	&General::writehash("${General::swroot}/forward/settings", \%fwdfwsettings);
-	&reread_rules;
-	}
-}
 if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'fwdfw newrule'})
 {
 	&newrule;
@@ -581,7 +365,6 @@ if ($fwdfwsettings{'ACTION'} eq 'movedown')
 if ($fwdfwsettings{'ACTION'} eq 'copyrule')
 {
 	$fwdfwsettings{'copyfwrule'}='on';
-	#$fwdfwsettings{'updatefwrule'}='on';
 	&newrule;
 }
 if ($fwdfwsettings{'ACTION'} eq '')
@@ -593,9 +376,9 @@ sub addrule
 {
 	&error;
 	if (-f "${General::swroot}/forward/reread"){
-		print "<table border='0'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: red; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div</td></tr></table></form><hr><br>";
+		print "<table border='1' rules='groups' bgcolor='lightgreen' width='100%'><form method='post'><td><div style='font-size:11pt; font-weight: bold;vertical-align: middle; '><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw reread'}' style='font-face: Comic Sans MS; color: green; font-weight: bold; font-size: 14pt;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div</td></tr></table></form><br>";
 	}
-	&Header::openbox('100%', 'left', "");
+	&Header::openbox('100%', 'left',  $Lang::tr{'fwdfw menu'});
 	print "<form method='post'>";
 	print "<table border='0'>";
 	print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
@@ -605,44 +388,9 @@ sub addrule
 }
 sub base
 {
-	if ($fwdfwsettings{'POLICY'} eq 'MODE1'){ $selected{'POLICY'}{'MODE1'} = 'selected'; } else { $selected{'POLICY'}{'MODE1'} = ''; }
-	if ($fwdfwsettings{'POLICY'} eq 'MODE2'){ $selected{'POLICY'}{'MODE2'} = 'selected'; } else { $selected{'POLICY'}{'MODE2'} = ''; }
-	if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){ $selected{'POLICY1'}{'MODE1'} = 'selected'; } else { $selected{'POLICY1'}{'MODE1'} = ''; }
-	if ($fwdfwsettings{'POLICY1'} eq 'MODE2'){ $selected{'POLICY1'}{'MODE2'} = 'selected'; } else { $selected{'POLICY1'}{'MODE2'} = ''; }
 	&hint;
 	&addrule;
 	print "<br><br>";
-	&Header::openbox('100%', 'center', $Lang::tr{'fwdfw pol title'});
-print <<END;
-	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-	<table width='100%' border='0'>
-		<tr><td colspan='3' style='font-weight:bold;color:red;' align='left'>FORWARD </td></tr>
-		<tr><td colspan='3' align='left'>$Lang::tr{'fwdfw pol text'}</td></tr>
-		<tr><td colspan='3'><hr /></td></tr>
-		<tr><td width='15%' align='left'>	<select name='POLICY' style="width: 100px">
-		<option value='MODE1' $selected{'POLICY'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
-		<option value='MODE2' $selected{'POLICY'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
-	    <input type='submit' name='ACTION' value=$Lang::tr{'save'} /></td><td width='45%' align='right'>
-	    
-END
-	print "$Lang::tr{'outgoing firewall reset'}: <input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /><input type='hidden' name='poltype' value='forward' /></td></tr>";
-	print "</table></form>";
-	print"<br><br>";
-	print <<END;
-	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-	<table width='100%' border='0'>
-		<tr><td colspan='3' style='font-weight:bold;color:red;' align='left'>OUTGOING </td></tr>
-		<tr><td colspan='3' align='left'>$Lang::tr{'fwdfw pol text1'}</td></tr>
-		<tr><td colspan='3'><hr /></td></tr>
-		<tr><td width='15%' align='left'>	<select name='POLICY1' style="width: 100px">
-		<option value='MODE1' $selected{'POLICY1'}{'MODE1'}>$Lang::tr{'fwdfw pol block'}</option>
-		<option value='MODE2' $selected{'POLICY1'}{'MODE2'}>$Lang::tr{'fwdfw pol allow'}</option></select>
-	    <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td><td width='45%' align='right'>
-	    
-END
-	print "$Lang::tr{'outgoing firewall reset'}: <input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /><input type='hidden' name='poltype' value='outgoing' /></tr>";
-	print "</table></form>";
-	&Header::closebox();
 	print "<br><br><div align='right'><font size='1' color='grey'>Version: $VERSION</font></div>";
 }
 sub changerule
@@ -692,14 +440,7 @@ sub checksource
 				$errormessage=$Lang::tr{'fwhost err hostip'}."<br>";
 				return $errormessage;
 			}
-			#check if the ip is part of an existing openvpn client/net or ipsec network
-			#if this is the case, generate errormessage to make the user use the dropdowns instead of using manual ip's
-			if (! &checkvpn($ip)){
-				$errormessage=$Lang::tr{'fwdfw err srcovpn'};
-				return $errormessage;
-			}else{
-				$fwdfwsettings{'src_addr'}="$ip/$subnet";
-			}
+			$fwdfwsettings{'src_addr'}="$ip/$subnet";
 			if(!&General::validipandmask($fwdfwsettings{'src_addr'})){
 				$errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
 				return $errormessage;
@@ -835,14 +576,7 @@ sub checktarget
 		#check and form valid IP
 		$ip=&General::ip2dec($ip);
 		$ip=&General::dec2ip($ip);
-		#check if the ip is part of an existing openvpn client/net or ipsec network
-		#if this is the case, generate errormessage to make the user use the dropdowns instead of using manual ip's
-		if (! &checkvpn($ip)){
-			$errormessage=$Lang::tr{'fwdfw err tgtovpn'};
-			return $errormessage;
-		}else{
-			$fwdfwsettings{'tgt_addr'}="$ip/$subnet";
-		}
+		$fwdfwsettings{'tgt_addr'}="$ip/$subnet";
 		if(!&General::validipandmask($fwdfwsettings{'tgt_addr'})){
 			$errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
 			return $errormessage;
@@ -1036,7 +770,7 @@ sub checkrule
 	}
 	#check if source and target identical
 	if ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ALL'){
-		$errormessage.=$Lang::tr{'fwdfw err same'};
+		$errormessage=$Lang::tr{'fwdfw err same'};
 		return $errormessage;
 	}
 	#get source and targetip address if possible
@@ -1081,6 +815,10 @@ sub checkrule
 			}
 		}
 	}
+	if( $fwdfwsettings{'USE_SRC_PORT'} ne 'ON' && $fwdfwsettings{'USESRV'} ne 'ON'){
+		$fwdfwsettings{'PROT'}='';
+		$fwdfwsettings{'TGT_PROT'}='';
+	}
 }
 sub checkcounter
 {
@@ -1188,7 +926,6 @@ sub dec_counter
 	my %hash=%{(shift)};
 	my $val=shift;
 	my $pos;
-	#$errormessage.="ALT:config: $config , verringert wird $val <br>";
 	&General::readhasharray($config, \%hash);
 	foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) }  keys %hash){
 		if($hash{$key}[0] eq $val){
@@ -1213,7 +950,7 @@ sub fillselect
 	my %hash=%{(shift)};
 	my $val=shift;
 	my $key;
-	foreach my $key (sort { uc($hash{$a}[0]) cmp uc($hash{$b}[0]) }  keys %hash){
+	foreach my $key (sort { ncmp($hash{$a}[0],$hash{$b}[0]) }  keys %hash){
 		if($hash{$key}[0] eq $val){
 			print"<option value='$hash{$key}[0]' selected>$hash{$key}[0]</option>";
 		}else{
@@ -1244,6 +981,7 @@ sub gen_dd_block
 	$checked{'TIME_SUN'}{$fwdfwsettings{'TIME_SUN'}} 		= 'CHECKED';
 	$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 	$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
+	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
 	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
 print<<END;
 		<table width='100%' border='0'>
@@ -1254,10 +992,18 @@ END
 	foreach my $network (sort keys %defaultNetworks)
 		{
 			next if($defaultNetworks{$network}{'NAME'} eq "RED" && $srctgt eq 'src');
-			next if($defaultNetworks{$network}{'NAME'} eq "IPFire" && $srctgt eq 'tgt');
+			next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
 			print "<option value='$defaultNetworks{$network}{'NAME'}'";
 			print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $defaultNetworks{$network}{'NAME'});
-			print ">$network</option>";
+			my $defnet="$defaultNetworks{$network}{'NAME'}_NETADDRESS";
+			my $defsub="$defaultNetworks{$network}{'NAME'}_NETMASK";
+			my $defsub1=&General::subtocidr($ifaces{$defsub});
+			$ifaces{$defnet}='' if ($defaultNetworks{$network}{'NAME'} eq 'RED');
+			if ($ifaces{$defnet}){
+				print ">$network ($ifaces{$defnet}/$defsub1)</option>";
+			}else{
+				print ">$network</option>";
+			}
 		}
 	print"</select></td></tr>";
 	#custom networks
@@ -1275,7 +1021,7 @@ END
 	#custom groups
 	if (! -z $configgrp || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
 		print"<tr><td valign='top'><input type='radio' name='$grp' value='cust_grp_$srctgt' $checked{$grp}{'cust_grp_'.$srctgt}></td><td >$Lang::tr{'fwhost cust grp'}</td><td align='right'><select name='cust_grp_$srctgt' style='width:200px;'>";
-		foreach my $key (sort { uc($customgrp{$a}[0]) cmp uc($customgrp{$b}[0]) } keys %customgrp) {
+		foreach my $key (sort { ncmp($customgrp{$a}[0],$customgrp{$b}[0]) } keys %customgrp) {
 			if($helper ne $customgrp{$key}[0]){
 				print"<option ";
 				print "selected='selected' " if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $customgrp{$key}[0]);
@@ -1294,7 +1040,7 @@ END
 		print"</select></td></tr>";
 	}
 	#OVPN CCD Hosts
-	foreach my $key (sort { uc($ccdhost{$a}[0]) cmp uc($ccdhost{$b}[0]) } keys %ccdhost){
+	foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost){
 		if ($ccdhost{$key}[33] ne '' ){
 			print"<tr><td width='1%'><input type='radio' name='$grp' value='ovpn_host_$srctgt' $checked{$grp}{'ovpn_host_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_host_$srctgt' style='width:200px;'>" if ($show eq '');
 			$show='1';
@@ -1308,7 +1054,7 @@ END
 	}
 	if ($show eq '1'){$show='';print"</select></td></tr>";}
 	#OVPN N2N
-	foreach my $key (sort { uc($ccdhost{$a}[0]) cmp uc($ccdhost{$b}[0]) } keys %ccdhost){
+	foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost){
 		if ($ccdhost{$key}[3] eq 'net'){
 			print"<tr><td width='1%'><input type='radio' name='$grp' value='ovpn_n2n_$srctgt' $checked{$grp}{'ovpn_n2n_'.$srctgt}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td nowrap='nowrap' width='1%' align='right'><select name='ovpn_n2n_$srctgt' style='width:200px;'>" if ($show eq '');
 			$show='1';
@@ -1322,7 +1068,7 @@ END
 	}
 	if ($show eq '1'){$show='';print"</select></td></tr>";}
 	#IPsec netze
-	foreach my $key (sort { uc($ipsecconf{$a}[1]) cmp uc($ipsecconf{$b}[1]) } keys %ipsecconf) {
+	foreach my $key (sort { ncmp($ipsecconf{$a}[1],$ipsecconf{$b}[1]) } keys %ipsecconf) {
 		if ($ipsecconf{$key}[3] eq 'net' || $optionsfw{'SHOWDROPDOWN'} eq 'on'){
 			print"<tr><td valign='top'><input type='radio' name='$grp' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'>" if ($show eq '');
 			$show='1';
@@ -1448,15 +1194,15 @@ sub get_serviceports
 	my $icmp;
 	@protocols=();
 	if($type eq 'service'){
-		foreach my $key (sort { uc($customservice{$a}[0]) cmp uc($customservice{$b}[0]) } keys %customservice){
+		foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
 			if ($customservice{$key}[0] eq $name){
 				push (@protocols,$customservice{$key}[2]);
 			}
 		}
 	}elsif($type eq 'group'){
-		foreach my $key (sort { uc($customservicegrp{$a}[0]) cmp uc($customservicegrp{$b}[0]) } keys %customservicegrp){
+		foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
 			if ($customservicegrp{$key}[0] eq $name){
-				foreach my $key1 (sort { uc($customservice{$a}[0]) cmp uc($customservice{$b}[0]) } keys %customservice){
+				foreach my $key1 (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
 					if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){
 						if($customservice{$key1}[2] eq 'TCP'){
 							$tcp='TCP';
@@ -1491,6 +1237,40 @@ sub getcolor
 	my $val=shift;
 	my $hash=shift;
 	if($optionsfw{'SHOWCOLORS'} eq 'on'){
+		#standard networks
+		if ($val eq 'GREEN'){
+			$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+			return;
+		}elsif ($val eq 'ORANGE'){
+			$tdcolor="style='border: 1px solid $Header::colourorange;'";
+			return;
+		}elsif ($val eq 'BLUE'){
+			$tdcolor="style='border: 1px solid $Header::colourblue;'";
+			return;
+		}elsif ($val eq 'RED' ||$val eq 'RED1' ){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}elsif ($val eq 'IPFire' ){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}elsif($val =~ /^(.*?)\/(.*?)$/){
+			my ($sip,$scidr) = split ("/",$val);
+			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourorange;'";
+				return;
+			}
+			if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourgreen;'";
+				return;
+			}
+			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+				$tdcolor="style='border: 1px solid $Header::colourblue;'";
+				return;
+			}
+		}elsif ($val eq 'Default IP'){
+			$tdcolor="style='border: 1px solid $Header::colourred;'";
+			return;
+		}
 		#Check if a manual IP is part of a VPN 
 		if ($nettype eq 'src_addr' || $nettype eq 'tgt_addr'){
 			#Check if IP is part of OpenVPN dynamic subnet
@@ -1500,6 +1280,25 @@ sub getcolor
 				$tdcolor="style='border: 1px solid $Header::colourovpn;'";
 				return;
 			}
+			#Check if IP is part of OpenVPN static subnet
+			foreach my $key (sort keys %ccdnet){
+				my ($a,$b) = split("/",$ccdnet{$key}[1]);
+				$b =&General::iporsubtodec($b);
+				if (&General::IpInSubnet($c,$a,$b)){
+					$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+					return;
+				}
+			}
+			#Check if IP is part of OpenVPN N2N subnet
+			foreach my $key (sort keys %ccdhost){
+				if ($ccdhost{$key}[3] eq 'net'){
+					my ($a,$b) = split("/",$ccdhost{$key}[11]);
+					if (&General::IpInSubnet($c,$a,$b)){
+						$tdcolor="style='border: 1px solid $Header::colourovpn;'";
+						return;
+					}
+				}
+			}
 			#Check if IP is part of IPsec RW network
 			if ($ipsecsettings{'RW_NET'} ne ''){
 				my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
@@ -1543,44 +1342,9 @@ sub getcolor
 				return;
 			}
 		}
-		#standard networks
-		if ($val eq 'GREEN'){
-			$tdcolor="style='border: 1px solid $Header::colourgreen;'";
-			return;
-		}elsif ($val eq 'ORANGE'){
-			$tdcolor="style='border: 1px solid $Header::colourorange;'";
-			return;
-		}elsif ($val eq 'BLUE'){
-			$tdcolor="style='border: 1px solid $Header::colourblue;'";
-			return;
-		}elsif ($val eq 'RED'){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}elsif ($val eq 'IPFire' ){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}elsif($val =~ /^(.*?)\/(.*?)$/){
-			my ($sip,$scidr) = split ("/",$val);
-			if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourorange;'";
-				return;
-			}
-			if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourgreen;'";
-				return;
-			}
-			if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
-				$tdcolor="style='border: 1px solid $Header::colourblue;'";
-				return;
-			}
-		}elsif ($val eq 'Default IP'){
-			$tdcolor="style='border: 1px solid $Header::colourred;'";
-			return;
-		}else{
-			$tdcolor='';
-			return;
-		}
 	}
+	$tdcolor='';
+	return;
 }
 sub hint
 {
@@ -1628,6 +1392,10 @@ sub newrule
 	if($fwdfwsettings{'config'} eq ''){$fwdfwsettings{'config'}=$configfwdfw;}
 	my $config=$fwdfwsettings{'config'};
 	my %hash=();
+	#Get Red IP-ADDRESS
+	open (CONN1,"/var/ipfire/red/local-ipaddress");
+	my $redip = <CONN1>;
+	close(CONN1);
 	$checked{'grp1'}{$fwdfwsettings{'grp1'}} 				= 'CHECKED';
 	$checked{'grp2'}{$fwdfwsettings{'grp2'}} 				= 'CHECKED';
 	$checked{'grp3'}{$fwdfwsettings{'grp3'}} 				= 'CHECKED';
@@ -1647,6 +1415,7 @@ sub newrule
 	$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 	$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
 	$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
+	$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
 	#check if update and get values
 	if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){
 		&General::readhasharray("$config", \%hash);
@@ -1706,6 +1475,7 @@ sub newrule
 				$selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}}		= 'selected';
 				$selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}			= 'selected';
 				$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
+				$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
 				$selected{'dnat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
 				$selected{'snat'}{$fwdfwsettings{$fwdfwsettings{'nat'}}} ='selected';
 			}
@@ -1719,11 +1489,7 @@ sub newrule
 		$fwdfwsettings{'oldusesrv'}=$fwdfwsettings{'USESRV'};
 		$fwdfwsettings{'oldruleremark'}=$fwdfwsettings{'ruleremark'};
 		$fwdfwsettings{'oldnat'}=$fwdfwsettings{'USE_NAT'};
-		if ($fwdfwsettings{'config'} eq "${General::swroot}/forward/dmz"){
-			$fwdfwsettings{'oldruletype'}='DMZ';
-		}else{
-			$fwdfwsettings{'oldruletype'}=$fwdfwsettings{'chain'};
-		}
+		$fwdfwsettings{'oldruletype'}=$fwdfwsettings{'chain'};
 		#check if manual ip (source) is orange network
 		if ($fwdfwsettings{'grp1'} eq 'src_addr'){
 			my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
@@ -1758,9 +1524,24 @@ sub newrule
 	#------SOURCE-------------------------------------------------------
 	print<<END;
 		<table width='100%' border='0'>
-		<tr><td width='1%'><input type='radio' name='grp1' value='src_addr'  checked></td><td colspan='5'>$Lang::tr{'fwdfw sourceip'}<input type='TEXT' name='src_addr' value='$fwdfwsettings{'src_addr'}' size='16' maxlength='17'></td></tr>
-		<tr><td colspan='7'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr>
-		</table>
+		<tr><td width='1%'><input type='radio' name='grp1' value='src_addr'  checked></td><td width='60%'>$Lang::tr{'fwdfw sourceip'}<input type='TEXT' name='src_addr' value='$fwdfwsettings{'src_addr'}' size='16' maxlength='17'></td><td width='1%'><input type='radio' name='grp1' value='ipfire_src'  $checked{'grp1'}{'ipfire_src'}></td><td><b>Firewall</b></td>
+END
+		print"<td align='right'><select name='ipfire_src' style='width:200px;'>";
+		print "<option value='ALL' $selected{'ipfire_src'}{'ALL'}>$Lang::tr{'all'}</option>";
+		print "<option value='GREEN' $selected{'ipfire_src'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
+		print "<option value='ORANGE' $selected{'ipfire_src'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if $ifaces{'ORANGE_ADDRESS'};
+		print "<option value='BLUE' $selected{'ipfire_src'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>" if $ifaces{'BLUE_ADDRESS'};
+		print "<option value='RED1' $selected{'ipfire_src'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
+
+		if (! -z "${General::swroot}/ethernet/aliases"){
+			foreach my $alias (sort keys %aliases)
+			{
+				print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+			}
+		}
+		print<<END;
+		</td></tr>
+		<tr><td colspan='8'><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; ' /></td></tr></table>
 END
 	&gen_dd_block('src','grp1');
 		print<<END;
@@ -1785,7 +1566,7 @@ END
 END
 		&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
 		print"<option>All ICMP-Types</option>";
-		foreach my $key (sort { uc($icmptypes{$a}[0]) cmp uc($icmptypes{$b}[0]) } keys %icmptypes){
+		foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) } keys %icmptypes){
 			if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
 				print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
 			}else{
@@ -1801,19 +1582,19 @@ END
 		&Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'});
 		print<<END;
 		<table width='100%' border='0'>	
-		<tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr'  checked></td><td width='57%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='17'><td width='1%'><input type='radio' name='grp2' value='ipfire'  $checked{'grp2'}{'ipfire'}></td><td><b>IPFire</b></td>
+		<tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr'  checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='17'><td width='1%'><input type='radio' name='grp2' value='ipfire'  $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td>
 END
+		print"<td align='right'><select name='ipfire' style='width:200px;'>";
+		print "<option value='ALL' $selected{'ipfire'}{'ALL'}>$Lang::tr{'all'}</option>";
+		print "<option value='GREEN' $selected{'ipfire'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'};
+		print "<option value='ORANGE' $selected{'ipfire'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if $ifaces{'ORANGE_ADDRESS'};
+		print "<option value='BLUE' $selected{'ipfire'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>" if $ifaces{'BLUE_ADDRESS'};
+		print "<option value='RED1' $selected{'ipfire'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip);
 		if (! -z "${General::swroot}/ethernet/aliases"){
-			print"<td align='right'><select name='ipfire' style='width:200px;'>";
-			print "<option value='Default IP' $selected{'ipfire'}{'Default IP'}>Default IP</option>";
-
 			foreach my $alias (sort keys %aliases)
 			{
 				print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
 			}
-			
-		}else{
-			print"<td style='width:200px;'><input type='hidden' name ='ipfire' value='Default IP'>";
 		}
 		print<<END;
 		</td></tr>
@@ -1821,24 +1602,23 @@ END
 END
 		&gen_dd_block('tgt','grp2');
 		print<<END;
-		<b>$Lang::tr{'fwhost attention'}:</b><br>
-		$Lang::tr{'fwhost macwarn'}<br><hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; '></hr><br>
+		<hr style='border:dotted #BFBFBF; border-width:1px 0 0 0 ; '></hr><br>
 		<table width='100%' border='0'>
 		<tr><td width='1%'><input type='checkbox' name='USESRV' value='ON' $checked{'USESRV'}{'ON'} ></td><td width='48%'>$Lang::tr{'fwdfw use srv'}</td><td width='1%'><input type='radio' name='grp3' value='cust_srv' checked></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust service'}</td><td width='1%' colspan='2'><select name='cust_srv'style='min-width:230px;' >
 END
 		&General::readhasharray("$configsrv", \%customservice);
-		foreach my $key (sort { uc($customservice{$a}[0]) cmp uc($customservice{$b}[0]) } keys %customservice){
+		foreach my $key (sort { ncmp($customservice{$a}[0],$customservice{$b}[0]) } keys %customservice){
 			print"<option ";
 			print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]);
 			print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
 		}	
 		print<<END;
 		</select></td></tr>
-		<tr><td colspan='2'></td><td><input type='radio' name='grp3' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust srvgrp'}:</td><td colspan='2'><select name='cust_srvgrp' style='min-width:230px;' >
+		<tr><td colspan='2'></td><td><input type='radio' name='grp3' value='cust_srvgrp' $checked{'grp3'}{'cust_srvgrp'}></td><td nowrap='nowrap'>$Lang::tr{'fwhost cust srvgrp'}</td><td colspan='2'><select name='cust_srvgrp' style='min-width:230px;' >
 END
 		&General::readhasharray("$configsrvgrp", \%customservicegrp);
 		my $helper;
-		foreach my $key (sort { uc($customservicegrp{$a}[0]) cmp uc($customservicegrp{$b}[0]) } keys %customservicegrp){
+		foreach my $key (sort { ncmp($customservicegrp{$a}[0],$customservicegrp{$b}[0]) } keys %customservicegrp){
 			if ($helper ne $customservicegrp{$key}[0]){
 				print"<option ";
 				print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservicegrp{$key}[0]);
@@ -1866,7 +1646,7 @@ END
 END
 		&General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
 		print"<option>All ICMP-Types</option>";
-		foreach my $key (sort { uc($icmptypes{$a}[0]) cmp uc($icmptypes{$b}[0]) }keys %icmptypes){
+		foreach my $key (sort { ncmp($icmptypes{$a}[0],$icmptypes{$b}[0]) }keys %icmptypes){
 			if($fwdfwsettings{'ICMP_TGT'} eq "$icmptypes{$key}[0]"){
 				print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
 			}else{
@@ -1900,14 +1680,12 @@ END
 		#SNAT
 		print"<tr><td colspan='2'></td><td width='1%'><input type='radio' name='nat' value='snat'  $checked{'nat'}{'snat'}></td><td width='20%'>$Lang::tr{'fwdfw snat'}</td>";
 		print"<td width='8%'>IPFire: </td><td width='20%' align='right'><select name='snat' style='width:140px;'>";
-		print "<option value='Default IP' $selected{'snat'}{'Default IP'}>Default IP</option>";
 		foreach my $alias (sort keys %aliases)
 			{
 				print "<option value='$alias' $selected{'snat'}{$alias}>$alias</option>";
 			}
 		foreach my $network (sort keys %defaultNetworks)
 		{
-			next if($defaultNetworks{$network}{'NAME'} eq "RED");
 			next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
 			next if($defaultNetworks{$network}{'NAME'} eq "ALL");
 			next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
@@ -1943,7 +1721,8 @@ END
 			}
 		}
 		print"</select></td></tr>";	
-		print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td align='left'><input type='text' name='ruleremark' size='40' maxlength='255' value='$fwdfwsettings{'ruleremark'}'></td></tr>";
+		print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td width='88%' align='left'><input type='text' name='ruleremark' maxlength='255' value='$fwdfwsettings{'ruleremark'}' style='width:99%':></td></tr>";
+		#print"<tr><td width='100%'>$Lang::tr{'remark'}:</td><td align='left'><textarea name='ruleremark' cols='70' rows='3' value='$fwdfwsettings{'ruleremark'}'></textarea></td></tr>";
 		if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){
 			print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><select name='rulepos' >";
 			for (my $count =1; $count <= $sum; $count++){ 
@@ -2120,95 +1899,39 @@ sub saverule
 	my $config=shift;
 	&General::readhasharray("$config", $hash);
 	if (!$errormessage){
-		#check if we change a NAT to a FORWARD/DMZ
-		if(($fwdfwsettings{'oldruletype'} eq 'NAT_SOURCE' || $fwdfwsettings{'oldruletype'} eq 'NAT_DESTINATION') && $fwdfwsettings{'chain'} eq 'FORWARDFW'){
-			&changerule($confignat);
-			#print"1";
-		}
-		#check if we change a NAT to a INPUT (external access)
-		elsif(($fwdfwsettings{'oldruletype'} eq 'NAT_SOURCE' || $fwdfwsettings{'oldruletype'} eq 'NAT_DESTINATION') && $fwdfwsettings{'chain'} eq 'INPUTFW'){
-			&changerule($confignat);
-			#print"2";
-		}
-		#check if we change a NAT to a OUTGOING
-		elsif(($fwdfwsettings{'oldruletype'} eq 'NAT_SOURCE' || $fwdfwsettings{'oldruletype'} eq 'NAT_DESTINATION') && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'){
-			&changerule($confignat);
-			#print"3";
-		}
 		################################################################
-		#check if we change a DMZ to a NAT
-		elsif($fwdfwsettings{'oldruletype'} eq 'DMZ'  && ($fwdfwsettings{'chain'} eq 'NAT_SOURCE' || $fwdfwsettings{'chain'} eq 'NAT_DESTINATION')){
-			&changerule($configdmz);
-			#print"4";
-		}
-		#check if we change a DMZ to an OUTGOING
-		elsif($fwdfwsettings{'oldruletype'} eq 'DMZ'  && $fwdfwsettings{'chain'} eq 'OUTGOINGFW' ){
-			&changerule($configdmz);
-			#print"5";
-		}
-		#check if we change a DMZ to an INPUT
-		elsif($fwdfwsettings{'oldruletype'} eq 'DMZ'  && $fwdfwsettings{'chain'} eq 'INPUTFW' ){
-			&changerule($configdmz);
-			#print"6";
-		}
-		#check if we change a DMZ to a FORWARD/DMZ
-		elsif($fwdfwsettings{'oldruletype'} eq 'DMZ'  && $fwdfwsettings{'chain'} eq 'FORWARDFW' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){
-			&changerule($configdmz);
-			#print"7";
-		}
-		################################################################
-		#check if we change an INPUT rule to a NAT
-		elsif($fwdfwsettings{'oldruletype'} eq 'INPUTFW'  && ($fwdfwsettings{'chain'} eq 'NAT_SOURCE' ||  $fwdfwsettings{'chain'} eq 'NAT_DESTINATION')){
-			&changerule($configinput);
-			#print"8";
-		}
 		#check if we change an INPUT rule to a OUTGOING
-		elsif($fwdfwsettings{'oldruletype'} eq 'INPUTFW'  && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'  ){
+		if($fwdfwsettings{'oldruletype'} eq 'INPUTFW'  && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'  ){
 			&changerule($configinput);
-			#print"9";
+			#print"1";
 		}
-		#check if we change an INPUT rule to a FORWARD/DMZ
+		#check if we change an INPUT rule to a FORWARD
 		elsif($fwdfwsettings{'oldruletype'} eq 'INPUTFW'  && $fwdfwsettings{'chain'} eq 'FORWARDFW'  ){
 			&changerule($configinput);
-			#print"10";
+			#print"2";
 		}
 		################################################################
 		#check if we change an OUTGOING rule to an INPUT
 		elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW'  && $fwdfwsettings{'chain'} eq 'INPUTFW'  ){
 			&changerule($configoutgoing);
-			#print"11";
+			#print"3";
 		}
-		#check if we change an OUTGOING rule to a FORWARD/DMZ
+		#check if we change an OUTGOING rule to a FORWARD
 		elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW'  && $fwdfwsettings{'chain'} eq 'FORWARDFW'  ){
 			&changerule($configoutgoing);
-			#print"12";
-		}
-		#check if we change an OUTGOING rule to a NAT
-		elsif($fwdfwsettings{'oldruletype'} eq 'OUTGOINGFW'  && ($fwdfwsettings{'chain'} eq 'NAT_SOURCE' ||  $fwdfwsettings{'chain'} eq 'NAT_DESTINATION')){
-			&changerule($configoutgoing);
-			#print"13";
+			#print"4";
 		}
 		################################################################
 		#check if we change a FORWARD rule to an INPUT
 		elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW'  && $fwdfwsettings{'chain'} eq 'INPUTFW'){
 			&changerule($configfwdfw);
-			#print"14";
-		}
-		#check if we change a FORWARD rule to an DMZ
-		elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW'  && $fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on'){
-			&changerule($configfwdfw);
-			#print"15";
+			#print"5";
 		}
 		#check if we change a FORWARD rule to an OUTGOING
 		elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW'  && $fwdfwsettings{'chain'} eq 'OUTGOINGFW'){
 			&changerule($configfwdfw);
-			#print"16";
+			#print"6";
 		}
-		#check if we change a FORWARD rule to an NAT
-		elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW'  && ($fwdfwsettings{'chain'} eq 'NAT_SOURCE' ||  $fwdfwsettings{'chain'} eq 'NAT_DESTINATION')){
-			&changerule($configfwdfw);
-			#print"17";
-		}		
 		if ($fwdfwsettings{'updatefwrule'} ne 'on'){
 			my $key = &General::findhasharraykey ($hash);
 			$$hash{$key}[0]  = $fwdfwsettings{'RULE_ACTION'};
@@ -2239,12 +1962,10 @@ sub saverule
 			$$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
 			$$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
 			$$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
-			if($fwdfwsettings{'USE_NAT'} eq 'ON'){
-				$$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
-				$$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
-				$$hash{$key}[30] = $fwdfwsettings{'dnatport'};
-				$$hash{$key}[31] = $fwdfwsettings{'nat'};
-			}
+			$$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
+			$$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
+			$$hash{$key}[30] = $fwdfwsettings{'dnatport'};
+			$$hash{$key}[31] = $fwdfwsettings{'nat'};
 			&General::writehasharray("$config", $hash);
 		}else{
 			foreach my $key (sort {$a <=> $b} keys %$hash){
@@ -2277,12 +1998,10 @@ sub saverule
 					$$hash{$key}[25] = $fwdfwsettings{'TIME_SUN'};
 					$$hash{$key}[26] = $fwdfwsettings{'TIME_FROM'};
 					$$hash{$key}[27] = $fwdfwsettings{'TIME_TO'};
-					if($fwdfwsettings{'USE_NAT'} eq 'ON'){
-						$$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
-						$$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
-						$$hash{$key}[30] = $fwdfwsettings{'dnatport'};
-						$$hash{$key}[31] = $fwdfwsettings{'nat'};
-					}
+					$$hash{$key}[28] = $fwdfwsettings{'USE_NAT'};
+					$$hash{$key}[29] = $fwdfwsettings{$fwdfwsettings{'nat'}};
+					$$hash{$key}[30] = $fwdfwsettings{'dnatport'};
+					$$hash{$key}[31] = $fwdfwsettings{'nat'};
 					last;
 				}
 			}
@@ -2368,11 +2087,9 @@ sub validremark
 sub viewtablerule
 {
 	&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
-	&viewtablenew(\%confignatfw,$confignat,"$Lang::tr{'fwdfw rules'}","Portforward / SNAT" );
 	&viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
-	&viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
 	&viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
-	&viewtablenew(\%configdmzfw,$configdmz,"","DMZ" );
+	&viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
 }
 sub viewtablenew
 {
@@ -2384,6 +2101,8 @@ sub viewtablenew
 	&General::get_aliases(\%aliases);
 	&General::readhasharray("$confighost", \%customhost);
 	&General::readhasharray("$config", $hash);
+	&General::readhasharray("$configccdnet", \%ccdnet);
+	&General::readhasharray("$configccdhost", \%ccdhost);
 	if( ! -z $config){
 		&Header::openbox('100%', 'left',$title);
 		my $count=0;
@@ -2394,8 +2113,8 @@ sub viewtablenew
 		my @tmpsrc=();
 		my $coloryellow='';
 		print"<b>$title1</b><br>";
-		print"<table width='100%' cellspacing='0' cellpadding='0'>";
-		print"<tr><td align='center'><b>#</td><td ></td><td align='center'><b>$Lang::tr{'fwdfw source'}</td><td><b>Log</td><td align='center'><b>$Lang::tr{'fwdfw target'}</td><td align='center'><b>$Lang::tr{'protocol'}</b></td><td align='center'><b>$Lang::tr{'fwdfw time'}</td><td align='center' colspan='6'><b>$Lang::tr{'fwdfw action'}</td></tr>";
+		print"<table width='100%' cellspacing='0' cellpadding='0' border='0'>";
+		print"<tr><td align='center'><b>#</td><td></td><td align='center' width='25'></td><td align='center'><b>$Lang::tr{'fwdfw source'}</td><td width='1%'><b>Log</td><td align='center'><b>$Lang::tr{'fwdfw target'}</td><td align='center' colspan='6' width='1%'><b>$Lang::tr{'fwdfw action'}</td></tr>";
 		foreach my $key (sort  {$a <=> $b} keys %$hash){
 			$tdcolor='';
 			@tmpsrc=();
@@ -2447,9 +2166,11 @@ sub viewtablenew
 				}
 			}
 			print"<tr bgcolor='$color' >";
+			#KEY
 			print<<END;
-			<td align='right' width='15'><b>$key</b></td>
+			<td align='right' width='18'><b>$key &nbsp</b></td>
 END
+			#RULETYPE (A,R,D)
 			if ($$hash{$key}[0] eq 'ACCEPT'){
 				$ruletype='A';
 				$tooltip='ACCEPT';
@@ -2463,19 +2184,52 @@ END
 				$tooltip='REJECT';
 				$rulecolor=$color{'color16'};
 			}
-			print"<td bgcolor='$rulecolor' align='center' width='20'><span title='$tooltip'><b>$ruletype</b></span></td>";
+			print"<td bgcolor='$rulecolor' align='center' width='10'><span title='$tooltip'><b>$ruletype</b></span></td>";
+			#Get Protocol
+			my $prot;
+			if ($$hash{$key}[8] && $$hash{$key}[7] eq 'ON'){#source prot if manual
+				push (@protocols,$$hash{$key}[8]);
+			}elsif ($$hash{$key}[12]){			#target prot if manual
+				push (@protocols,$$hash{$key}[12]);
+			}elsif($$hash{$key}[14] eq 'cust_srv'){
+				&get_serviceports("service",$$hash{$key}[15]);
+			}elsif($$hash{$key}[14] eq 'cust_srvgrp'){
+				&get_serviceports("group",$$hash{$key}[15]);
+			}else{
+				push (@protocols,$Lang::tr{'all'});
+			}
+			my $protz=join(",",@protocols);
+			print"<td align='center'>$protz</td>";
+			@protocols=();
+			#SOURCE
+			my $ipfireiface;
 			&getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
 			print"<td align='center' width='160' $tdcolor>";
+			if ($$hash{$key}[3] eq 'ipfire_src'){
+				$ipfireiface='Interface ';
+			}
 			if ($$hash{$key}[3] eq 'std_net_src'){
 				print &get_name($$hash{$key}[4]);
+			}elsif ($$hash{$key}[3] eq 'src_addr'){
+				my ($split1,$split2) = split("/",$$hash{$key}[4]);
+				if ($split2 eq '32'){
+					print $split1;
+				}else{
+					print $$hash{$key}[4];
+				}
+			}elsif ($$hash{$key}[4] eq 'RED1'){
+				print "$ipfireiface $Lang::tr{'fwdfw red'}";
 			}else{
-				print $$hash{$key}[4];
+				print "$$hash{$key}[4]";
 			}
 			$tdcolor='';
+			#SOURCEPORT
 			&getsrcport(\%$hash,$key);
 			#Is this a SNAT rule?
-			if ($$hash{$key}[31] eq 'snat'){
-				print"<br>SNAT -> $$hash{$key}[29]";
+			if ($$hash{$key}[31] eq 'snat' && $$hash{$key}[28] eq 'ON'){
+				my $net=&get_name($$hash{$key}[29]);
+				if ( ! $net){ $net=$$hash{$key}[29];}
+					print"<br>->$net";
 				if ($$hash{$key}[30] ne ''){
 					print": $$hash{$key}[30]";
 				}
@@ -2485,6 +2239,7 @@ END
 			}else{
 				$log="/images/off.gif";
 			}
+			#LOGGING
 			print<<END;
 			</td>
 			<form method='post'>
@@ -2494,59 +2249,47 @@ END
 			<input type='hidden' name='ACTION' value='$Lang::tr{'fwdfw togglelog'}' />
 			</td></form>
 END
+			#TARGET
 			&getcolor($$hash{$key}[5],$$hash{$key}[6],\%customhost);
 			print<<END;
 			<td align='center' width='160' $tdcolor>
 END
 			#Is this a DNAT rule?
-			if ($$hash{$key}[31] eq 'dnat'){
-				print "IPFire ($$hash{$key}[29])";
+			if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
+				print "Firewall ($$hash{$key}[29])";
 				if($$hash{$key}[30] ne ''){
 					$$hash{$key}[30]=~ tr/|/,/;
 					print": $$hash{$key}[30]";
 				}
-				print"<br> DNAT->";
+				print"<br>->";
 			}
-			if ($$hash{$key}[5] eq 'std_net_tgt'){
-				print &get_name($$hash{$key}[6]);
+			if ($$hash{$key}[5] eq 'ipfire'){
+				$ipfireiface='Interface';
+			}
+			if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire'  || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
+				if ($$hash{$key}[6] eq 'RED1'){
+					print "$ipfireiface $Lang::tr{'red1'}";
+				}elsif ($$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE'|| $$hash{$key}[6] eq 'ALL')
+				{
+					print "$ipfireiface ".&get_name($$hash{$key}[6]);
+				}else{
+					print $$hash{$key}[6];
+				}
+			}elsif ($$hash{$key}[5] eq 'tgt_addr'){
+				my ($split1,$split2) = split("/",$$hash{$key}[6]);
+				if ($split2 eq '32'){
+					print $split1;
+				}else{
+					print $$hash{$key}[6];
+				}
 			}else{
-				print $$hash{$key}[6];
+				print "$$hash{$key}[6]";
 			}
 			$tdcolor='';
+			#TARGETPORT
 			&gettgtport(\%$hash,$key);
 			print"</td>";
-			#Get Protocol
-			my $prot;
-			if ($$hash{$key}[12]){			#target prot if manual
-				push (@protocols,$$hash{$key}[12]);
-			}elsif($$hash{$key}[8]){		#source prot if manual
-				push (@protocols,$$hash{$key}[8]);
-			}elsif($$hash{$key}[14] eq 'cust_srv'){
-				&get_serviceports("service",$$hash{$key}[15]);
-			}elsif($$hash{$key}[14] eq 'cust_srvgrp'){
-				&get_serviceports("group",$$hash{$key}[15]);
-			}else{
-				push (@protocols,$Lang::tr{'all'});
-			}
-			my $protz=join(",",@protocols);
-			print"<td align='center'>$protz</td>";
-			@protocols=();
-			if ($$hash{$key}[18] eq 'ON'){
-				my @days=();
-				if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});}
-				if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});}
-				if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});}
-				if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});}
-				if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});}
-				if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});}
-				if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});}
-				my $weekdays=join(",",@days);
-				if (@days){
-					print"<td align='center' width='100'>$weekdays &nbsp $$hash{$key}[26] - $$hash{$key}[27] </td>";
-				}
-			}else{
-					print"<td align='center'>24/7</td>";
-				}
+			#RULE ACTIVE
 			if($$hash{$key}[2] eq 'ON'){
 				$gif="/images/on.gif"
 				
@@ -2604,24 +2347,105 @@ END
 				print"<td width='25'><input type='image' img src='/images/down.gif' style='visibility:hidden;'></td></tr>";
 			}
 			#REMARK
-			if ($optionsfw{'SHOWREMARK'} eq 'on'){
+			if ($optionsfw{'SHOWREMARK'} eq 'on' && $$hash{$key}[16] ne ''){
 				print"<tr bgcolor='$color'>";
-				print"<td>&nbsp</td><td bgcolor='$rulecolor'></td><td colspan='11'>&nbsp $$hash{$key}[16]</td></tr>";
+				print"<td>&nbsp</td><td bgcolor='$rulecolor'></td><td colspan='10'>&nbsp $$hash{$key}[16]</td></tr>";
 			}
-			print"<tr bgcolor='$color'><td height='1'></td><td bgcolor='$rulecolor'></td><td colspan='11'></td></tr>";
+			if ($$hash{$key}[18] eq 'ON'){
+				#TIMEFRAME
+				if ($$hash{$key}[18] eq 'ON'){
+					my @days=();
+					if($$hash{$key}[19] ne ''){push (@days,$Lang::tr{'fwdfw wd_mon'});}
+					if($$hash{$key}[20] ne ''){push (@days,$Lang::tr{'fwdfw wd_tue'});}
+					if($$hash{$key}[21] ne ''){push (@days,$Lang::tr{'fwdfw wd_wed'});}
+					if($$hash{$key}[22] ne ''){push (@days,$Lang::tr{'fwdfw wd_thu'});}
+					if($$hash{$key}[23] ne ''){push (@days,$Lang::tr{'fwdfw wd_fri'});}
+					if($$hash{$key}[24] ne ''){push (@days,$Lang::tr{'fwdfw wd_sat'});}
+					if($$hash{$key}[25] ne ''){push (@days,$Lang::tr{'fwdfw wd_sun'});}
+					my $weekdays=join(",",@days);
+					if (@days){
+						print"<tr bgcolor='$color'>";
+						print"<td>&nbsp</td><td bgcolor='$rulecolor'></td><td align='left' colspan='10'>&nbsp $weekdays &nbsp $$hash{$key}[26] - $$hash{$key}[27] </td></tr>";
+					}
+				}
+			}
+			print"<tr bgcolor='FFFFFF'><td colspan='13' height='1'></td></tr>";
+		}
+		print"</table>";
+		print "<table width='100%'rules='cols' border='1'>";
+		my $col;
+		if ($config eq '/var/ipfire/forward/config'){
+			my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
+			if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+				$col="bgcolor='darkred'";
+			}else{
+				$col="bgcolor='green'";
+			}
+			&show_defaultrules($col,$pol);
+		}elsif ($config eq '/var/ipfire/forward/outgoing'){
+			my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
+			if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
+				$col="bgcolor='darkred'";
+			}else{
+				$col="bgcolor='green'";
+			}
+			print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col><font color='#FFFFFF' align='center'>$Lang::tr{$pol}</font></td></tr>";
+		}else{
+			print"<tr><td bgcolor='darkred' width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td bgcolor='darkred' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw MODE1'}</font></td></tr>";
 		}
 		print"</table>";
-		&Header::closebox();
 		print "<hr>";
 		print "<br><br>";
+		&Header::closebox();
 	}else{
 		if ($optionsfw{'SHOWTABLES'} eq 'on'){
 			print "<b>$title1</b><br>";
-			print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table><br><br>";
+			print"<table width='100%' border='0' rules='none'><tr><td height='30' bgcolor=$color{'color22'} align='center'>$Lang::tr{'fwhost empty'}</td></tr></table>";
+			my $col;
+			if ($config eq '/var/ipfire/forward/config'){
+				my $pol='fwdfw '.$fwdfwsettings{'POLICY'};
+				if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
+					$col="bgcolor='darkred'";
+				}else{
+					$col="bgcolor='green'";
+				}
+				&show_defaultrules($col,$pol);
+			}elsif ($config eq '/var/ipfire/forward/outgoing'){
+				print "<table width='100%' rules='cols' border='1'>";
+				my $pol='fwdfw '.$fwdfwsettings{'POLICY1'};
+				if ($fwdfwsettings{'POLICY1'} eq 'MODE1'){
+					$col="bgcolor='darkred'";
+				}else{
+					$col="bgcolor='green'";
+				}
+				print"<tr><td $col align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{$pol}</font></td></tr>";
+			}else{
+				print"<tr><td bgcolor='darkred' align='center' width='20%'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td align='center'>$Lang::tr{'fwdfw MODE1'}</font></td></tr>";
+			}
+			print"</table><br><br>";
 		}
 	}
 }
-
-
 &Header::closebigbox();
 &Header::closepage();
+
+sub show_defaultrules
+{
+	my $col=shift;
+	my $pol=shift;
+	#STANDARD RULES (From WIKI)
+			print"</table><br>";
+			print "<table width='100%' rules='cols' border='1' >";
+			if ($col eq "bgcolor='green'"){
+				my $blue   = "<font color=$Header::colourblue>    $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol block'})" if $ifaces{'BLUE_DEV'};
+				my $orange = "<font color=$Header::colourorange>  $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol block'})" if $ifaces{'ORANGE_DEV'};
+				my $blue1   = "<font color=$Header::colourblue>    $Lang::tr{'blue'}</font> ($Lang::tr{'fwdfw pol allow'})" if $ifaces{'BLUE_DEV'};
+				my $orange1 = "<font color=$Header::colourorange>  $Lang::tr{'orange'}</font> ($Lang::tr{'fwdfw pol allow'})" if $ifaces{'ORANGE_DEV'};
+				print"<tr><td align='center'><font color='#000000'>$Lang::tr{'green'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'>$orange1</td><td align='center'>$blue1</td></tr>";
+				print"<tr><td align='center' width='20%'><font color='#000000'>$Lang::tr{'orange'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'><font color=$Header::colourgreen>  $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td><td align='center'>$blue</td></tr>";
+				print"<tr><td align='center'><font color='#000000'>$Lang::tr{'blue'}</td><td align='center'> <font color=$Header::colourred>  $Lang::tr{'red'}</font> ($Lang::tr{'fwdfw pol allow'})</td><td align='center'>$orange</td><td align='center'><font color=$Header::colourgreen>  $Lang::tr{'green'}</font> ($Lang::tr{'fwdfw pol block'})</td></tr>" if $ifaces{'BLUE_DEV'};
+				print"<tr><td $col align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'} </font></td><td $col colspan='3' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw pol allow'}</font></td></tr>";
+			}elsif($col eq "bgcolor='darkred'"){
+				print"<tr><td $col width='20%' align='center'><font color='#FFFFFF'>$Lang::tr{'fwdfw final_rule'}</td><td $col align='center'><font color='#FFFFFF'>$Lang::tr{$pol}</font></td></tr>";
+			}
+}