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 v2] tor.cgi: fix calling Perl location module functions
Date: Sun, 11 Oct 2020 18:42:26 +0100
Message-ID: <B9ED121A-1866-4A2C-9701-FB27A10D325F@ipfire.org>
In-Reply-To: <af8cbd254098b296f3e21f5ba99d7e3c8ed7ebf2.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1627311927394408339=="
List-Id: <development.lists.ipfire.org>

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

Hi Stefan,

Did you see that the same problem exists for the firewall rule pages?

-Michael

> On 11 Oct 2020, at 18:39, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> Hello Peter,
>=20
> very good found and thanks for the patch.
>=20
> Acked-By: Stefan Schantl <stefan.schantl(a)ipfire.org>
>=20
>> The second version of this patch avoids re-defining $db_handle.
>>=20
>> Fixes: #12492
>>=20
>> Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
>> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>> ---
>> html/cgi-bin/tor.cgi | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>=20
>> diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
>> index 28dec6cf0..7447bd791 100644
>> --- a/html/cgi-bin/tor.cgi
>> +++ b/html/cgi-bin/tor.cgi
>> @@ -322,14 +322,13 @@ END
>> 					<select
>> name=3D'TOR_EXIT_COUNTRY'>
>> 						<option value=3D''>-
>> $Lang::tr{'tor exit country any'} -</option>
>> END
>> -
>> -		my @country_codes =3D &Location::database_countries();
>> +		my @country_codes =3D
>> &Location::database_countries($db_handle);
>> 		foreach my $country_code (@country_codes) {
>> 			# Convert country code into upper case format.
>> 			$country_code =3D uc($country_code);
>>=20
>> 			# Get country name.
>> -			my $country_name =3D
>> &Location::Functions::get_country_name($country_code);
>> +			my $country_name =3D
>> &Location::Functions::get_full_country_name($country_code);
>>=20
>> 			print "<option value=3D'$country_code'";
>>=20
>=20


--===============1627311927394408339==--