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] firewalllogcountry.dat: Do not show 'Details' button for
 unkonw location.
Date: Sun, 18 Oct 2015 18:54:58 +0100
Message-ID: <1445190898.2626.4.camel@ipfire.org>
In-Reply-To: <1445167412-3298-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5232789545276015009=="
List-Id: <development.lists.ipfire.org>

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

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>";
>    }

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldJOXp5QUFvSkVJQjU4UDl2a0FrSDI4QVFBSTFocUpGUjhkdjF0NDZ3VXplcDNaczIK
RTJqOXBhbHk4VCtwc0NOOVU2YTNkTXNZc1lWa0JoNzQ0OUEzWitzZzNtajVMd3VLdXFsS1V6b1Z4
Um84eklMRgpGMUVaRnVnTUZSd0dnMThhVWxOMW1tdXlHSldKNDhhSDBDbFY3dWlxRWh4bDZyQnhJ
MTJZL1o1NTd0NndFcUdOClhwRXdRdUk1UUFaTTFta3dhOVZwcjJMWDcwS25BbjlFb2FhWjI4OE55
UjV6UmhmNzRJQnZSSFR6US9ZMFJ0QVMKZlpzOVZOd2hYaXhHY3ZhUXdUczVFajJsbDBhZnc1R3Zv
WEVOdjBFQlNLTXlqY2tLZmVZdkhPNU1ZeTNKTXZ0Vwphd0orSVRXalZyUUFZSEc1bkp6cFlxMDBO
d1RsRUdKODlKbGJoWHN6Ky9GWWI3RDE1RnlJREdtMDV3aEE4Ti9DCnpLY1NXTzg0UnJtS1hoZXBh
TzJtRm1yUHZWNGJLR2ZmeGU2SHFDODErQytzVWM2K0FpenNpaEVnME5HTXNESDIKV0JGVURVTnp4
ejdvNTlLQThaTnY3MTlXRitQSUpiRjRxV25KaUFZWnFIUmRnbmJlT0dzNS9GR09qdXdGaFZobAor
SFB4TW9yVFhDamQ3MnRoT1V4V21ZV2ViMGNiVS9TMDlTSkd3Y2JaQlYvemF1OWxOY3pFemQxTnNM
dmtPRktYClZMY3l3V29kOC9LTXZiTnk5VWs1Z2VydUc5Z2ZUb1RxcVAvVkVmazB3c212Z3NoZTFy
cHhFYm95bmRDL0JCMFgKRWNoSVl2OG5QMExrd1FzZkZJWTNQNFVDZExNd0VGc3o5bmhPZFhiMk41
c0FYSzFWVkJaMXNSNUtKZlNpdUd5SApUWFFTZGo4MXNJdVVVMDF0dENyTAo9ZS8rLwotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============5232789545276015009==--