From 770140a7bfb302261d1e79d3b9add20be6b2b7ed Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Tue, 26 Feb 2013 14:34:30 +0100
Subject: [PATCH] Forward Firewall: removed some text in p2p-block and changed
 dropdown to radiobutton in optionsfw

---
 html/cgi-bin/optionsfw.cgi | 31 +++++++++++++++++++------------
 langs/de/cgi-bin/de.pl     |  2 +-
 langs/en/cgi-bin/en.pl     |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index ab34230819..fc9b3d0ca0 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -37,6 +37,7 @@ $settings{'DROPWIRELESSINPUT'} = 'on';
 $settings{'DROPWIRELESSFORWARD'} = 'on';
 $settings{'SHOWCOLORS'} = 'off';
 $settings{'SHOWREMARK'} = 'on';
+$settings{'SHOWTABLES'} = 'on';
 
 my $errormessage = '';
 my $warnmessage = '';
@@ -99,8 +100,15 @@ $checked{'SHOWCOLORS'}{$settings{'SHOWCOLORS'}} = "checked='checked'";
 $checked{'SHOWREMARK'}{'off'} = '';
 $checked{'SHOWREMARK'}{'on'} = '';
 $checked{'SHOWREMARK'}{$settings{'SHOWREMARK'}} = "checked='checked'";
-$selected{'FWPOLICY'}{$settings{'FWPOLICY'}}= 'selected';
-$selected{'FWPOLICY1'}{$settings{'FWPOLICY1'}}= 'selected';
+$checked{'SHOWTABLES'}{'off'} = '';
+$checked{'SHOWTABLES'}{'on'} = '';
+$checked{'SHOWTABLES'}{$settings{'SHOWTABLES'}} = "checked='checked'";
+$checked{'FWPOLICY'}{'DROP'} = '';
+$checked{'FWPOLICY'}{'REJECT'} = '';
+$checked{'FWPOLICY'}{$settings{'FWPOLICY'}} = "checked='checked'";
+$checked{'FWPOLICY1'}{'DROP'} = '';
+$checked{'FWPOLICY1'}{'REJECT'} = '';
+$checked{'FWPOLICY1'}{$settings{'FWPOLICY1'}} = "checked='checked'";
 
 
 &Header::openbox('100%', 'center', $Lang::tr{'options fw'});
@@ -140,19 +148,18 @@ print <<END
 <tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>on <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/
 																						<input type='radio' name='SHOWCOLORS' value='off' $checked{'SHOWCOLORS'}{'off'} /> off</td></tr>
 <tr><td align='left' width='60%'>$Lang::tr{'fw settings remark'}</td><td align='left'>on <input type='radio' name='SHOWREMARK' value='on' $checked{'SHOWREMARK'}{'on'} />/
-																						<input type='radio' name='SHOWREMARK' value='off' $checked{'SHOWREMARK'}{'off'} /> off</td></tr>																						
-</table>																						
+																						<input type='radio' name='SHOWREMARK' value='off' $checked{'SHOWREMARK'}{'off'} /> off</td></tr>
+<tr><td align='left' width='60%'>$Lang::tr{'fw settings ruletable'}</td><td align='left'>on<input type='radio' name='SHOWTABLES' value='on' $checked{'SHOWTABLES'}{'on'} />/
+																						<input type='radio' name='SHOWTABLES' value='off' $checked{'SHOWTABLES'}{'off'} /> off</td></tr>
+</table>
 <br />
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>
-<tr><td align='left' width='60%'>$Lang::tr{'drop action'}</td><td><select name='FWPOLICY'>
-<option value='DROP' $selected{'FWPOLICY'}{'DROP'}>DROP</option>
-<option value='REJECT' $selected{'FWPOLICY'}{'REJECT'}>REJECT</option></select>
-</td></tr>
-<tr><td align='left' width='60%'>$Lang::tr{'drop action1'}</td><td><select name='FWPOLICY1'>
-<option value='DROP' $selected{'FWPOLICY1'}{'DROP'}>DROP</option>
-<option value='REJECT' $selected{'FWPOLICY1'}{'REJECT'}>REJECT</option></select>
-</td></tr>
+<tr><td align='left' width='60%'>$Lang::tr{'drop action'}</td><td align='left'>DROP <input type='radio' name='FWPOLICY' value='DROP' $checked{'FWPOLICY'}{'DROP'} />/
+																						<input type='radio' name='FWPOLICY' value='REJECT' $checked{'FWPOLICY'}{'REJECT'} /> REJECT</td></tr>
+<tr><td align='left' width='60%'>$Lang::tr{'drop action1'}</td><td align='left'>DROP <input type='radio' name='FWPOLICY1' value='DROP' $checked{'FWPOLICY1'}{'DROP'} />/
+																						<input type='radio' name='FWPOLICY1' value='REJECT' $checked{'FWPOLICY1'}{'REJECT'} /> REJECT</td></tr>
+
 </table>
 
 <br />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4b03b28784..4ba95c7e5a 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -924,7 +924,7 @@
 'fwdfw man port'		=> 'Port(s) manuell:',
 'fwdfw moveup'			=> 'Hoch',
 'fwdfw movedown'		=> 'Runter',
-'fwdfw p2p txt'			=> 'Hier können einzelne P2P Netzwerke erlaubt oder verboten werden. Das System setzt die Regeln automatisch unabhängig vom aktuellen Firewall Modus. Bitte beachten, dass ein erlaubtes P2P Netzwerk unter Umständen einen erheblichen Teil der Bandbreite beanspruchen kann, wenn der Client nicht korrekt konfiguriert ist. Eventuell sollten die QOS Einstellungen entsprechend gesetzt werden.',
+'fwdfw p2p txt'			=> 'Hier können einzelne P2P Netzwerke erlaubt oder verboten werden. Das System setzt die Regeln automatisch unabhängig vom aktuellen Firewall Modus. Bitte beachten, dass ein erlaubtes P2P Netzwerk unter Umständen einen erheblichen Teil der Bandbreite beanspruchen kann, wenn der Client nicht korrekt konfiguriert ist.',
 'fwdfw pol allow'		=> 'Zugelassen',
 'fwdfw pol block'		=> 'Blockiert',
 'fwdfw pol title'		=> 'Standardverhalten der Firewall',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index dfdd61f27d..6b9f6d4a57 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -949,7 +949,7 @@
 'fwdfw man port'		=> 'Port(s) manual:',
 'fwdfw moveup'			=> 'Move up',
 'fwdfw movedown'		=> 'Move down',
-'fwdfw p2p txt'			=> 'Here you can admit or deny or allow single p2p networks. Just define which networks are allowed or denied and the system takes care of the rules depending on the firewall mode. An allowed p2p network may use a lot of bandwith if the clients are not configured correctly. Maybe you should have a look at the QOS settings.',
+'fwdfw p2p txt'			=> 'Here you can admit or deny or allow single p2p networks. Just define which networks are allowed or denied and the system takes care of the rules depending on the firewall mode. An allowed p2p network may use a lot of bandwith if the clients are not configured correctly.',
 'fwdfw pol allow'		=> 'Allowed',
 'fwdfw pol block'		=> 'Blocked',
 'fwdfw pol title'		=> 'Firewall default behavior',
-- 
2.39.2