From 96502a5a67692ae5fb06b9a83799c64040ced1df Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Fri, 22 Feb 2013 11:27:30 +0100
Subject: [PATCH] Forward Firewall: New Firewall-option "show remark in
 ruletable"

---
 html/cgi-bin/forwardfw.cgi | 8 +++++---
 html/cgi-bin/optionsfw.cgi | 6 ++++++
 langs/de/cgi-bin/de.pl     | 3 ++-
 langs/en/cgi-bin/en.pl     | 3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 2343c41ff..377654252 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -1900,7 +1900,7 @@ sub viewtablenew
 			}
 			print"<tr bgcolor='$color' >";
 			print<<END;
-			<td align='right' width='15'>$key</td>
+			<td align='right' width='15'><b>$key</b></td>
 END
 			if ($$hash{$key}[0] eq 'ACCEPT'){
 				$ruletype='A';
@@ -2038,8 +2038,10 @@ END
 				print"<td width='25'><input type='image' img src='/images/down.gif' style='visibility:hidden;'></td></tr>";
 			}
 			#REMARK
-			print"<tr bgcolor='$color'><td colspan='13' style='border-bottom: 1px solid black'>";
-			print"<b>$Lang::tr{'remark'}:</b>&nbsp$$hash{$key}[16]</td></tr>";
+			if ($optionsfw{'SHOWREMARK'} eq 'on'){
+				print"<tr bgcolor='$color'><td colspan='13' style='border-bottom: 1px solid black'>";
+				print"<b>$Lang::tr{'remark'}:</b>&nbsp$$hash{$key}[16]</td></tr>";
+			}
 		}
 		print"</table>";
 		&Header::closebox();
diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 39bd4195d..ab3423081 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -36,6 +36,7 @@ $settings{'DROPPORTSCAN'} = 'on';
 $settings{'DROPWIRELESSINPUT'} = 'on';
 $settings{'DROPWIRELESSFORWARD'} = 'on';
 $settings{'SHOWCOLORS'} = 'off';
+$settings{'SHOWREMARK'} = 'on';
 
 my $errormessage = '';
 my $warnmessage = '';
@@ -95,6 +96,9 @@ $checked{'DROPSAMBA'}{$settings{'DROPSAMBA'}} = "checked='checked'";
 $checked{'SHOWCOLORS'}{'off'} = '';
 $checked{'SHOWCOLORS'}{'on'} = '';
 $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';
 
@@ -135,6 +139,8 @@ print <<END
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr>
 <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>																						
 <br />
 <table width='95%' cellspacing='0'>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 95e62d6aa..1700cef19 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1047,6 +1047,7 @@
 'fw default drop' => 'Firewall Policy',
 'fw settings' => 'Firewall Einstellungen',
 'fw settings color' => 'Farben in Regeltabelle anzeigen',
+'fw settings remark' => 'Anmerkungen in Regeltabelle anzeigen',
 'fw logging' => 'Firewall Logging',
 'gateway' => 'Gateway',
 'gateway ip' => 'Gateway-IP',
@@ -1437,7 +1438,7 @@
 'network traffic graphs others' => 'Netzwerk (sonstige)',
 'network updated' => 'Benutzerdefiniertes Netzwerk aktualisiert',
 'networks settings' => 'Firewall - Netzwerkeinstellungen',
-'new optionsfw later' => 'Ihre Modifikation(en) wird (werden) beim nächsten Neustart aktiv werden',
+'new optionsfw later' => 'Einige Einstellungen werden erst nach einem Neustart aktiv',
 'new optionsfw must boot' => 'Sie müssen Ihren IPFire neu starten',
 'newer' => 'Neuer',
 'next' => 'Nächster',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index cdf76a7a8..ceb726e80 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1072,6 +1072,7 @@
 'fw default drop' => 'Firewall policy',
 'fw settings' => 'Firewall settings',
 'fw settings color' => 'Show colors in ruletable',
+'fw settings remark' => 'Show remarks in ruletable',
 'fw logging' => 'Firewall logging',
 'g.dtm' => 'TO BE REMOVED',
 'g.lite' => 'TO BE REMOVED',
@@ -1465,7 +1466,7 @@
 'network traffic graphs others' => 'Network (others)',
 'network updated' => 'Custom Network updated',
 'networks settings' => 'Firewall - Network settings',
-'new optionsfw later' => 'Your modification(s) will be active on next restart',
+'new optionsfw later' => 'Some options need a reboot to take effect',
 'new optionsfw must boot' => 'You must reboot your IPFire',
 'newer' => 'Newer',
 'next' => 'next',
-- 
2.39.2