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 { "$_" } @v); + local $txt = &text("desc_$d$n", map { "$_" } @v); push(@c, $txt) if ($txt); } } diff --git a/firewall/index.cgi b/firewall/index.cgi index b3efbc0b3..f8ba313ec 100755 --- a/firewall/index.cgi +++ b/firewall/index.cgi @@ -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,7 +249,8 @@ 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)); @@ -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/