Re: [PATCH v2] tor.cgi: fix calling Perl location module functions

[Adolf Belka <ahb.ipfire@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1697 bytes --]

Hi Michael,

I installed tor and confirmed that the last part of the tor page was missing.
I then patched the tor.cgi file with Peter's patch and then the whole tor page was now being shown. I was able to enable tor and save and tor was then shown as running.

I can confirm that the patch works.

Regards,
Adolf.

On 10/10/2020 13:46, Michael Tremer wrote:
> Could anyone please test this and confirm that it works?
> 
>> On 9 Oct 2020, at 20:20, Peter Müller <peter.mueller(a)ipfire.org> wrote:
>>
>> 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'";
>>
>> -- 
>> 2.26.2
>