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] Match color coding of pie chart and table in
 firwalllog[ip|port|country].dat
Date: Thu, 07 Jan 2016 23:35:31 +0000
Message-ID: <1452209731.4749.5.camel@ipfire.org>
In-Reply-To: <568E4D0C.1060201@eitelwein.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5851788825313278252=="
List-Id: <development.lists.ipfire.org>

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

Hello Michael,

thank you very much for sending in your patches and welcome to the
project. :)

This patch looks good and I think it could be merged. I am not sure
about the coding style though. This is usually a bit difficult to make
out in the patch format, but coding style in those old files is messed
up pretty much already.

We usually use tabs, but there is some code that uses spaces instead.

Best,
-Michael

On Thu, 2016-01-07 at 12:33 +0100, Michael Eitelwein wrote:
> Match color coding in pie chart and table in the cgi-scrips 
> firewalllogip.dat, firewalllogport.dat and firewalllogcountry.dat.
> 
> Colors are coded color1 to color10 while old code for table mapped 
> color0 to color9.
> 
> Signed-off-by: Michael Eitelwein <michael(a)eitelwein.net>
> ---
> diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat 
> b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> index f998a62..7f71497 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
> @@ -448,10 +448,8 @@ for($s=0;$s<$lines;$s++)
>     $percent = $value[$s] * 100 / $linesjc;
>     $percent = sprintf("%.f", $percent);
>     $total = $total + $value[$s];
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     $color++;
>     print "<tr>";
> @@ -489,10 +487,8 @@ for($s=0;$s<$lines;$s++)
> 
>   if($cgiparams{'otherspie'} == 2 ){}
>   else{
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     print "<tr>";
> 
> diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat 
> b/html/cgi-bin/logs.cgi/firewalllogip.dat
> index 7d82d20..117b423 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogip.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
> @@ -428,10 +428,8 @@ for($s=0;$s<$lines;$s++)
>     $percent = $value[$s] * 100 / $linesjc;
>     $percent = sprintf("%.f", $percent);
>     $total = $total + $value[$s];
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     print "<tr>";
> 
> @@ -459,10 +457,8 @@ for($s=0;$s<$lines;$s++)
> 
>   if($cgiparams{'otherspie'} == 2 ){}
>   else{
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     print "<tr>";
> 
> diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat 
> b/html/cgi-bin/logs.cgi/firewalllogport.dat
> index 5b0db62..583c1b3 100644
> --- a/html/cgi-bin/logs.cgi/firewalllogport.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
> @@ -429,10 +429,8 @@ for($s=0;$s<$lines;$s++)
>     $percent = $value[$s] * 100 / $linesjc;
>     $percent = sprintf("%.f", $percent);
>     $total = $total + $value[$s];
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     print "<tr>";
> 
> @@ -446,10 +444,8 @@ for($s=0;$s<$lines;$s++)
> 
>   if($cgiparams{'otherspie'} == 2 ){}
>   else{
> -  my $colorIndex = $color % 10;
> -  if($colorIndex == 0) {
> -    $colorIndex = 10;
> -  }
> +  # colors are numbered 1 to 10
> +  my $colorIndex = ($color % 10) + 1;
>     $col="bgcolor='$color{\"color$colorIndex\"}'";
>     print "<tr>";

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldqdlpEQUFvSkVJQjU4UDl2a0FrSDhWSVAvamJPdzlPZEpIeHNKeHhMTnRhY0J3RDIK
bjRLdjJIVEM3R2pNemZ3NXNMTkZCSU9hMVpuTXJSTzdiWlU2ViswUkhWM25JeWsrSk5FY2JCS3VJ
T0F4N2FlZwpDRGR2SHZMN05hT2lOQmIyeUhvME9wc0xzSURnbG43M1R5NndlT2NhY1VHaDR4UFk5
MnNtQmVMZmNyRHV6UkxDClFFWjNodUZxbzlrWjljOHZiSWtqWFBzVWtvWThuWmpxdVk0MkVWMk1o
dkJWRktnV0syOTA4YXJOUVpDY0hwR2IKTDc3dWRLK0dEZDhTczZsNkIrUGRhZTRjcTJjY25xazlz
c3E0VjZDR3dZZGdpcStFMGpaVFByL0NIS0pLZ3hlVgpRczA5VVg5elJZdzA4aEJnOC9CbTI3U0g2
aFBhS0xnYWNUZ3BmWUt4T2U2TDRqOGcvTGVrdFlhejlWeVdKdWYwCi85disrMHhibitHejlqS3hj
V21BbGI5ZXkrczBLekRDZm1xUiszYTJNaWRsNXp0bll2NExTL3BRR3dtNnhCMjUKVFB5ZTZFcG0x
SWJoa2twOWNnWEpiZ3VqOUhoYnFpL3BMc3d5a0VqUFZYMlN3VjVMREpkdXJpenpvZVNhdnVoYQpj
bU8wRlZmakpiV3VxM1VvUCtiYitmc0NJZzlVMkFMcEdCY1U1K2JNbXpGbzhIeGk4NkkrV3hJK1Fx
cmhQWXpECmowT09sY2ptNVdnejZsV1JuVk53TVRGZ2NPemNCUDRtTUlaRmtPKzRPODl6WFVxQ1h4
QWF1ZE5nVE0yYTVCYWsKbFRCUFlCU3lpRDJBRlFFYmJQckZNZEdvNmphcklKMXI5YWlCcnF2d3J1
a2dkVmdJdk8xT0xLLzR0b1lOUlcvbAp0cU5lelRvUk9URXczVEdpWmJWVwo9WklMWAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============5851788825313278252==--