From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] header.pl: Add utf-8 handling into cleanhtml command Date: Mon, 17 Jun 2024 13:12:35 +0200 Message-ID: <20240617111236.2926-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5657331566081248312==" List-Id: --===============5657331566081248312== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - existing cleanhtml command does not handle diacritical charcters such as um= lauts, acute, grave and circumflex accents. - In bug 12395 the problem was resolved by adding decode before and encode af= ter the cleanhtml command in dns.cgi - Suggestion from @Michael Tremer was to add the decode and encode sections i= nto the actual cleanhtml subroutine in header.pl - This patch submission is the execution of that suggestion. - This will ensure that whenever cleanhtml is used for any remark in a WUI pa= ge it will handle diacritical charcters. - Tested out on my vm testbed system and confirmed to be working when cleanht= ml has the encode and decode lines. - Combined with this patch is another one that changes the dns.cgi to remove = the decode and encode entries added into the cgi code. Suggested-by: Michael Tremer Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/cfgroot/header.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index a67ff92ee..66b49e411 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -16,6 +16,7 @@ use File::Basename; use HTML::Entities(); use Socket; use Time::Local; +use Encode; =20 our %color =3D (); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", = \%color); @@ -365,8 +366,13 @@ sub escape($) { sub cleanhtml { my $outstring =3D$_[0]; $outstring =3D~ tr/,/ / if not defined $_[1] or $_[1] ne 'y'; - - return escape($outstring); + # decode the UTF-8 text so that characters with diacritical marks such as + # umlauts are treated correctly by the escape command + $outstring =3D &Encode::decode("UTF-8",$outstring); + escape($outstring); + # encode the text back to UTF-8 after running the escape command + $outstring =3D &Encode::encode("UTF-8",$outstring); + return $outstring; } =20 sub connectionstatus --=20 2.45.2 --===============5657331566081248312==--