From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 25 Jul 2013 05:33:20 +0000 (+0200)
Subject: Forward FIrewall: Bugfix: When using predefined services in rulecreation, the rule... 
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=653a71b9514dc8a88e7d2247d1d709245afe748c

Forward FIrewall: Bugfix: When using predefined services in rulecreation, the rule was not applied. Bugfix: when in rulecreationpage and pressing "back" the site gets white.
---

diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl
index 6a91ddf57..9f23c54e0 100755
--- a/config/forwardfw/rules.pl
+++ b/config/forwardfw/rules.pl
@@ -575,7 +575,7 @@ sub get_port
 						return "--dport $$hash{$key}[15] ";
 					 }else{
 						 $$hash{$key}[15] =~ s/\:/-/g;
-						return ":$$hash{$key}[15]";
+						 return ":$$hash{$key}[15]";
 					 }
 				}
 			}elsif($$hash{$key}[13] ne '' && $$hash{$key}[13] ne 'All ICMP-Types'){
@@ -585,7 +585,7 @@ sub get_port
 			}
 		}elsif($$hash{$key}[14] eq 'cust_srv'){
 			if ($prot ne 'ICMP'){
-				if($$hash{$key}[31] eq 'dnat'){
+				if($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
 					return ":".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
 				}else{
 					return "--dport ".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index fd00c156d..cda2b8c51 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -378,7 +378,7 @@ if ($fwdfwsettings{'ACTION'} eq 'copyrule')
 	$fwdfwsettings{'copyfwrule'}='on';
 	&newrule;
 }
-if ($fwdfwsettings{'ACTION'} eq '')
+if ($fwdfwsettings{'ACTION'} eq '' or $fwdfwsettings{'ACTION'} eq 'reset')
 {
 	&base;
 }
@@ -2393,7 +2393,6 @@ END
 				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{'fwdfw pol allow'}</font></td></tr>";
 			}
 		}else{
-			print"uzlputz daneben";
 			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 pol block'}</font></td></tr>";
 		}
 		print"</table>";