From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 04/11] country.cgi: Use own location-functions. Date: Tue, 22 Sep 2020 20:25:02 +0200 Message-ID: <20200922182509.18643-4-stefan.schantl@ipfire.org> In-Reply-To: <20200922182509.18643-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3513569611767767359==" List-Id: --===============3513569611767767359== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Signed-off-by: Stefan Schantl --- html/cgi-bin/country.cgi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index a1cf24347..b519d89b3 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -21,8 +21,6 @@ use strict; -use Locale::Codes::Country; - my $col; my $lines = '1'; my $lines2 = ''; @@ -32,6 +30,8 @@ require "${General::swroot}/location-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; +require "${General::swroot}/location-functions.pl"; + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'countries'}, 1, ''); @@ -52,8 +52,11 @@ print< END +# Init libloc database connection. +my $db_handle = &Location::Functions::init(); + # Get a list of all supported country codes. -my @countries = Locale::Codes::Country::all_country_codes(); +my @countries = &Location::database_countries($db_handle); # Loop through whole country list. foreach my $country (@countries) { -- 2.20.1 --===============3513569611767767359==--