Merge remote-tracking branch 'amarx/beta3' into next

diff --combined html/cgi-bin/firewall.cgi
index 9f960b4c09ea43355374f707ed2bbaaf2c731400,e1573acdb654d53ac858181c4dae8f7d3d246611..52bac58beda889734cf047b6416f8404c53d1449
--- 1/html/cgi-bin/firewall.cgi
--- 2/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@@ -1286,12 -1286,6 +1286,12 @@@ sub getcolo
        my $val=shift;
        my $hash=shift;
        if($optionsfw{'SHOWCOLORS'} eq 'on'){
 +              # Don't colourise MAC addresses
 +              if (&General::validmac($val)) {
 +                      $tdcolor = "";
 +                      return;
 +              }
 +
                #custom Hosts
                if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
                        foreach my $key (sort keys %$hash){
@@@ -1571,7 -1565,7 +1571,7 @@@ sub newrul
        my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
        if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
        my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
-       if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
+       if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
        &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
        #------SOURCE-------------------------------------------------------
        print "<form method='post'>";