X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllogip.dat;fp=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllogip.dat;h=2616455780c3cedae47f3d0f94ba8b3ef18e9921;hp=5466988326170603c2c3a328c8bbe1deef20113a;hb=c94c9a327c6c8157dc4b233337a065acc814bcaf;hpb=224bbb4e8ef8e2e0e2496dd2eadadeea68d79092
diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index 546698832..261645578 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -15,8 +15,8 @@ use Geo::IP::PurePerl;
use Getopt::Std;
# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+use warnings;
+use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
@@ -374,7 +374,11 @@ else{
my @data = (\@ips,\@numb);
use GD::Graph::colour qw( :files );
-GD::Graph::colour::read_rgb( "/srv/web/ipfire/html/themes/ipfire/include/colours.txt" );
+
+my %colours = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colours.txt", \%colours);
if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
my $mygraph = GD::Graph::pie->new(500, 350);
@@ -385,7 +389,7 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
) or warn $mygraph->error;
$mygraph->set_value_font(GD::gdMediumBoldFont);
- $mygraph->set( dclrs => [ "colour1" , "colour2" , "colour3" , "colour4" , "colour5" , "colour6" , "colour7" , "colour8" , "colour9" , "colour10" ] );
+ $mygraph->set( dclrs => [ "$colours{'colour1'}" , "$colours{'colour2'}" , "$colours{'colour3'}" , "$colours{'colour4'}" , "$colours{'colour5'}" , "$colours{'colour6'}" , "$colours{'colour7'}" , "$colours{'colour8'}" , "$colours{'colour9'}" , "$colours{'colour10'}" ] );
my $myimage = $mygraph->plot(\@data) or die $mygraph->error;
my @filenames = glob("/srv/web/ipfire/html/graphs/fwlog-ip*.png");
@@ -415,38 +419,6 @@ 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;
@@ -456,16 +428,16 @@ for($s=0;$s<$lines;$s++)
$percent = $value[$s] * 100 / $linesjc;
$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";}
+ 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 $gi = Geo::IP::PurePerl->new();
my $ccode = $gi->country_code_by_name($key[$s]);
@@ -482,16 +454,16 @@ for($s=0;$s<$lines;$s++)
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";}
+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 $dif;
$dif = $linesjc - $total;
@@ -513,9 +485,7 @@ END
;
&Header::closebox();
-
&Header::closebigbox();
-
&Header::closepage();
sub findkey {