From fda1f52ff3b2e031700f92af71a72a00ce41d992 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Tue, 7 Jan 2014 09:23:37 +0100 Subject: [PATCH] fifteen-theme: made all log tables themeable With this commit it is possible to make css designs to all tables in the logs. --- html/cgi-bin/logs.cgi/firewalllog.dat | 43 +++++++------ html/cgi-bin/logs.cgi/firewalllogip.dat | 75 ++++++++++++----------- html/cgi-bin/logs.cgi/firewalllogport.dat | 68 ++++++++++---------- html/cgi-bin/logs.cgi/log.dat | 18 +++--- html/cgi-bin/logs.cgi/proxylog.dat | 25 ++++---- html/cgi-bin/logs.cgi/urlfilter.dat | 33 ++++++---- 6 files changed, 140 insertions(+), 122 deletions(-) diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 466a3cec7..f5a4e0f8d 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -308,16 +308,16 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; } if ($lines != 0) { &oldernewer(); } print < + - - - - - - - - + + + + + + + + END ; @@ -353,26 +353,29 @@ foreach $_ (@log) $dstport = "$dstport($servi)";} my @mactemp = split(/:/,$macaddr); $macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]"; + my $col=""; if ($lines % 2) { - print "\n"; } + print ""; + $col="bgcolor='$color{'color20'}'"; } else { - print "\n"; } + print ""; + $col="bgcolor='$color{'color22'}'"; } print <$time - - - - - + + + + + + END ; if ( $fcode ne "" ){ - print "";} + print "";} else { - print "";} + print "";} print <$macaddr + END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 3ec3f6df2..2ae4c0d8b 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -403,13 +403,13 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { } print < +
$Lang::tr{'time'}$Lang::tr{'chain'}$Lang::tr{'iface'}$Lang::tr{'proto'}$Lang::tr{'source'}
$Lang::tr{'destination'}		$Lang::tr{'src port'}
$Lang::tr{'dst port'}		Flag$Lang::tr{'mac address'}$Lang::tr{'time'}$Lang::tr{'chain'}$Lang::tr{'iface'}$Lang::tr{'proto'}$Lang::tr{'source'}
$Lang::tr{'destination'}		$Lang::tr{'src port'}
$Lang::tr{'dst port'}		Flag$Lang::tr{'mac address'}
$comment$iface$proto$srcaddr
$dstaddr		$srcport
$dstport		$time$comment$iface$proto$srcaddr
$dstaddr		$srcport
$dstport		$ccode$ccode$macaddr
- - - - - + + + + + END ; @@ -419,6 +419,7 @@ my $show=0; my $s; my $percent; +my $col=""; for($s=0;$s<$lines;$s++) { @@ -426,45 +427,45 @@ for($s=0;$s<$lines;$s++) $percent = $value[$s] * 100 / $linesjc; $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - if ( ($color % 10) == 1 ){print "\n";} - if ( ($color % 10) == 2 ){print "\n";} - if ( ($color % 10) == 3 ){print "\n";} - if ( ($color % 10) == 4 ){print "\n";} - if ( ($color % 10) == 5 ){print "\n";} - if ( ($color % 10) == 6 ){print "\n";} - if ( ($color % 10) == 7 ){print "\n";} - if ( ($color % 10) == 8 ){print "\n";} - if ( ($color % 10) == 9 ){print "\n";} - if ( ($color % 10) == 0 ){print "\n";} + if ( ($color % 10) == 1 ){print ""; $col="BGCOLOR='$color{'color1'}'";} + if ( ($color % 10) == 2 ){print ""; $col="BGCOLOR='$color{'color2'}'";} + if ( ($color % 10) == 3 ){print ""; $col="BGCOLOR='$color{'color3'}'";} + if ( ($color % 10) == 4 ){print ""; $col="BGCOLOR='$color{'color4'}'";} + if ( ($color % 10) == 5 ){print ""; $col="BGCOLOR='$color{'color5'}'";} + if ( ($color % 10) == 6 ){print ""; $col="BGCOLOR='$color{'color6'}'";} + if ( ($color % 10) == 7 ){print ""; $col="BGCOLOR='$color{'color7'}'";} + if ( ($color % 10) == 8 ){print ""; $col="BGCOLOR='$color{'color8'}'";} + if ( ($color % 10) == 9 ){print ""; $col="BGCOLOR='$color{'color9'}'";} + if ( ($color % 10) == 0 ){print ""; $col="BGCOLOR='$color{'color10'}'";} my $gi = Geo::IP::PurePerl->new(); my $ccode = $gi->country_code_by_name($key[$s]); my $fcode = lc($ccode); $color++; - print ""; - print ""; + print ""; + print ""; if ( $fcode ne "" ){ - print "";} + print "";} else { - print "";} - print ""; - print ""; + print "";} + print ""; + print ""; print ""; } if($cgiparams{'otherspie'} == 2 ){} else{ -if ( ($color % 10) == 1 ){print "\n";} -if ( ($color % 10) == 2 ){print "\n";} -if ( ($color % 10) == 3 ){print "\n";} -if ( ($color % 10) == 4 ){print "\n";} -if ( ($color % 10) == 5 ){print "\n";} -if ( ($color % 10) == 6 ){print "\n";} -if ( ($color % 10) == 7 ){print "\n";} -if ( ($color % 10) == 8 ){print "\n";} -if ( ($color % 10) == 9 ){print "\n";} -if ( ($color % 10) == 0 ){print "\n";} +if ( ($color % 10) == 1 ){print ""; $col="BGCOLOR='$color{'color1'}'";} +if ( ($color % 10) == 2 ){print ""; $col="BGCOLOR='$color{'color2'}'";} +if ( ($color % 10) == 3 ){print ""; $col="BGCOLOR='$color{'color3'}'";} +if ( ($color % 10) == 4 ){print ""; $col="BGCOLOR='$color{'color4'}'";} +if ( ($color % 10) == 5 ){print ""; $col="BGCOLOR='$color{'color5'}'";} +if ( ($color % 10) == 6 ){print ""; $col="BGCOLOR='$color{'color6'}'";} +if ( ($color % 10) == 7 ){print ""; $col="BGCOLOR='$color{'color7'}'";} +if ( ($color % 10) == 8 ){print ""; $col="BGCOLOR='$color{'color8'}'";} +if ( ($color % 10) == 9 ){print ""; $col="BGCOLOR='$color{'color9'}'";} +if ( ($color % 10) == 0 ){print ""; $col="BGCOLOR='$color{'color10'}'";} if ( $linesjc ne "0") { @@ -473,11 +474,11 @@ $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; $percent = sprintf("%.f", $percent); print < - - - - + + + + + END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index af9b85288..3f93b1705 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -406,12 +406,12 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { } print < +
IPFlagCountPercentIPFlagCountPercent
$key[$s]
$key[$s]$ccode$ccode$value[$s]$percent$value[$s]$percent
$Lang::tr{'otherip'}$dif$percent$Lang::tr{'otherip'}$dif$percent
- - - - + + + + END ; @@ -421,43 +421,45 @@ my $show=0; my $s; my $percent; +my $col=""; + for($s=0;$s<$lines;$s++) { $show++; $percent = $value[$s] * 100 / $linesjc; $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - if ( ($color % 10) == 1 ){print "\n";} - if ( ($color % 10) == 2 ){print "\n";} - if ( ($color % 10) == 3 ){print "\n";} - if ( ($color % 10) == 4 ){print "\n";} - if ( ($color % 10) == 5 ){print "\n";} - if ( ($color % 10) == 6 ){print "\n";} - if ( ($color % 10) == 7 ){print "\n";} - if ( ($color % 10) == 8 ){print "\n";} - if ( ($color % 10) == 9 ){print "\n";} - if ( ($color % 10) == 0 ){print "\n";} + if ( ($color % 10) == 1 ){print ""; $col="BGCOLOR='$color{'color1'}'";} + if ( ($color % 10) == 2 ){print ""; $col="BGCOLOR='$color{'color2'}'";} + if ( ($color % 10) == 3 ){print ""; $col="BGCOLOR='$color{'color3'}'";} + if ( ($color % 10) == 4 ){print ""; $col="BGCOLOR='$color{'color4'}'";} + if ( ($color % 10) == 5 ){print ""; $col="BGCOLOR='$color{'color5'}'";} + if ( ($color % 10) == 6 ){print ""; $col="BGCOLOR='$color{'color6'}'";} + if ( ($color % 10) == 7 ){print ""; $col="BGCOLOR='$color{'color7'}'";} + if ( ($color % 10) == 8 ){print ""; $col="BGCOLOR='$color{'color8'}'";} + if ( ($color % 10) == 9 ){print ""; $col="BGCOLOR='$color{'color9'}'";} + if ( ($color % 10) == 0 ){print ""; $col="BGCOLOR='$color{'color10'}'";} $color++; - print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; print ""; } if($cgiparams{'otherspie'} == 2 ){} else{ -if ( ($color % 10) == 1 ){print "\n";} -if ( ($color % 10) == 2 ){print "\n";} -if ( ($color % 10) == 3 ){print "\n";} -if ( ($color % 10) == 4 ){print "\n";} -if ( ($color % 10) == 5 ){print "\n";} -if ( ($color % 10) == 6 ){print "\n";} -if ( ($color % 10) == 7 ){print "\n";} -if ( ($color % 10) == 8 ){print "\n";} -if ( ($color % 10) == 9 ){print "\n";} -if ( ($color % 10) == 0 ){print "\n";} +if ( ($color % 10) == 1 ){print ""; $col="BGCOLOR='$color{'color1'}'";} +if ( ($color % 10) == 2 ){print ""; $col="BGCOLOR='$color{'color2'}'";} +if ( ($color % 10) == 3 ){print ""; $col="BGCOLOR='$color{'color3'}'";} +if ( ($color % 10) == 4 ){print ""; $col="BGCOLOR='$color{'color4'}'";} +if ( ($color % 10) == 5 ){print ""; $col="BGCOLOR='$color{'color5'}'";} +if ( ($color % 10) == 6 ){print ""; $col="BGCOLOR='$color{'color6'}'";} +if ( ($color % 10) == 7 ){print ""; $col="BGCOLOR='$color{'color7'}'";} +if ( ($color % 10) == 8 ){print ""; $col="BGCOLOR='$color{'color8'}'";} +if ( ($color % 10) == 9 ){print ""; $col="BGCOLOR='$color{'color9'}'";} +if ( ($color % 10) == 0 ){print ""; $col="BGCOLOR='$color{'color10'}'";} if ( $linesjc ne "0") { @@ -466,10 +468,10 @@ $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; $percent = sprintf("%.f", $percent); print < - - - + + + + END ; diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index e2d02447d..dacd518a1 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -354,11 +354,11 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; } if ($lines != 0) { &oldernewer(); } print < +
PortCountPercentPortCountPercent
$key[$s]$value[$s]$percent
$key[$s]$value[$s]$percent
$Lang::tr{'otherport'}$dif$percent$Lang::tr{'otherport'}$dif$percent
- - - + + + END ; @@ -383,13 +383,15 @@ foreach $_ (@log) $data = substr ($data,80); #permit correct display in table cell $d .= ' ' . substr ($data,0,80); } - + my $col=""; if ($lines % 2) { - print ""; } + print ""; + $col="bgcolor='$color{'color20'}'"; } else { - print ""; } - print "\n"; + print ""; + $col="bgcolor='$color{'color22'}'"; } + print "\n"; $lines++; } #print ''; diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index da86f8917..a1a05b289 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -437,22 +437,25 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; } print "

$Lang::tr{'web hits'} $daystr: $lines

"; if ($lines != 0) { &oldernewer(); } print < +
$Lang::tr{'time'}$Lang::tr{'section'} $Lang::tr{'time'}$Lang::tr{'section'} 
$time$sec" .&Header::cleanhtml ("$d", 'y') . "
$time$sec" .&Header::cleanhtml ("$d", 'y') . "
- - - - + + + + END ; my $ll = 0; +my $col=''; foreach $_ (@log) { if ($ll % 2) { - print "\n"; } + print ""; + $col="bgcolor='$color{'color20'}'"; } else { - print "\n"; } + print ""; + $col="bgcolor='$color{'color22'}'"; } my ($datetime,$ip,$so,$url) = split; my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime); $SECdt = sprintf ("%.02d",$SECdt); @@ -470,10 +473,10 @@ foreach $_ (@log) $DAYdt=''; } print <$DAYdt$HOURdt:$MINdt:$SECdt - - - + + + + END ; diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat index 7fb2ff9c4..ce642e1cb 100644 --- a/html/cgi-bin/logs.cgi/urlfilter.dat +++ b/html/cgi-bin/logs.cgi/urlfilter.dat @@ -309,18 +309,19 @@ if ($lines) $lines = 0; - print "
$Lang::tr{'time'}$Lang::tr{'source ip'}$Lang::tr{'advproxy NCSA username'}$Lang::tr{'website'}$Lang::tr{'time'}$Lang::tr{'source ip'}$Lang::tr{'advproxy NCSA username'}$Lang::tr{'website'}
$ip$so$part$DAYdt$HOURdt:$MINdt:$SECdt$ip$so$part
\n"; + print "
"; unless ($cgiparams{'LOGTYPE'} eq 'squidGuard') { print "\n"; - print "\n"; - print "\n"; - print "\n"; - if ($filtersettings{'ENABLE_USERNAME_LOG'} eq 'on') { print "\n"; } - print "\n"; + print "\n"; + print "\n"; + print "\n"; + if ($filtersettings{'ENABLE_USERNAME_LOG'} eq 'on') { print "\n"; } + print "\n"; print "\n"; } + my $col=""; foreach (@slice) { undef $attr1; undef $attr2; @@ -336,17 +337,23 @@ if ($lines) if (@loginfo[2] =~ /emergency/) { $attr1 .= ""; $attr2 .= ""; } print "\n"; } else { - if ($lines % 2) { print "\n"; } else { print "\n"; } + if ($lines % 2) { + print ""; + $col="bgcolor='$color{'color22'}'"; + }else { + print ""; + $col="bgcolor='$color{'color20'}'"; + } } if ($cgiparams{'LOGTYPE'} eq 'squidGuard') { - print "\n"; + print "\n"; } else { - print "\n"; - print "\n"; - print "\n"; + print "\n"; + print "\n"; + print "\n"; if ($filtersettings{'ENABLE_USERNAME_LOG'} eq 'on') { - print "\n"; + print "\n"; $site = substr($dsturl,0,55); if (length($dsturl) > 55) { $site .= "..."; } } else { @@ -354,7 +361,7 @@ if ($lines) if (length($dsturl) > 69) { $site .= "..."; } } #print "\n"; - print "\n"; + print "\n"; } print "\n"; } -- 2.39.2
$Lang::tr{'urlfilter time'}$Lang::tr{'urlfilter category'}$Lang::tr{'urlfilter client'}$Lang::tr{'urlfilter username'}$Lang::tr{'urlfilter dst'}$Lang::tr{'urlfilter time'}$Lang::tr{'urlfilter category'}$Lang::tr{'urlfilter client'}$Lang::tr{'urlfilter username'}$Lang::tr{'urlfilter dst'}
$time   $pid   $attr1@loginfo$attr2$time   $pid   $attr1@loginfo$attr2$time$category[1]$ip[0]$time$category[1]$ip[0]$loginfo[3]$loginfo[3]$site$site$site