Merged.

On Sun, 2015-10-18 at 13:23 +0200, Stefan Schantl wrote:
> The CGI offers the posibility to get more details for a certain
> locations
> by clicking on a button.
> 
> This feature cannot be used for the category "unknown". To prevent
> users
> from beeing confused about non show-able details, I added some code
> to hide
> this button for this category.
> 
> Fixes #10726.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  html/cgi-bin/logs.cgi/firewalllogcountry.dat | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi
> -bin/logs.cgi/firewalllogcountry.dat
> index 29c0842..f998a62 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> @@ -456,7 +456,17 @@ for($s=0;$s<$lines;$s++)
>    $color++;
>    print "<tr>";
>  
> -  print "<td align='center' $col><form method='post'
> action='showrequestfromcountry.dat'><input type='hidden' name='MONTH'
> value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY'
> value='$cgiparams{'DAY'}'> <input type='hidden' name='country'
> value='$key[$s]'> <input type='submit' value='details'></form></td>";
> +  print "<td align='center' $col>";
> +
> +  # Dont show details button for "unknown" location.
> +  if ($key[$s] ne 'unknown') {
> +	print"<form method='post'
> action='showrequestfromcountry.dat'>";
> +	print"<input type='hidden' name='MONTH'
> value='$cgiparams{'MONTH'}'>";
> +	print"<input type='hidden' name='DAY'
> value='$cgiparams{'DAY'}'>";
> +	print"<input type='hidden' name='country'
> value='$key[$s]'>";
> +	print"<input type='submit' value='details'></form>";
> +  }
> +
>    if($key[$s] eq 'blue0' || $key[$s] eq 'green0' || $key[$s] eq
> 'orange0') {
>        print "<td align='center' $col>$key[$s]</td>";
>    }