From d9cc4509d29319321414994a6b84b089cd570523 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Wed, 24 May 2017 09:43:11 +0200
Subject: [PATCH 1/4] correct solution for missing 1st col

---
 firewall/index.cgi | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/firewall/index.cgi b/firewall/index.cgi
index b3efbc0b3..24466d1fc 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 # index.cgi
 # Display current iptables firewall configuration from save file
 
@@ -213,10 +213,10 @@ else {
 			# Generate the header
 			local (@hcols, @tds);
 			push(@hcols, "", $text{'index_action'});
-			push(@tds, "width=5", "width=10% nowrap");
+			push(@tds, "width=5", "width=20% nowrap");
 			if ($config{'view_condition'}) {
 				push(@hcols, $text{'index_desc'});
-				push(@tds, "");
+				push(@tds, "nowrap");
 				}
 			if ($config{'view_comment'}) {
 				push(@hcols, $text{'index_comm'});
@@ -249,10 +249,11 @@ else {
 					push(@cols, &ui_link("edit_rule.cgi?table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
 					}
 				else {
-					push(@cols, $act);
+                                        # add col for not visible checkmark
+					push(@cols, "", $act);
 					}
 				if ($config{'view_condition'}) {
-					push(@cols, &describe_rule($r));
+					push(@cols, $tmp=&describe_rule($r));
 					}
 				if ($config{'view_comment'}) {
 					$cmt = $config{'comment_mod'} ||
@@ -304,10 +305,7 @@ else {
                                             \@cols, \@tds, "d", $r->{'index'});
                                         }
                                 else {
-                                        local $r=&ui_columns_row(\@cols, \@tds);
-                                        # fix missing first colum, need be a better solution ...
-                                        $r=~ s/<td /<td ><\/td><td width="30%" /;
-                                        print $r;
+                                        print &ui_columns_row(\@cols, \@tds);
                                         }
                                 }
 			print &ui_columns_end();

From e46c7ceb4478cc005cb1bb8101e3aca90583a4d8 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Wed, 24 May 2017 09:44:28 +0200
Subject: [PATCH 2/4] replace <b> with <strong> => no <br> in table row

---
 firewall/firewall-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firewall/firewall-lib.pl b/firewall/firewall-lib.pl
index 8cdd649a0..d43c3ef3f 100755
--- a/firewall/firewall-lib.pl
+++ b/firewall/firewall-lib.pl
@@ -222,7 +222,7 @@ foreach $d ('p', 's', 'd', 'i', 'o', 'f', 'dport',
 		@v = map { uc($_) } @v if ($d eq 'p');
 		@v = map { join(", ", split(/,/, $_)) } @v
 			if ($d eq 's' || $d eq 'd');
-		local $txt = &text("desc_$d$n", map { "<b>$_</b>" } @v);
+		local $txt = &text("desc_$d$n", map { "<strong>$_</strong>" } @v);
 		push(@c, $txt) if ($txt);
 		}
 	}

From 2afd4a1dc5af13bee9c3d7817c7373ddf4fd0712 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Wed, 24 May 2017 09:47:31 +0200
Subject: [PATCH 3/4] remove forgotten debug

---
 firewall/index.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firewall/index.cgi b/firewall/index.cgi
index 24466d1fc..ff7b7c3fd 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -253,7 +253,7 @@ else {
 					push(@cols, "", $act);
 					}
 				if ($config{'view_condition'}) {
-					push(@cols, $tmp=&describe_rule($r));
+					push(@cols, &describe_rule($r));
 					}
 				if ($config{'view_comment'}) {
 					$cmt = $config{'comment_mod'} ||

From 989c7590369c30931f243d8bbcf532a97eb51711 Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Wed, 24 May 2017 09:48:46 +0200
Subject: [PATCH 4/4] /usr/LOCAL/bin/perl

---
 firewall/index.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firewall/index.cgi b/firewall/index.cgi
index ff7b7c3fd..f8ba313ec 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 # index.cgi
 # Display current iptables firewall configuration from save file