diff --git a/ChangeLog b/ChangeLog index 66c557c..9b39c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -450,7 +450,8 @@ of users to show in reports. - Fix bug on ordering column with sorttable. Thanks to David Walser for the report. - Fix support to regex with coma in user and network alias file. Regex - like "1stFloor 192.168.1.1\d{0,2}" in user-aliases and network-aliases was not permitted. Thanks to Steffen Junick for the report. + like "1stFloor 192.168.1.1\d{0,2}" in user-aliases and network-aliases + was not permitted. Thanks to Steffen Junick for the report. - Fix issue with log file provided at command line (option -l) and non existant LogFile in squidanalyzer.conf. Thanks to Kalin Kozhuharov for the report. diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm index 1a4f638..3c38370 100644 --- a/SquidAnalyzer.pm +++ b/SquidAnalyzer.pm @@ -3542,8 +3542,6 @@ sub _print_cache_stat - -
+ + + @@ -3654,7 +3658,7 @@ sub _print_mime_stat } my $title = "$Translate{'Mime_graph_hits_title'} $stat_date"; my $mime_hits = $self->flotr2_piegraph(1, 'mime_hits', $title, $Translate{'Mime_graph'}, '', %data); - print $out qq{
$code_requests +
+
+
$code_bytes
+ print $out qq{ +
$mime_hits +
+
}; $mime_hits = ''; %data = (); @@ -3684,6 +3691,7 @@ $mime_hits $title = "$Translate{'Mime_graph_bytes_title'} $stat_date"; my $mime_bytes = $self->flotr2_piegraph(1, 'mime_bytes', $title, $Translate{'Mime_graph'}, '', %data); print $out qq{ +
$mime_bytes
@@ -3954,7 +3962,7 @@ sub _print_network_stat my $network_hits = $self->flotr2_bargraph(1, 'network_hits', $type, $t1, $xlabel, $ylabel, join(',', @hits), $Translate{'Hit_graph'} ); @hits = (); - print $outnet qq{
+ print $outnet qq{ +
$network_hits +
+
}; $network_hits = ''; @@ -3982,6 +3993,7 @@ $network_hits @bytes = (); print $outnet qq{ +
$network_bytes
@@ -4248,7 +4260,7 @@ sub _print_user_stat my $user_hits = $self->flotr2_bargraph(1, 'user_hits', $type, $t1, $xlabel, $ylabel, join(',', @hits), $Translate{'Hit_graph'}); @hits = (); - print $outusr qq{
+ print $outusr qq{ +
$user_hits +
+
}; $user_hits = ''; @@ -4275,6 +4290,7 @@ $user_hits join(',', @bytes), $Translate{'Bytes'}); @bytes = (); print $outusr qq{ +
$user_bytes
@@ -5237,7 +5253,7 @@ sub _print_top_domain_stat } my $title2 = "$Translate{'Second_domain_graph_hits_title'} $stat_date"; my $domain2_hits = $self->flotr2_piegraph(1, 'second_domain_hits', $title2, $Translate{'Domains_graph'}, '', %data); - print $out qq{
+ print $out qq{ + @@ -5293,6 +5313,9 @@ $domain2_hits
$domain_bytes +
+
$domain_hits +
+
+
$domain2_hits
+
$domain2_bytes
};