From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 2/2] dns.cgi: Fixes bug#12395 - German umlauts not correctly displayed in remarks Date: Mon, 11 Mar 2024 13:19:09 +0100 Message-ID: <20240311121909.5445-2-adolf.belka@ipfire.org> In-Reply-To: <20240311121909.5445-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8401913097065111864==" List-Id: --===============8401913097065111864== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - If Freifunk M=C3=BCnchen e.V. is entered as a remark it gets converted to Freifunk M=C3=83=C2=BCnchen e.V. - This is because cleanhtml is used on the UTF-8 remark text before saving it= to the file and the HTML::Entities::encode_entities command that is run on that remark= text does not work with UTF-8 text. - If the UTF-8 text in the remark is decoded before running through the clean= html command then the characters with diacritical marks are correctly shown. - Have tested out the fix on a remark with a range of different characters wi= th diacritical marks and all of the ones tested were displayed correctly with= the fix while in the original form they were mangled. Fixes: Bug#12395 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/dns.cgi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 0a34d3fd6..eb6f908d5 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -142,6 +142,13 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cg= iparams{'SERVERS'} eq $L # Go further if there was no error. if ( ! $errormessage) { # Check if a remark has been entered. + + # decode the UTF-8 text so that characters with diacritical marks such as + # umlauts are treated correctly by the following cleanhtml command + $cgiparams{'REMARK'} =3D decode("UTF-8", $cgiparams{'REMARK'}); + + # run the REMARK text through cleanhtml to ensure all unsafe html characte= rs + # are correctly encoded to their html entities $cgiparams{'REMARK'} =3D &Header::cleanhtml($cgiparams{'REMARK'}); =20 my %dns_servers =3D (); --=20 2.44.0 --===============8401913097065111864==--