X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Fproxylog.dat;h=8724768ea669ed2c17567038ccacabdad667b86b;hb=e2839b1a2cd0bb60a91931cb2e427370a7e5e206;hp=70208b9eda6d7bf8ac18b015fce36635ff86930d;hpb=78331e301975a38f952ad9311a7ff3201e5a5e2e;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index 70208b9eda..8724768ea6 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -6,8 +6,6 @@ # # (c) The SmoothWall Team # -# $Id: proxylog.dat,v 1.4.2.25 2005/07/07 17:32:24 eoberlander Exp $ -# use strict; @@ -15,7 +13,7 @@ use strict; #use warnings; #use CGI::Carp 'fatalsToBrowser'; -require 'CONFIG_ROOT/general-functions.pl'; +require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -28,11 +26,17 @@ undef (@dummy); my %cgiparams=(); my %logsettings=(); my %ips=(); +my %users=(); my %selected=(); my %checked=(); my @log=(); my $errormessage = ''; +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); + my @shortmonths = ( 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ); my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, @@ -86,6 +90,7 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) $cgiparams{'MONTH'} = $temp[1]; $cgiparams{'DAY'} = $temp[2]; $cgiparams{'SOURCE_IP'} = $temp[3]; + $cgiparams{'USERNAME'} = &Header::escape($temp[4]); } if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || @@ -168,6 +173,8 @@ my $daystr = $cgiparams{'DAY'} == 0 ? '' :$cgiparams{'DAY'} <= 9 ? "0$cgiparams{ my $filter = $cgiparams{'ENABLE_FILTER'} eq 'on' ? $cgiparams{'FILTER'} : ''; my $sourceip = $cgiparams{'SOURCE_IP'}; my $sourceall = $cgiparams{'SOURCE_IP'} eq 'ALL' ? 1 : 0; +my $username = $cgiparams{'USERNAME'}; +my $usersall = $cgiparams{'USERNAME'} eq 'ALL' ? 1 : 0; my $lines = 0; my $temp = (); @@ -175,7 +182,7 @@ my $thiscode = '$temp =~ /$filter/;'; eval($thiscode); if ($@ ne '') { - $errormessage = "$Lang::tr{'bad ignore filter'}.$@
"; + $errormessage = "$Lang::tr{'bad ignore filter'}.$@
";
$filter = '';
} else {
my $loop = 1;
@@ -217,21 +224,23 @@ if ($@ ne '')
READ:while ( $Lang::tr{'web hits'} $daystr: $lines
+
+ $Lang::tr{'advproxy NCSA username'}:
+
+
+
$Lang::tr{'ignore filter'}:
@@ -411,22 +437,26 @@ if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
print "
-
END
;
my $ll = 0;
+my $col='';
foreach $_ (@log)
{
if ($ll % 2) {
- print "$Lang::tr{'time'}
-$Lang::tr{'source ip'}
-$Lang::tr{'website'}
+$Lang::tr{'time'}
+$Lang::tr{'source ip'}
+$Lang::tr{'advproxy NCSA username'}
+$Lang::tr{'website'}
\n"; }
+ print " ";
+ $col="bgcolor='$color{'color20'}'"; }
else {
- print " \n"; }
- my ($datetime,$ip,$url) = split;
+ print " ";
+ $col="bgcolor='$color{'color22'}'"; }
+ my ($datetime,$ip,$so,$url) = split;
my ($SECdt, $MINdt, $HOURdt, $DAYdt, $MONTHdt, $YEARdt) = localtime($datetime);
$SECdt = sprintf ("%.02d",$SECdt);
$MINdt = sprintf ("%.02d",$MINdt);
@@ -443,9 +473,10 @@ foreach $_ (@log)
$DAYdt='';
}
print <
END
;
@@ -473,14 +504,14 @@ END
print "$ip
- $part
+ $DAYdt$HOURdt:$MINdt:$SECdt
+ $ip
+ $so
+ $part
";
if ($prev != -1) {
- print "$Lang::tr{'older'}"; }
+ print "$Lang::tr{'older'}"; }
else {
print "$Lang::tr{'older'}"; }
print " \n";
print "";
if ($next >= 0 ) {
- print "$Lang::tr{'newer'}"; }
+ print "$Lang::tr{'newer'}"; }
else {
print "$Lang::tr{'newer'}"; }
print " \n";