]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/forwardfw.cgi
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Forward Firewall: cleanup unused code
[people/teissler/ipfire-2.x.git] / html / cgi-bin / forwardfw.cgi
diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index e074047b3c0f3c2fc8e489aa7a8f66684eabbb45..399875533f0ad4ba9e77e9ca1fe4c7dbb861e378 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -31,6 +31,7 @@
 ###############################################################################
 
 use strict;
 ###############################################################################
 
 use strict;
+use Sort::Naturally;
 no warnings 'uninitialized';
 # enable only the following on debugging purpose
 #use warnings;
 no warnings 'uninitialized';
 # enable only the following on debugging purpose
 #use warnings;
@@ -77,7 +78,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.5';
+my $VERSION='0.9.9.8';
 my $color;
 my $confignet          = "${General::swroot}/fwhosts/customnetworks";
 my $confighost         = "${General::swroot}/fwhosts/customhosts";
 my $color;
 my $confignet          = "${General::swroot}/fwhosts/customnetworks";
 my $confighost         = "${General::swroot}/fwhosts/customhosts";
@@ -182,8 +183,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                if($fwdfwsettings{'rulepos'} > 0 && !$fwdfwsettings{'oldrulenumber'}){
                        $fwdfwsettings{'oldrulenumber'}=$maxkey;
                        foreach my $key (sort keys %confignatfw){
                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'};
                                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'};
@@ -317,27 +316,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                if($fwdfwsettings{'nosave2'} ne 'on'){
                        &saverule(\%configinputfw,$configinput);
                }
                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
                $fwdfwsettings{'config'}=$configoutgoing;
        }elsif($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire' ){
                # OUTGOING PART
                $fwdfwsettings{'config'}=$configoutgoing;
@@ -448,27 +426,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                if ($fwdfwsettings{'nosave2'} ne 'on'){
                        &saverule(\%configfwdfw,$configfwdfw);
                }       
                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;
        }
        if ($errormessage){
                &newrule;
@@ -488,18 +445,9 @@ if ($fwdfwsettings{'ACTION'} eq $Lang::tr{'reset'})
                        &checkcounter($configfwdfw{$key}[5],$configfwdfw{$key}[6],,);
                        &checkcounter($configfwdfw{$key}[14],$configfwdfw{$key}[15],,);
                }
                        &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/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"); }
                &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';
                my $MODE1=$fwdfwsettings{'POLICY1'};
                %fwdfwsettings = ();
                $fwdfwsettings{'POLICY'}='MODE2';
@@ -581,7 +529,6 @@ if ($fwdfwsettings{'ACTION'} eq 'movedown')
 if ($fwdfwsettings{'ACTION'} eq 'copyrule')
 {
        $fwdfwsettings{'copyfwrule'}='on';
 if ($fwdfwsettings{'ACTION'} eq 'copyrule')
 {
        $fwdfwsettings{'copyfwrule'}='on';
-       #$fwdfwsettings{'updatefwrule'}='on';
        &newrule;
 }
 if ($fwdfwsettings{'ACTION'} eq '')
        &newrule;
 }
 if ($fwdfwsettings{'ACTION'} eq '')
@@ -595,7 +542,7 @@ sub addrule
        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>";
        }
        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>";
        }
-       &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>";
        print "<form method='post'>";
        print "<table border='0'>";
        print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
@@ -692,14 +639,7 @@ sub checksource
                                $errormessage=$Lang::tr{'fwhost err hostip'}."<br>";
                                return $errormessage;
                        }
                                $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;
                        if(!&General::validipandmask($fwdfwsettings{'src_addr'})){
                                $errormessage.=$Lang::tr{'fwdfw err src_addr'}."<br>";
                                return $errormessage;
@@ -835,14 +775,7 @@ sub checktarget
                #check and form valid IP
                $ip=&General::ip2dec($ip);
                $ip=&General::dec2ip($ip);
                #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;
                if(!&General::validipandmask($fwdfwsettings{'tgt_addr'})){
                        $errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
                        return $errormessage;
@@ -1188,7 +1121,6 @@ sub dec_counter
        my %hash=%{(shift)};
        my $val=shift;
        my $pos;
        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){
        &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 +1145,7 @@ sub fillselect
        my %hash=%{(shift)};
        my $val=shift;
        my $key;
        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{
                if($hash{$key}[0] eq $val){
                        print"<option value='$hash{$key}[0]' selected>$hash{$key}[0]</option>";
                }else{
@@ -1275,7 +1207,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;'>";
        #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]);
                        if($helper ne $customgrp{$key}[0]){
                                print"<option ";
                                print "selected='selected' " if ($fwdfwsettings{$fwdfwsettings{$grp}} eq $customgrp{$key}[0]);
@@ -1294,7 +1226,7 @@ END
                print"</select></td></tr>";
        }
        #OVPN CCD Hosts
                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';
                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 +1240,7 @@ END
        }
        if ($show eq '1'){$show='';print"</select></td></tr>";}
        #OVPN N2N
        }
        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';
                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 +1254,7 @@ END
        }
        if ($show eq '1'){$show='';print"</select></td></tr>";}
        #IPsec netze
        }
        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';
                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 +1380,15 @@ sub get_serviceports
        my $icmp;
        @protocols=();
        if($type eq 'service'){
        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'){
                        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){
                        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';
                                        if ($customservice{$key1}[0] eq $customservicegrp{$key}[2]){
                                                if($customservice{$key1}[2] eq 'TCP'){
                                                        $tcp='TCP';
@@ -1491,6 +1423,40 @@ sub getcolor
        my $val=shift;
        my $hash=shift;
        if($optionsfw{'SHOWCOLORS'} eq 'on'){
        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
                #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 +1466,25 @@ sub getcolor
                                $tdcolor="style='border: 1px solid $Header::colourovpn;'";
                                return;
                        }
                                $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'});
                        #Check if IP is part of IPsec RW network
                        if ($ipsecsettings{'RW_NET'} ne ''){
                                my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
@@ -1543,44 +1528,9 @@ sub getcolor
                                return;
                        }
                }
                                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
 {
 }
 sub hint
 {
@@ -1785,7 +1735,7 @@ END
 END
                &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
                print"<option>All ICMP-Types</option>";
 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{
                        if($fwdfwsettings{'ICMP_TYPES'} eq "$icmptypes{$key}[0]"){
                                print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
                        }else{
@@ -1803,17 +1753,18 @@ 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>
 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>
 END
-               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>";
+               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'} (Default IP)</option>" if $ifaces{'RED_ADDRESS'};
 
 
+               if (! -z "${General::swroot}/ethernet/aliases"){
                        foreach my $alias (sort keys %aliases)
                        {
                                print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</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>
                }
                print<<END;
                </td></tr>
@@ -1827,7 +1778,7 @@ END
                <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);
                <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"<option ";
                        print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservice{$key}[0]);
                        print"value='$customservice{$key}[0]'>$customservice{$key}[0]</option>";
@@ -1838,7 +1789,7 @@ END
 END
                &General::readhasharray("$configsrvgrp", \%customservicegrp);
                my $helper;
 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]);
                        if ($helper ne $customservicegrp{$key}[0]){
                                print"<option ";
                                print"selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'grp3'}} eq $customservicegrp{$key}[0]);
@@ -1866,7 +1817,7 @@ END
 END
                &General::readhasharray("${General::swroot}/fwhosts/icmp-types", \%icmptypes);
                print"<option>All ICMP-Types</option>";
 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{
                        if($fwdfwsettings{'ICMP_TGT'} eq "$icmptypes{$key}[0]"){
                                print"<option selected>$icmptypes{$key}[0] ($icmptypes{$key}[1])</option>";
                        }else{
@@ -2152,7 +2103,7 @@ sub saverule
                        #print"6";
                }
                #check if we change a DMZ to a FORWARD/DMZ
                        #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'){
+               elsif($fwdfwsettings{'oldruletype'} eq 'DMZ'  && $fwdfwsettings{'chain'} eq 'FORWARDFW' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE' && $checkorange ne 'on'){
                        &changerule($configdmz);
                        #print"7";
                }
                        &changerule($configdmz);
                        #print"7";
                }
@@ -2195,7 +2146,7 @@ sub saverule
                        #print"14";
                }
                #check if we change a FORWARD rule to an DMZ
                        #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'){
+               elsif($fwdfwsettings{'oldruletype'} eq 'FORWARDFW'  && ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on')){
                        &changerule($configfwdfw);
                        #print"15";
                }
                        &changerule($configfwdfw);
                        #print"15";
                }
@@ -2384,6 +2335,8 @@ sub viewtablenew
        &General::get_aliases(\%aliases);
        &General::readhasharray("$confighost", \%customhost);
        &General::readhasharray("$config", $hash);
        &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;
        if( ! -z $config){
                &Header::openbox('100%', 'left',$title);
                my $count=0;
@@ -2507,8 +2460,13 @@ END
                                }
                                print"<br> DNAT->";
                        }
                                }
                                print"<br> DNAT->";
                        }
-                       if ($$hash{$key}[5] eq 'std_net_tgt'){
-                               print &get_name($$hash{$key}[6]);
+                       if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' && $$hash{$key}[6] eq 'RED' || $$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 $Lang::tr{'red1'};
+                               }else{
+                                       print &get_name($$hash{$key}[6]);
+                               }
                        }else{
                                print $$hash{$key}[6];
                        }
                        }else{
                                print $$hash{$key}[6];
                        }
@@ -2517,10 +2475,10 @@ END
                        print"</td>";
                        #Get Protocol
                        my $prot;
                        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
+                       if ($$hash{$key}[8] && $$hash{$key}[7] eq 'ON'){#source prot if manual
                                push (@protocols,$$hash{$key}[8]);
                                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'){
                        }elsif($$hash{$key}[14] eq 'cust_srv'){
                                &get_serviceports("service",$$hash{$key}[15]);
                        }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
Timo's tree of IPFire 2.x