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

This commit is contained in:
Darold Gilles 2016-02-02 16:04:32 +01:00
commit fd89b74ed1
12 changed files with 42 additions and 4 deletions

View File

@ -1239,7 +1239,9 @@ sub _parse_file_part
$time = timegm_nocheck($6, $5, $4, $1, $month_number{$2} - 1, $3 - 1900) + $tz;
}
# Some site has corrupted mime_type, try to remove nasty characters
$mime_type =~ s/[^\-\/\.\(\)\+\_,\=a-z0-9]+//igs;
if ($mime_type =~ s/[^\-\/\.\(\)\+\_,\=a-z0-9]+//igs) {
$mime_type = 'invalid/type';
}
} elsif ($line =~ $sg_format_regex1) {
$format = 'squidguard';
$self->{is_squidguard_log} = 1;
@ -1342,7 +1344,9 @@ sub _parse_file_part
$status = lc($3);
$mime_type = lc($4);
# Some site has corrupted mime_type, try to remove nasty characters
$mime_type =~ s/[^\-\/\.\(\)\+\_,\=a-z0-9]+//igs;
if ($mime_type =~ s/[^\-\/\.\(\)\+\_,\=a-z0-9]+//igs) {
$mime_type = 'invalid/type';
}
}
if ($url) {

View File

@ -112,3 +112,6 @@ WeekDay Dg Dl Dt Dc Dj Dv Ds
Week Setmana
Top_denied_link Top denegat
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,6 @@ WeekDay Ne Po Út St Čt Pá So
Week Týden
Top_denied_link Top Denied
Blocklist_acl_title BLocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,6 @@ WeekDay So Mo Di Mi Do Fr Sa
Week Woche
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,7 @@ WeekDay Su Mo Tu We Th Fr Sa
Week Week
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,6 @@ WeekDay Do Lu Ma Mi Ju Vi Sa
Week Semana
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,6 @@ WeekDay Di Lu Ma Me Je Ve Sa
Week Semaine
Top_denied_link Top Rejets
Blocklist_acl_title Utilisation des ACL de Blocklist
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -113,3 +113,6 @@ Week Settimana
Weekly Settimanali
Top_denied_link Classifica Link Vietati
Blocklist_acl_title Utilizzo ACL Blocklist
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -112,3 +112,6 @@ WeekDay Nd Pn Wt Śr Cz Pt So
Week Tydzień
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -114,3 +114,6 @@ WeekDay Su Mo Tu We Th Fr Sa
Week Week
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec

View File

@ -8,7 +8,7 @@
# Specials tags %s and %d in the translated string are uses by the program to
# replace dynamics values. Following the language their place in the string
# may vary.
# Version 1.2.1
# Version 1.2.2
# Author: Gilles Darold
# Russian translation by oxygen121.
# Additions and corrections by yvoinov.
@ -110,8 +110,11 @@ Click_year_stat Нажмите на готовую статистику для
Mime_graph_hits_title Типы MIME (запросы) за
Mime_graph_bytes_title Типы MIME (трафик) за
User Пользователь
Count Считать
Count Счетчик
WeekDay Вс Пн Вт Ср Чт Пт Сб
Week Неделя
Top_denied_link Рейтинг отказов в доступе
Blocklist_acl_title Использованные блок-листы (ACL)
Throughput Пропускная способность
Graph_throughput_title %s пропускная способность на
Throughput_graph Байт/сек

View File

@ -113,3 +113,6 @@ WeekDay Нд Пн Вт Ср Чт Пт Сб
Week Тиждень
Top_denied_link Top Denied
Blocklist_acl_title Blocklist ACL use
Throughput Throughput
Graph_throughput_title %s throughput on
Throughput_graph Bytes/sec