Merge branch 'master' of github.com:darold/squidanalyzer

This commit is contained in:
Gilles Darold 2016-10-25 14:14:49 +02:00
commit e8c55f1ff4
12 changed files with 31 additions and 7 deletions

View File

@ -127,6 +127,7 @@ my %Translate = (
'Url' => 'Url',
'User_title' => 'User Statistics on',
'User_number' => 'Number of user',
'Url_title' => 'Top %d Url on',
'Url_Hits_title' => 'Top %d Url hits on',
'Url_Bytes_title' => 'Top %d Url bytes on',
'Url_Duration_title' => 'Top %d Url duration on',
@ -4020,7 +4021,7 @@ sub _print_network_stat
my $outnet = new IO::File;
$outnet->open(">$outdir/networks/$net/$net.html") || return;
# Print the HTML header
my $cal = 'SA_CALENDAR_SA';
my $cal = '';
$self->_print_header(\$outnet, $self->{menu2}, $cal, $sortpos);
print $outnet $self->_print_title("$Translate{'Network_title'} $show -", $stat_date, $week);
@ -4321,9 +4322,11 @@ sub _print_user_stat
my $outusr = new IO::File;
$outusr->open(">$outdir/users/$upath/$upath.html") || return;
# Print the HTML header
my $cal = 'SA_CALENDAR_SA';
my $cal = '';
$self->_print_header(\$outusr, $self->{menu2}, $cal, $sortpos);
print $outusr $self->_print_title("$Translate{'User_title'} $usr -", $stat_date, $week);
my $usr_lbl = $usr;
$usr_lbl =~ s/_SPC_/ /g;
print $outusr $self->_print_title("$Translate{'User_title'} $usr_lbl -", $stat_date, $week);
my @hits = ();
my @bytes = ();
@ -4635,8 +4638,12 @@ sub _print_user_detail
$trfunit = 'B' if ($trfunit eq 'BYTE');
my $nurl = scalar keys %url_stat;
my $t1 = $Translate{"Url_title"};
$t1 =~ s/\%d/$self->{TopNumber}\/$nurl/;
print $$out qq{
<h3>$Translate{'Url_number'}: $nurl</h3>
<h3>$t1</h3>
<table class="sortable stata">
<thead>
<tr>
@ -5087,7 +5094,9 @@ sub _print_top_url_stat
} elsif ($tpe eq 'Duration') {
$value = &parse_duration(int($value/1000));
}
print $out "<tr><td>$user</td><td>$value</td></tr>\n";
my $usr_lbl = $user;
$usr_lbl =~ s/_SPC_/ /g;
print $out "<tr><td>$usr_lbl</td><td>$value</td></tr>\n";
$k++;
last if ($k > $self->{TopUrlUser});
}
@ -5321,7 +5330,9 @@ sub _print_top_denied_stat
};
my $k = 1;
foreach my $user (sort { $denied_stat{$u}{users}{$b} <=> $denied_stat{$u}{users}{$a} } keys %{$denied_stat{$u}{users}}) {
print $out "<tr><td>$user</td><td>$denied_stat{$u}{users}{$user}</td></tr>\n";
my $usr_lbl = $user;
$usr_lbl =~ s/_SPC_/ /g;
print $out "<tr><td>$usr_lbl</td><td>$denied_stat{$u}{users}{$user}</td></tr>\n";
$k++;
last if ($k > $self->{TopUrlUser});
}
@ -5724,7 +5735,9 @@ $domain2_bytes
} elsif ($tpe eq 'Duration') {
$value = &parse_duration(int($value/1000));
}
print $out "<tr><td>$user</td><td>$value</td></td></tr>\n";
my $usr_lbl = $user;
$usr_lbl =~ s/_SPC_/ /g;
print $out "<tr><td>$usr_lbl</td><td>$value</td></td></tr>\n";
$k++;
last if ($k > $self->{TopUrlUser});
}

View File

@ -85,6 +85,7 @@ Largest El més llarg
Url Url
User_title Estadístiques d'usuari en
User_number Nombre d'usuaris
Url_title Top %d Url
Url_Hits_title Top %d de clicks en
Url_Bytes_title Top %d de bytes de Url en
Url_Duration_title Top %d de duració de visita en

View File

@ -85,6 +85,7 @@ Largest Největší
Url Url
User_title Uživatelská Statistika
User_number Počet uživatelů
Url_title Top %d Url
Url_Hits_title Top %d Url hitů
Url_Bytes_title Top %d Url Bytů
Url_Duration_title Top %d Url doba přenosu

View File

@ -85,6 +85,7 @@ Largest Groesste
Url Url
User_title Benutzer Statistik
User_number Anzahl der Benutzer
Url_title Top %d Url
Url_Hits_title Top %d Url Treffer
Url_Bytes_title Top %d Url Bytes
Url_Duration_title Top %d Url Dauer

View File

@ -85,6 +85,7 @@ Largest Largest
Url Url
User_title User Statistics on
User_number Number of users
Url_title Top %d Url
Url_Hits_title Top %d Url hits on
Url_Bytes_title Top %d Url bytes on
Url_Duration_title Top %d Url duration on

View File

@ -85,6 +85,7 @@ Largest El más largo
Url Url
User_title Estadísticas de usuario en
User_number Número de usuario
Url_title Top %d Url
Url_Hits_title Top %d de clicks en
Url_Bytes_title Top %d de bytes de Url en
Url_Duration_title Top %d de duración de visita enn

View File

@ -85,6 +85,7 @@ Largest Plus gros transfert
Url Url
User_title Statistiques utilisateurs pour
User_number Nombre d'utilisateurs
Url_title Top %d Urls
Url_Hits_title Top %d des Urls par requêtes pour
Url_Bytes_title Top %d des Urls par transferts pour
Url_Duration_title Top %d des Urls par durée pour

View File

@ -86,6 +86,7 @@ Largest Dim. Max DL
Url Url
User_title Statistiche utente per
User_number Numero di utenti
Url_title Principali %d Url
Url_Hits_title Principali %d Url acceduti con successo
Url_Bytes_title Principali %d Url per numero di byte per
Url_Duration_title Principali %d Url per durata temporale

View File

@ -85,6 +85,7 @@ Largest Największy
Url Url
User_title Statystyki użytkowników z dnia
User_number Liczba użytkowników
Url_title Topowych %d Url
Url_Hits_title Topowych %d trafień dla Url w
Url_Bytes_title Topowych %d bajtów dla Url w
Url_Duration_title Topowych %d czasów trwania dla Url w

View File

@ -87,6 +87,7 @@ Largest Maior
Url URL
User_title Estat&iacute;sticas de usu&aacute;rios em
User_number N&uacute;mero de usu&aacute;rios
Url_title As Top %d URLs
Url_Hits_title As Top %d URLs por n&uacute;mero de acessos em
Url_Bytes_title As Top %d URLs por bytes transferidos em
Url_Duration_title As Top %d URLs por tempo de transfer&ecirc;ncia em

View File

@ -88,6 +88,7 @@ Largest Наибольший
Url URL
User_title Статистика по пользователям за
User_number Количество пользователей
Url_title Рейтинг %d URL
Url_Hits_title %d самых посещаемых URL-запросов за
Url_Bytes_title %d URL с наибольшим трафиком за
Url_Duration_title %d URL с наибольшей продолжительностью за

View File

@ -86,6 +86,7 @@ Largest Найбільший
Url URL
User_title Статистика по Користувачам за
User_number Кількість Користувачів
Url_title Toп %d URL
Url_Hits_title Toп %d URL запитів за
Url_Bytes_title Toп %d URL трафік за
Url_Duration_title Toп %d URL тривалість за