From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/2] dhcp.cgi: Fix for bug#10629 - update bgcolor to css
Date: Mon, 13 Feb 2023 18:55:14 +0100
Message-ID: <20230213175515.18840-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3648312720401223685=="
List-Id: <development.lists.ipfire.org>

--===============3648312720401223685==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- bgcolor was deprecated in HTML 4.01 and is not supported by HTML 5
- The orange colour for IP's that are outside the IPFire green and blue subne=
ts does not
   work on any browser I am using.
- I used the CSS approach that @Leo used in the Zone Configuration cgi page
- This patch changes all existing bgcolor entries to the css based background=
-color
- Tested on my vm testbed and confirmed to work. The Orange colour for IP's o=
utside of
   the subnet now shows up.

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dhcp.cgi | 44 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 125713285..2d162b204 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -113,6 +113,27 @@ foreach my $itf (@ITFs) {
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
 &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", =
\%color);
=20
+###--- HTML HEAD ---###
+my $extraHead =3D <<END
+<style>
+	.row-color20 {
+		background-color: $color{'color20'};
+	}
+	.row-color22 {
+		background-color: $color{'color22'};
+	}
+	.row-colouryellow {
+		background-color: $Header::colouryellow;
+	}
+	.cell-orange {
+		background-color: orange;
+	}	=09
+</style>
+END
+;
+###--- END HTML HEAD ---###
+
+
 #Get GUI values
 &Header::getcgihash(\%dhcpsettings);
=20
@@ -547,7 +568,8 @@ if ($dhcpsettings{'ACTION'} eq '' ) { # First launch from=
 GUI
     $dhcpsettings{'ADVOPT_ENABLED'} =3D 'on';
     }
=20
-&Header::openpage($Lang::tr{'dhcp configuration'}, 1, '');
+### START PAGE ###
+&Header::openpage($Lang::tr{'dhcp configuration'}, 1, $extraHead);
 &Header::openbigbox('100%', 'left', '', $errormessage);
=20
 if ($errormessage) {
@@ -843,11 +865,11 @@ foreach my $line (@current1) {
     }
=20
     if ($dhcpsettings{'KEY1'} eq $key) {
-	print "<tr bgcolor=3D'${Header::colouryellow}'>";
+	print "<tr class=3D'row-colouryellow'>";
     } elsif ($key % 2) {
-	print "<tr bgcolor=3D'$color{'color22'}'>";
+	print "<tr class=3D'row-color22'>";
     } else {
-	print "<tr bgcolor=3D'$color{'color20'}'>";
+	print "<tr class=3D'row-color20'>";
     }
=20
     print <<END
@@ -1069,13 +1091,13 @@ foreach my $line (@current2) {
=20
     if ($dhcpsettings{'KEY2'} eq $key) {
 	print "<tr>";
-	$col=3D"bgcolor=3D'${Header::colouryellow}'";
+	$col=3D"class=3D'row-colouryellow'";
     } elsif ($key % 2) {
 	print "<tr>";
-	$col=3D"bgcolor=3D'$color{'color20'}'";
+	$col=3D"class=3D'row-color20'";
     } else {
 	print "<tr>";
-	$col=3D"bgcolor=3D'$color{'color22'}'";
+	$col=3D"class=3D'row-color22'";
     }
     my $TAG0 =3D '';
     my $TAG1 =3D '';
@@ -1091,12 +1113,12 @@ foreach my $line (@current2) {
 	$TAG3 =3D '</b>';
     }
     if ($ipoutside{$temp[1]} > 0) {
-	$TAG4 =3D "bgcolor=3D'orange'" if ($dhcpsettings{'KEY2'} ne $key);
+	$TAG4 =3D "class=3D'cell-orange'" if ($dhcpsettings{'KEY2'} ne $key);
     }
=20
     print <<END
 <td align=3D'center' $col>$TAG2$temp[0]$TAG3</td>
-<td align=3D'center' $col $TAG4>$TAG0$temp[1]$TAG1</td>
+<td align=3D'center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
 <td align=3D'center' $col>$temp[6]&nbsp;</td>
 <td align=3D'center' $col>$temp[3]&nbsp;</td>
 <td align=3D'center' $col>$temp[4]&nbsp;</td>
@@ -1153,8 +1175,8 @@ print <<END
 </tr>
 <tr>
 	<td>&nbsp;</td>
-	<td bgcolor=3D'orange'>&nbsp;</td>
-	<td class=3D'base'>$Lang::tr{'ip address outside subnets'}</td>
+	<td>&nbsp;</td>
+	<td class=3D'base cell-orange'>$Lang::tr{'ip address outside subnets'}</td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>
 	$dup
--=20
2.39.1


--===============3648312720401223685==--