use Locale::Codes::Country;
-my $flagdir = '/srv/web/ipfire/html/images/flags';
+my $col;
my $lines = '1';
my $lines2 = '';
-my @flaglist=();
-my @flaglistfiles=();
-my $flag = '';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/geoip-functions.pl";
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
-print "<table class='tbl'>";
-print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
-print "<th> </th>";
-print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
-
-@flaglist = <$flagdir/*>;
-
-undef @flaglistfiles;
-
-foreach (@flaglist)
-{
- if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1)); }
-}
-my $col="";
-foreach $flag (@flaglistfiles)
-{
+
+print<<END;
+<table class='tbl'>
+ <tr>
+ <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+ <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th>
+ <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th>
+ <th> </th>
+ <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+ <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>
+ <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th>
+ </tr>
+END
+
+# Get a list of all supported country codes.
+my @countries = Locale::Codes::Country::all_country_codes();
+
+# Loop through whole country list.
+foreach my $country (@countries) {
$lines++;
- my $flagcode = uc(substr($flag, 0, 2));
- my $fcode = lc($flagcode);
+ # Convert country code into upper case.
+ $country = uc($country);
# Get flag icon for of the country.
- my $flag_icon = &GeoIP::get_flag_icon($fcode);
+ my $flag_icon = &GeoIP::get_flag_icon($country);
+
+ # Get country name.
+ my $name = &GeoIP::get_full_country_name($country);
- my $country = Locale::Country::code2country($fcode);
- if($fcode eq 'eu') { $country = 'Europe'; }
- if($fcode eq 'tp') { $country = 'East Timor'; }
- if($fcode eq 'yu') { $country = 'Yugoslavia'; }
if ($lines % 2) {
- print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
- print "<td $col>$flagcode</td>";
- print "<td $col>$country</td></tr>\n";
- }
- else {
+ print "<td $col><a id='$country'><img src='$flag_icon' alt='$country' title='$country'/></a></td>";
+ print "<td $col>$country</td>";
+ print "<td $col>$name</td></tr>\n";
+ } else {
$lines2++;
if($lines2 % 2) {
$col="style='background-color:${Header::table2colour};'";
$col="style='background-color:${Header::table1colour};'";
}
print "<tr>";
- print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
- print "<td $col>$flagcode</td>";
+ print "<td $col><a id='$country'><img src='$flag_icon' alt='$country' title='$country'/></a></td>";
print "<td $col>$country</td>";
+ print "<td $col>$name</td>";
print "<td $col> </td>";
+
+ # Finish column when the last element in the array has passed and we have an uneven amount of items.
+ if ( $country eq $countries[-1] ) {
+ print "<td $col> </td>\n";
+ print "<td $col> </td>\n";
+ print "<td $col> </td></tr>\n";
+ }
}
}
-
-
print "</table>";
&Header::closebox();
&Header::closebigbox();
-print <<END
-<div style='text-align:center'>
-<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
-</div>
-END
-;
+print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n";
&Header::closepage();