From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] tor.cgi: Fix missing country flag icons.
Date: Thu, 15 Oct 2015 15:43:20 +0100
Message-ID: <1444920200.18375.36.camel@ipfire.org>
In-Reply-To: <1444493258-24392-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4596824337539690300=="
List-Id: <development.lists.ipfire.org>

--===============4596824337539690300==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Merged. Thanks.

On Sat, 2015-10-10 at 18:07 +0200, Stefan Schantl wrote:
> 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(a)ipfire.org>
> Tested-by: Jan Paul Tuecking <jan.paul.tuecking(a)ipfire.org>
> ---
>  html/cgi-bin/tor.cgi | 11 ++++++++---
>  lfs/tor              |  2 +-
>  2 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
> index 91f4b45..193e405 100644
> --- 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 c21e4b4..91eab09 100644
> --- 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       = ""
>  

--===============4596824337539690300==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldIN3VJQUFvSkVJQjU4UDl2a0FrSHNaVVFBS1ZlRUp3aTFHcVliNVdXd2ZSY0pMMUoK
NFBucDhndGhRTVI1aHpQUUxRMzRXNkhpdmpuWDdlSTc4cDEvV05FMGlWaTJuVmh3UWUxZVh3djMz
S1V1V1NoYgprRVI5WlZFancybG5aaWkydm9wbzdDT05IMEhqM1l3SnFwa0xGZGlHUW5tNGJWRkJF
K1RjUmViUlFoUUgrcURhCllwWjNEY1JIYXdZNG5majQ5RXE2OU5sQmNabXJ3Q2xndW9jZG9wU0Zu
Zi9ZR1JETlFYdEphTWNyVnhGS1p1L0EKM0RBQVRhQ2cwYWNDM0NpSG5mWFFWU1JTYnZRWmJDY3VU
bWtvdzdzV0c5V05OVGdIL3pYUEVYNksvUGRUUDVicwpDVm5EVDNLK0J1OGQyUmNNcGpxMWh2M2RX
L2hOMmxGSkJCZVFsMzVIYTZnYlgwK01UZW1QTHpGSUR3bG95VjlRCjFQVWNXUDFlaVU3QXRQM0hM
eS9RTEc5ZkdEcnpxMXg1YWlIeWROV3dBYW81LzBDUmVUTmFMd2RnOFpwa0ZZZEcKcUxvZm9kMVFv
c1pteFpEeVBZZ01hU1Z2L3ZBUHBjeUYzcDVwR2k1ODd5QXhEeXluZVJyK2xSN00yU2xXZlpKbQpj
QU9ONFVJTXVWYmdXN3FvckNhK1l5cmpzcVJmem11L05Yd3lyek9qTDNLcEpPVUtWU3lVK0hKbWt3
cmZCbFFsCnU1UFVxcjhiUmVDZjRnODc5UjZLb0FaSG44dmlHKzhYWG1nUzBBU0Q3MFJqT0E0bTBr
WDhRM011QXZQU29POFIKUUhHVXl0V1o0RnFFV0ZTbmZESzI0WUx4bG9QWkR0bEdKNG10VlRQQk1L
TkR6d3dDaXFwY0liTFNuQThSd3dyeAp5MjRneEs1UjFhYld6ekhYaVdEago9Y2gvdwotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============4596824337539690300==--