From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] tor.cgi: fix calling Perl location module functions
Date: Sun, 11 Oct 2020 19:39:50 +0200
Message-ID: <af8cbd254098b296f3e21f5ba99d7e3c8ed7ebf2.camel@ipfire.org>
In-Reply-To: <190f0a6c-c334-24d3-28ca-7f732aa0fc85@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2623897366345401284=="
List-Id: <development.lists.ipfire.org>

--===============2623897366345401284==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Hello Peter,

very good found and thanks for the patch.

Acked-By: Stefan Schantl <stefan.schantl(a)ipfire.org>

> The second version of this patch avoids re-defining $db_handle.
> 
> Fixes: #12492
> 
> Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
>  html/cgi-bin/tor.cgi | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> 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='TOR_EXIT_COUNTRY'>
>  						<option value=''>-
> $Lang::tr{'tor exit country any'} -</option>
>  END
> -
> -		my @country_codes = &Location::database_countries();
> +		my @country_codes =
> &Location::database_countries($db_handle);
>  		foreach my $country_code (@country_codes) {
>  			# Convert country code into upper case format.
>  			$country_code = uc($country_code);
>  
>  			# Get country name.
> -			my $country_name =
> &Location::Functions::get_country_name($country_code);
> +			my $country_name =
> &Location::Functions::get_full_country_name($country_code);
>  
>  			print "<option value='$country_code'";
>  


--===============2623897366345401284==--