X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllogport.dat;h=9f7ce3a11375e1fe1ab67e557e18789062503f27;hb=c101827318705aca4ffc9ae955d921f3b92d98b4;hp=5cf00fb1ab34df9384aca7ea6731ad7ad3782bd9;hpb=32f77a0b3bdd47d4300cc6c76b5d4aed411167e8;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 5cf00fb1a..9f7ce3a11 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -7,7 +7,8 @@ # JC HERITIER # page inspired from the initial firewalllog.dat # -# modified for ipcop by Markus Hoffmann und Michael Winkler and for ipfire by Christian Schmidt +# Modified for IPFire by Christian Schmidt +# and Michael Tremer (www.ipfire.org) use strict; @@ -39,11 +40,11 @@ $cgiparams{'showpie'} = 1; $cgiparams{'sortcolumn'} = 1; my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', - 'Sep', 'Oct', 'Nov', 'Dec' ); + 'Sep', 'Oct', 'Nov', 'Dec' ); my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, - $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'}, - $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, - $Lang::tr{'december'} ); + $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'}, + $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, + $Lang::tr{'december'} ); my @now = localtime(); my $dow = $now[6]; @@ -75,17 +76,17 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) my $start = -1; if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) { - my @temp = split(',',$ENV{'QUERY_STRING'}); - $start = $temp[0]; - $cgiparams{'MONTH'} = $temp[1]; - $cgiparams{'DAY'} = $temp[2]; + my @temp = split(',',$ENV{'QUERY_STRING'}); + $start = $temp[0]; + $cgiparams{'MONTH'} = $temp[1]; + $cgiparams{'DAY'} = $temp[2]; } if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || !($cgiparams{'DAY'} =~ /^(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31)$/)) { - $cgiparams{'DAY'} = $now[3]; - $cgiparams{'MONTH'} = $now[4]; + $cgiparams{'DAY'} = $now[3]; + $cgiparams{'MONTH'} = $now[4]; } elsif($cgiparams{'ACTION'} eq '>>') { @@ -151,9 +152,9 @@ my $longmonthstr = $longmonths[$cgiparams{'MONTH'}]; my $day = $cgiparams{'DAY'}; my $daystr=''; if ($day <= 9) { - $daystr = " $day"; } + $daystr = " $day"; } else { - $daystr = $day; + $daystr = $day; } my $skip=0; @@ -177,12 +178,12 @@ if (!$skip) { while () { - if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { - $log[$lines] = $_; - $lines++; - } - } - close (FILE); + if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { + $log[$lines] = $_; + $lines++; + } + } + close (FILE); } $skip=0; @@ -199,14 +200,14 @@ if ($multifile) { $skip=1; } if (!$skip) { - while () { - if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { - $log[$lines] = $_; - $lines++; - } - } - close (FILE); - } + while () { + if (/(^${monthstr} ${daystr} ..:..:..) [\w\-]+ kernel:.*(IN=.*)$/) { + $log[$lines] = $_; + $lines++; + } + } + close (FILE); + } } my $MODNAME="fwlogs"; @@ -216,44 +217,44 @@ my $MODNAME="fwlogs"; &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "$errormessage \n"; - &Header::closebox(); + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "$errormessage \n"; + &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print < - - + - - + + - + + + + + +
$Lang::tr{'month'}:  - $Lang::tr{'month'}:  +  $Lang::tr{'day'}:  - +  $Lang::tr{'day'}:  +
$Lang::tr{'Number of Ports for the pie chart'}:
- - - - -
$Lang::tr{'Number of Ports for the pie chart'}:
- + END ; @@ -316,14 +317,14 @@ my @tabjc2; if ($sortcolumn == 1) { - @tabjc2 = sort { $b <=> $a } values (%tabjc); + @tabjc2 = sort { $b <=> $a } values (%tabjc); } else { - @tabjc2 = sort { $a <=> $b } keys (%tabjc); + @tabjc2 = sort { $a <=> $b } keys (%tabjc); } -my $colour=1; +my $color=10; @@ -337,17 +338,17 @@ my $v; if ($sortcolumn == 1) { - for ($v=0;$v<$pienumber;$v++){ - findkey($tabjc2[$v]); - } + for ($v=0;$v<$pienumber;$v++){ + findkey($tabjc2[$v]); + } } else { - foreach $v (@tabjc2) { - $key[$indice] = $v; - $value[$indice] = $tabjc{$v}; - $indice++; - } + foreach $v (@tabjc2) { + $key[$indice] = $v; + $value[$indice] = $tabjc{$v}; + $indice++; + } } my @ports; @@ -360,147 +361,116 @@ my $o; if($cgiparams{'otherspie'} == 2 ){} else{ - my $numothers; - for($o=0;$o<$pienumber;$o++){ - $numothers = $numothers + $numb[$o]; - } - $numothers = $linesjc - $numothers; - if ($numothers > 0) { - $ports[$pienumber]="$Lang::tr{'otherport'}"; - $numb[$pienumber] = $numothers; - } + my $numothers; + for($o=0;$o<$pienumber;$o++){ + $numothers = $numothers + $numb[$o]; + } + $numothers = $linesjc - $numothers; + if ($numothers > 0) { + $ports[$pienumber]="$Lang::tr{'otherport'}"; + $numb[$pienumber] = $numothers; + } } my @data = (\@ports,\@numb); use GD::Graph::colour qw( :files ); -GD::Graph::colour::read_rgb( "/srv/web/ipfire/cgi-bin/logs.cgi/colours.txt" ); + +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { - my $mygraph = GD::Graph::pie->new(500, 350); - $mygraph->set( - 'title' => '', - 'pie_height' => 50, - 'start_angle' => 89 - ) or warn $mygraph->error; - - $mygraph->set_value_font(GD::gdMediumBoldFont); - $mygraph->set( dclrs => [ "colour1" , "colour2" , "colour3" , "colour4" , "colour5" , "colour6" , "colour7" , "colour8" , "colour9" , "colour10" ] ); - my $myimage = $mygraph->plot(\@data) or die $mygraph->error; - - my @filenames = glob("/srv/web/ipfire/html/fwlogs/port*.png"); - unlink(@filenames); - my $imagerandom = rand(1000000); - my $imagename = "/srv/web/ipfire/html/fwlogs/port$imagerandom.png"; - open(FILE,">$imagename"); - print FILE $myimage->png; - close(FILE); - ##################################################### - print "
"; - print ""; - print "
"; + my $mygraph = GD::Graph::pie->new(500, 350); + $mygraph->set( + 'title' => '', + 'pie_height' => 50, + 'start_angle' => 89 + ) or warn $mygraph->error; + + $mygraph->set_value_font(GD::gdMediumBoldFont); + $mygraph->set( dclrs => [ "$color{'color1'}" , "$color{'color2'}" , "$color{'color3'}" , "$color{'color4'}" , "$color{'color5'}" , "$color{'color6'}" , "$color{'color7'}" , "$color{'color8'}" , "$color{'color9'}" , "$color{'color10'}" ] ); + my $myimage = $mygraph->plot(\@data) or die $mygraph->error; + + my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-port*.png"); + unlink(@filenames); + my $imagerandom = rand(1000000); + my $imagename = "/srv/web/ipfire/html/graphs/fwlog-port$imagerandom.png"; + open(FILE,">$imagename"); + print FILE $myimage->png; + close(FILE); + ##################################################### + print "
"; + print ""; + print "
"; } print < - - -Port -Count -Percent - + + + + + + + END ; my $total=0; my $show=0; -my @colour; -my $colour1; -my $colour2; -my $colour3; -my $colour4; -my $colour5; -my $colour6; -my $colour7; -my $colour8; -my $colour9; -my $colour10; - -@colour = GD::Graph::colour::_rgb("colour1"); -$colour1 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour2"); -$colour2 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour3"); -$colour3 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour4"); -$colour4 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour5"); -$colour5 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour6"); -$colour6 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour7"); -$colour7 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour8"); -$colour8 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour9"); -$colour9 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); -@colour = GD::Graph::colour::_rgb("colour10"); -$colour10 = GD::Graph::colour::rgb2hex($colour[0], $colour[1], $colour[2]); my $s; my $percent; +my $col=""; + for($s=0;$s<$lines;$s++) { $show++; $percent = $value[$s] * 100 / $linesjc; - $percent = sprintf("%.3f", $percent); + $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - if ( ($colour % 10) == 1 ){print "\n";} - if ( ($colour % 10) == 2 ){print "\n";} - if ( ($colour % 10) == 3 ){print "\n";} - if ( ($colour % 10) == 4 ){print "\n";} - if ( ($colour % 10) == 5 ){print "\n";} - if ( ($colour % 10) == 6 ){print "\n";} - if ( ($colour % 10) == 7 ){print "\n";} - if ( ($colour % 10) == 8 ){print "\n";} - if ( ($colour % 10) == 9 ){print "\n";} - if ( ($colour % 10) == 0 ){print "\n";} - - $colour++; - print ""; - print ""; - print ""; - print ""; - print ""; + my $colorIndex = $color % 10; + if($colorIndex == 0) { + $colorIndex = 10; + } + $col="bgcolor='$color{\"color$colorIndex\"}'"; + print ""; + + $color++; + print ""; + print ""; + print ""; + print ""; + print ""; } if($cgiparams{'otherspie'} == 2 ){} else{ -if ( ($colour % 10) == 1 ){print "\n";} -if ( ($colour % 10) == 2 ){print "\n";} -if ( ($colour % 10) == 3 ){print "\n";} -if ( ($colour % 10) == 4 ){print "\n";} -if ( ($colour % 10) == 5 ){print "\n";} -if ( ($colour % 10) == 6 ){print "\n";} -if ( ($colour % 10) == 7 ){print "\n";} -if ( ($colour % 10) == 8 ){print "\n";} -if ( ($colour % 10) == 9 ){print "\n";} -if ( ($colour % 10) == 0 ){print "\n";} + my $colorIndex = $color % 10; + if($colorIndex == 0) { + $colorIndex = 10; + } + $col="bgcolor='$color{\"color$colorIndex\"}'"; + print ""; +if ( $linesjc ne "0") +{ my $dif; $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; -$percent = sprintf("%.3f", $percent); +$percent = sprintf("%.f", $percent); print < - - - - + + + + + END ; } +} print < +
$Lang::tr{'port'}count$Lang::tr{'percentage'}
$key[$s]$value[$s]$percent
$key[$s]$value[$s]$percent
$Lang::tr{'otherport'}$dif$percent
$Lang::tr{'otherport'}$dif$percent
END ; @@ -509,6 +479,7 @@ END &Header::closepage(); sub findkey { + my $v; foreach $v (@keytabjc) { if ($tabjc{$v} eq $_[0]) { delete $tabjc{$v}; @@ -519,7 +490,9 @@ sub findkey { } } } + sub checkversion { - #Automatic Updates is disabled - return "0","0"; - } + #Automatic Updates is disabled + return "0","0"; +} +