From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] dns.cgi: Add use Encode + encode back to UTF-8
Date: Fri, 15 Mar 2024 10:24:09 +0000
Message-ID: <8ABBE629-9CEF-42B4-A429-E1598652E087@ipfire.org>
In-Reply-To: <2c913eab-1644-4527-8f18-9f806fb4f4a0@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8215644684239024036=="
List-Id: <development.lists.ipfire.org>

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

Hello Adolf,

Yes, editors sometimes have odd default settings. I don=E2=80=99t know why, b=
ecause I never feel like they would be the right thing for anyone.

However, we generally don=E2=80=99t want lines with just whitespace. We just =
want an empty line. =E2=80=9Cgit show=E2=80=9D shows any whitespace like that=
 in bright red and when you apply a patch it shows a warning.

I am not sure if we need to write down some guidelines anywhere for this thou=
gh. Everyone=E2=80=99s editor is different anyways.

-Michael

> On 14 Mar 2024, at 11:13, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> Hi Michael,
>=20
> I saw that this patch had been merged but then saw that you had added a pat=
ch to remove extraneous whitespace. I thought at first that I had added a bla=
nk line also to the dns.cgi file. Then looked at the patch and at first did n=
ot understand it because it looked like it had deleted a line and then added =
it back in.
>=20
> Eventually figured it out :-) My editor had automatic indentation turned on=
 and so it added in the tabs to get to the start of the previous line. I foun=
d that on some lines and removed it but missed it on that last line.
>=20
> I have now turned off the automatic indentation so that a blank line will i=
n fact stay blank with no spaces.
>=20
> Sorry about that.
>=20
> Regards,
> Adolf.
>=20
> On 13/03/2024 23:12, Adolf Belka wrote:
>> - use Encode was missed out in the previous patch for dns.cgi This would m=
ean that the
>>    decode from UTF-8 would fail. I had tested the previous change but forg=
ot 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 comm=
and. This way
>>    the text is decoded from UTF-8 so that the cleanhtml command works corr=
ectly 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 @@
>>    use strict;
>>  use IO::Socket;
>> +use Encode;
>>    # enable only the following on debugging purpose
>>  #use warnings;
>> @@ -151,6 +152,9 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($=
cgiparams{'SERVERS'} eq $L
>>   # are correctly encoded to their html entities
>>   $cgiparams{'REMARK'} =3D &Header::cleanhtml($cgiparams{'REMARK'});
>>  + # encode the text back to UTF-8 after running the cleanhtml command
>> + $cgiparams{'REMARK'} =3D encode("UTF-8", $cgiparams{'REMARK'});
>> +=20
>>   my %dns_servers =3D ();
>>   my $id;
>>   my $status;


--===============8215644684239024036==--