From: Alexander Marx <amarx@ipfire.org>
Date: Mon, 8 Apr 2013 13:32:49 +0000 (+0200)
Subject: Forward Firewall: little changes in ruletable layout. (Headline)
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=ed618226bb7f03b3a12155d8f2d1bcdb58adb566

Forward Firewall: little changes in ruletable layout. (Headline)
---

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 68a18b428..584f7f093 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -77,7 +77,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.2';
+my $VERSION='0.9.9.3';
 my $color;
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
@@ -593,7 +593,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; text-decoration: blink;'>&nbsp &nbsp $Lang::tr{'fwhost reread'}</div</td></tr></table></form><hr><br>";
 	}
-	&Header::openbox('100%', 'left', $Lang::tr{'firewall'});
+	&Header::openbox('100%', 'left', "");
 	print "<form method='post'>";
 	print "<table border='0'>";
 	print "<tr><td><input type='submit' name='ACTION' value='$Lang::tr{'fwdfw newrule'}'></td>";
@@ -1622,11 +1622,7 @@ sub newrule
 		}	
 	}
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw addrule'});
-	if ($fwdfwsettings{'TIME'} eq 'ON'){	
-		$fwdfwsettings{'TIME_FROM'} = &timeconvert($fwdfwsettings{'TIME_FROM'},'');
-		$fwdfwsettings{'TIME_TO'} = &timeconvert($fwdfwsettings{'TIME_TO'},'');
-	}
-print "<form method='post'>";
+	print "<form method='post'>";
 	&Header::closebox();
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
 	#------SOURCE-------------------------------------------------------
@@ -2241,11 +2237,11 @@ sub validremark
 sub viewtablerule
 {
 	&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
-	&viewtablenew(\%configdmzfw,$configdmz,$Lang::tr{'fwdfw rules'},"DMZ" );
+	&viewtablenew(\%confignatfw,$confignat,"$Lang::tr{'fwdfw rules'}","Portforward / SNAT" );
 	&viewtablenew(\%configfwdfw,$configfwdfw,"","Forward" );
-	&viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'external access'} );
 	&viewtablenew(\%configoutgoingfw,$configoutgoing,"","Outgoing" );
-	&viewtablenew(\%confignatfw,$confignat,"","NAT" );
+	&viewtablenew(\%configinputfw,$configinput,"",$Lang::tr{'fwdfw xt access'} );
+	&viewtablenew(\%configdmzfw,$configdmz,"","DMZ" );
 }
 sub viewtablenew
 {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 865a9348f..485c9ff4e 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -892,7 +892,7 @@
 'fwdfw additional'		=> 'Zusätzlich',
 'fwdfw action'			=> 'Aktion',
 'fwdfw menu' 			=> 'Firewall',
-'fwdfw addrule' 		=> 'Neue Regel hinzufügen:',
+'fwdfw addrule' 		=> 'Regel hinzufügen/ändern:',
 'fwdfw addr grp' 		=> 'Adressgruppen:',
 'fwdfw change'			=> 'Aktualisieren',
 'fwdfw cust addr' 		=> 'Custom Adressen:',
@@ -966,11 +966,12 @@
 'fwdfw wd_fri'			=> 'Fr',
 'fwdfw wd_sat'			=> 'Sa',
 'fwdfw wd_sun'			=> 'So',
+'fwdfw xt access'		=> 'Zugriff auf Firewall',
 'fwhost addgrp' 		=> 'Gruppe:',
 'fwhost addgrpname'		=> 'Gruppenname:',
 'fwhost addhost' 		=> 'Adresse:',
 'fwhost addnet' 		=> 'Netzwerk:',
-'fwhost addrule' 		=> 'Neue Regel hinzufügen:',
+'fwhost addrule' 		=> 'Regel hinzufügen/ändern:',
 'fwhost any'			=> 'Alle',
 'fwhost attention'		=> 'ACHTUNG',
 'fwhost back'			=> 'Zurück',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f3ce76bf7..bf730ff68 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -917,7 +917,7 @@
 'fwdfw additional'		=> 'Additional',
 'fwdfw action'			=> 'Action',
 'fwdfw menu' 			=> 'Firewall',
-'fwdfw addrule' 		=> 'Add new rule:',
+'fwdfw addrule' 		=> 'Add/Edit rule:',
 'fwdfw addr grp' 		=> 'Adress groups:',
 'fwdfw change'			=> 'Update',
 'fwdfw cust addr' 		=> 'Custom addresses:',
@@ -980,8 +980,8 @@
 'fwdfw togglelog'		=> 'Activate or deactivate logging',
 'fwdfw use nat'			=> 'Use NAT',
 'fwdfw useless rule'	=> 'This rule is rejected (useless).',
-'fwdfw use srcport'		=> 'Use sourceport',
-'fwdfw use srv'			=> 'Use targetport',
+'fwdfw use srcport'		=> 'Use source port',
+'fwdfw use srv'			=> 'Use target port',
 'fwdfw natport used'	=> 'The NAT port is already used by another DNAT rule',
 'fwdfw newrule' 		=> 'New rule',
 'fwdfw wd_mon'			=> 'Mon',
@@ -991,11 +991,12 @@
 'fwdfw wd_fri'			=> 'Fri',
 'fwdfw wd_sat'			=> 'Sat',
 'fwdfw wd_sun'			=> 'Sun',
+'fwdfw xt access'		=> 'Access to firewall',
 'fwhost addgrp' 		=> 'Group:',
 'fwhost addgrpname'		=> 'Groupname:',
 'fwhost addhost' 		=> 'Address:',
 'fwhost addnet' 		=> 'Network:',
-'fwhost addrule' 		=> 'Add new rule:',
+'fwhost addrule' 		=> 'Add/Edit rule:',
 'fwhost any'			=> 'Any',
 'fwhost attention'		=> 'ATTENTION',
 'fwhost back'			=> 'back',