Merge remote-tracking branch 'mfischer/daq' into next

[ipfire-2.x.git] / src / squid-accounting / acct-lib.pl

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index f0081b7ef9551049e8ef027dc63e879a6aa496a8..826be26b148234aaa0263fd2187caf848bb5a549 100644 (file)
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -337,7 +337,12 @@ sub getmonth{
                my $monat=$_[0]-1 if($_[0]);
                my $tag=1;
                my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
-               my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
+               my $time2=0;
+               if (($monat+1) == 12){
+                       $time2=timelocal(0,0,0,$tag,0,$jahr+1);
+               }else{
+                       $time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
+               }
                --$time2;
                return ($time1,$time2);
 }
@@ -460,7 +465,6 @@ sub pdf2 {
        $lines->linewidth('0.5');
 
        #Fill BILL DATA into PDF
-       setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang");
        foreach (@billar) {
                my ($a1,$a2) = split( /\,/, $_ );
                $a2=sprintf"%.2f",($a2/1024/1024);