tor.cgi: Fix missing country flag icons.

The CGI now is using the GeoIP::get_flag_icon function provided by the
geoip-functions.pl, which takes care of the changed flag icons shipped
by core update 90.

Fixes #10919.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Tested-by: Jan Paul Tuecking <jan.paul.tuecking@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 91f4b45feb9c6fd1541c13d3d29c223d20e43502..193e4059f6de97a9481d6c36a48d0d6ddc3e4af9 100644 (file)
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -27,6 +27,7 @@ use warnings;
 use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -619,10 +620,14 @@ END
 END
 
                                if (exists($node->{'country_code'})) {
-                                       if (!$node->{'country_code'} or $node->{'country_code'} eq '??') {
-                                               print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
+                                       # Get the flag icon of the country.
+                                       my $flag_icon = &GeoIP::get_flag_icon($node->{'country_code'});
+
+                                       # Check if a flag for the given country is available.
+                                       if ($flag_icon) {
+                                               print "<a href='country.cgi#$node->{'country_code'}'><img src='$flag_icon' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
                                        } else {
-                                               print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
+                                               print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
                                        }
                                }
 

diff --git a/lfs/tor b/lfs/tor
index c21e4b4de8cc27b4382f43fe704b526a54afcead..91eab09b9f19855d6233f90592526e952d71cbab 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       = ""