From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] dns.cgi: Add use Encode + encode back to UTF-8
Date: Wed, 13 Mar 2024 23:12:12 +0100
Message-ID: <20240313221212.2653062-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3181070717617017034=="
List-Id: <development.lists.ipfire.org>

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

- use Encode was missed out in the previous patch for dns.cgi This would mean=
 that the
   decode from UTF-8 would fail. I had tested the previous change but forgot =
to copy across
   the use Encode line when I created the patch.
- This patch adds an encode back to UTF-8 after running the cleanhtml command=
. This way
   the text is decoded from UTF-8 so that the cleanhtml command works correct=
ly on
   umlauted characters and then is encoded back to UTF-8 so that all text in =
the cgi page
   is UTF-8.

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dns.cgi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index eb6f908d5..c864c127d 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2020  IPFire Development Team                               =
  #
+# Copyright (C) 2005-2024  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -21,6 +21,7 @@
=20
 use strict;
 use IO::Socket;
+use Encode;
=20
 # enable only the following on debugging purpose
 #use warnings;
@@ -151,6 +152,9 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cgi=
params{'SERVERS'} eq $L
 		# are correctly encoded to their html entities
 		$cgiparams{'REMARK'} =3D &Header::cleanhtml($cgiparams{'REMARK'});
=20
+		# encode the text back to UTF-8 after running the cleanhtml command
+		$cgiparams{'REMARK'} =3D encode("UTF-8", $cgiparams{'REMARK'});
+	=09
 		my %dns_servers =3D ();
 		my $id;
 		my $status;
--=20
2.44.0


--===============3181070717617017034==--