webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 04:05:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Locale::Country to Locale::Codes::Country in various scripts.

Browse Source 
The new Locale-Country version needs to be loaded and used by specifing
Locale::Codes::Country since an upstream API change. Adjusting various perl
scripts to use the module in the proper way again.
This commit is contained in:
Stefan Schantl
2015-04-22 18:18:38 +02:00
parent a54ec49e18
commit b013822b99
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cfgroot/general-functions.pl
View File

@@ -17,7 +17,7 @@ package General;
use strict;
use Socket;
use IO::Socket;
use Locale::Country;
use Locale::Codes::Country;
use Net::SSLeay;
use Net::IPv4Addr qw(:all);
$|=1; # line buffering

4
config/cfgroot/geoip-functions.pl
View File

@@ -23,7 +23,7 @@
package GeoIP;
use Locale::Country;
use Locale::Codes::Country;
# Function to get the flag icon for a specified country code.
sub get_flag_icon($) {
@@ -81,7 +81,7 @@ sub get_full_country_name($) {
elsif ($code eq "yu") { $name = "Yugoslavia" }
else {
# Use perl built-in module to get the country code.
$name = &Locale::Country::code2country($code);
$name = &Locale::Codes::Country::code2country($code);
}
return $name;

2
html/cgi-bin/country.cgi
View File

@@ -21,7 +21,7 @@
use strict;
use Locale::Country;
use Locale::Codes::Country;
my $flagdir = '/srv/web/ipfire/html/images/flags';
my $lines = '1';

6
html/cgi-bin/tor.cgi
View File

@@ -20,7 +20,7 @@
###############################################################################
use strict;
use Locale::Country;
use Locale::Codes::Country;
# enable only the following on debugging purpose
use warnings;
@@ -323,9 +323,9 @@ END
<option value=''>- $Lang::tr{'tor exit country any'} -</option>
END
my @country_names = Locale::Country::all_country_names();
my @country_names = Locale::Codes::Country::all_country_names();
foreach my $country_name (sort @country_names) {
my $country_code = Locale::Country::country2code($country_name);
my $country_code = Locale::Codes::Country::country2code($country_name);
$country_code = uc($country_code);
print "<option value='$country_code'";