public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1445190898.2626.4.camel@ipfire.org> (raw)
In-Reply-To: <1445167412-3298-1-git-send-email-stefan.schantl@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1871 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

      parent reply	other threads:[~2015-10-18 17:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-18 11:23 Stefan Schantl
2015-10-18 15:10 ` IT Superhack
2015-10-18 17:54 ` Michael Tremer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445190898.2626.4.camel@ipfire.org \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox